diff --git a/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java b/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
index 5aa153f..759924a 100644
--- a/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
+++ b/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
@@ -95,6 +95,10 @@ public class ReceiptPreference implements Serializable {
@ApiModelProperty(value="人工组盘")
private Integer manuallyBuildLPN;
+ @TableField(value = "listingRules")
+ @ApiModelProperty(value = "上架规则")
+ private String listingRules;
+
/**
* 定位规则
*/
diff --git a/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java b/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java
index ee5ea0f..bc43e98 100644
--- a/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java
+++ b/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java
@@ -40,8 +40,6 @@ public class TaskDetailController extends BaseController {
private String prefix = "task/taskDetail";
@Resource
- private TaskHeaderService taskHeaderService;
- @Resource
private TaskDetailService taskDetailService;
@RequiresPermissions("task:taskHeader:view")
@@ -95,12 +93,8 @@ public class TaskDetailController extends BaseController {
@Log(title = "任务", operating = "打印任务明细报表", action = BusinessType.OTHER)
@GetMapping("/report/{ids}")
public String report(@PathVariable("ids") Integer[] ids, ModelMap mmap) {
- List<TaskDetail> taskList = new ArrayList<>();
- for (Integer id : ids) {
- List<TaskDetail> taskDetailList = taskDetailService.findByTaskId(id);
- taskList.addAll(taskDetailList);
- }
- mmap.put("task", taskList);
+ List<TaskDetail> taskDetailList = taskDetailService.findByTaskId(ids);
+ mmap.put("task", taskDetailList);
return prefix + "/report";
}
}
diff --git a/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java b/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java
index fd4bfdd..702eb88 100644
--- a/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java
+++ b/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java
@@ -13,6 +13,13 @@ public interface TaskDetailService extends IService<TaskDetail>{
/**
* 根据任务头表id查询任务明细
+ * @param ids 头表id数组
+ * @return
+ */
+ List<TaskDetail> findByTaskId(Integer[] ids);
+
+ /**
+ * 根据任务头表id查询任务明细
* @param id
* @return
*/
diff --git a/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
index 6e5bedc..aa2065c 100644
--- a/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
@@ -1,11 +1,21 @@
package com.huaheng.pc.task.taskDetail.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.constant.QuantityConstant;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
+import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
+import com.huaheng.pc.config.receiptPreference.service.ReceiptPreferenceService;
+import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
+import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -24,10 +34,14 @@ public class TaskDetailServiceImpl extends ServiceImpl<TaskDetailMapper, TaskDet
private CycleCountDetailService cycleCountDetailService;
@Resource
private CycleCountPreferenceService cycleCountPreferenceService;
-
-
-
-
+ @Resource
+ private TaskHeaderService taskHeaderService;
+ @Resource
+ private ReceiptPreferenceService receiptPreferenceService;
+ @Resource
+ private ShipmentPreferenceService shipmentPreferenceService;
+ @Resource
+ private FilterConfigDetailService filterConfigDetailService;
/**
* 盘点任务首选项
@@ -86,6 +100,35 @@ public class TaskDetailServiceImpl extends ServiceImpl<TaskDetailMapper, TaskDet
}
/**
+ * 根据任务头表id查询任务明细,根据上架或贱货规则排序
+ * @param ids 头表id数组
+ * @return
+ */
+ @Override
+ public List<TaskDetail> findByTaskId(Integer[] ids) {
+ Integer taskType = taskHeaderService.getById(ids[0]).getTaskType();
+ String filterConfigCode = "";
+ if (taskType.equals(QuantityConstant.TASK_TYPE_WHOLERECEIPT) || taskType.equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
+ ReceiptPreference receiptPreference = receiptPreferenceService.list().get(0);
+ filterConfigCode = receiptPreference.getListingRules();
+ }
+ if (taskType.equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT) || taskType.equals(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)) {
+ ShipmentPreference shipmentPreference = shipmentPreferenceService.list().get(0);
+ filterConfigCode = shipmentPreference.getShipmentPickingRule();
+ }
+ FilterConfigDetail filterConfigDetail = new FilterConfigDetail();
+ if (StringUtils.isNotEmpty(filterConfigCode)) {
+ LambdaQueryWrapper<FilterConfigDetail> detailQueryWrapper = Wrappers.lambdaQuery();
+ detailQueryWrapper.eq(FilterConfigDetail::getCode, filterConfigCode);
+ filterConfigDetail = filterConfigDetailService.getOne(detailQueryWrapper);
+ }
+ LambdaQueryWrapper<TaskDetail> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.in(TaskDetail::getTaskId, ids)
+ .last(StringUtils.isNotEmpty(filterConfigDetail.getStatement()), filterConfigDetail.getStatement());
+ return this.list(queryWrapper);
+ }
+
+ /**
* 根据任务头表id查询任务明细
* @param id
* @return
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index c657e59..1acf819 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -7496,7 +7496,7 @@ body.skin-yellow {
}
.input_list ul{
width:100%;
- padding: 5px 0;
+ padding:3px 0;
}
.input_list li{
width:25%;
diff --git a/src/main/resources/static/huaheng/js/huahengUI.js b/src/main/resources/static/huaheng/js/huahengUI.js
index 5663598..0d67cee 100644
--- a/src/main/resources/static/huaheng/js/huahengUI.js
+++ b/src/main/resources/static/huaheng/js/huahengUI.js
@@ -69,6 +69,7 @@ var table = {
uniqueId: "id",
queryParams: $.table.queryParams,
rowStyle: {},
+ formId: "formId"
};
var options = $.extend(defaults, options);
table.options = options;
@@ -148,7 +149,7 @@ var table = {
// 查询条件
queryParams: function(params) {
- var curParams = {
+ return {
// 传递参数查询参数
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
@@ -156,8 +157,6 @@ var table = {
orderByColumn: params.sort,
isAsc: params.order
};
- var currentId = $.common.isEmpty(table.options.formId) ? $('form').attr('id') : table.options.formId;
- return $.extend(curParams, $.common.formToJSON(currentId));
},
// 请求获取数据后处理回调函数
responseHandler: function(res) {
diff --git a/src/main/resources/templates/config/receiptPreference/add.html b/src/main/resources/templates/config/receiptPreference/add.html
index 85dbaa7..2799e89 100644
--- a/src/main/resources/templates/config/receiptPreference/add.html
+++ b/src/main/resources/templates/config/receiptPreference/add.html
@@ -98,6 +98,15 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">上架规则：</label>
+ <div class="col-sm-8">
+ <select id="listingRules" name="listingRules" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('listingRules')}">
+ <option value="">请选择</option>
+ <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">空库位规则：</label>
<div class="col-sm-8">
<select id="emptyLocRule" name="emptyLocRule" class="form-control"
@@ -110,7 +119,6 @@
<div class="form-group">
<label class="col-sm-3 control-label">RF逐件收货：</label>
<div class="col-sm-8">
-<!-- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">-->
<select name="checkinByPiece" class="form-control" type="text" id="checkinByPiece">
<option value="0">否</option>
<option value="-1">是</option>
@@ -120,7 +128,6 @@
<div class="form-group">
<label class="col-sm-3 control-label">RF自动提交收货：</label>
<div class="col-sm-8">
-<!-- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">-->
<select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
<option value="0">否</option>
<option value="-1">是</option>
@@ -130,7 +137,6 @@
<div class="form-group">
<label class="col-sm-3 control-label">abc分类：</label>
<div class="col-sm-8">
-<!-- <input id="abcClass" name="allowoverreceiving" class="form-control" type="text">-->
<select id="abcClass" name="allowoverreceiving" class="form-control" type="text">
<option value="0">否</option>
<option value="-1">是</option>
@@ -146,7 +152,6 @@
<div class="form-group">
<label class="col-sm-3 control-label">临期预警：</label>
<div class="col-sm-8">
-<!-- <input id="expiringDays" name="expiringdays" class="form-control" type="text">-->
<select id="expiringDays" name="expiringdays" class="form-control" type="text">
<option value="0">否</option>
<option value="-1">是</option>
@@ -183,85 +188,6 @@
</select>
</div>
</div>
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">数据版本：</label>
- <div class="col-sm-8">
- <input id="version" name="version" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建时间：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="created" name="created" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建者：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建时间：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">更新者：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">是否有效：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<!–<input id="enable" name="enable" class="form-control" type="text">–>-->
- <!--<div class="onoffswitch">-->
- <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
- <!--<label class="onoffswitch-label" for="enable">-->
- <!--<span class="onoffswitch-inner"></span>-->
- <!--<span class="onoffswitch-switch"></span>-->
- <!--</label>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">是否删除：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
@@ -335,7 +261,7 @@
type: 'post',
dataType: "json",
data: {
- username: "fxh"
+ username: [[${@permission.getPrincipalProperty('id')}]]
},
success: function (value) {
// console.log(value.data);
diff --git a/src/main/resources/templates/config/receiptPreference/edit.html b/src/main/resources/templates/config/receiptPreference/edit.html
index eb5ae2f..da637d7 100644
--- a/src/main/resources/templates/config/receiptPreference/edit.html
+++ b/src/main/resources/templates/config/receiptPreference/edit.html
@@ -91,6 +91,16 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">上架规则：</label>
+ <div class="col-sm-8">
+ <select id="listingRules" name="listingRules" class="form-control"
+ th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('listingRules')}" th:field="*{listingRules}">
+ <option value="">请选择</option>
+ <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">空库位规则：</label>
<div class="col-sm-8">
<select id="emptyLocRule" name="emptyLocRule" class="form-control"
diff --git a/src/main/resources/templates/config/receiptPreference/list.html b/src/main/resources/templates/config/receiptPreference/list.html
index 1290562..9f12e7e 100644
--- a/src/main/resources/templates/config/receiptPreference/list.html
+++ b/src/main/resources/templates/config/receiptPreference/list.html
@@ -15,13 +15,6 @@
<div class="box_all">
<div class="select-list box2">
<ul>
- <!--
- <li>
- <label>仓库：</label>
- <select name="warehousecode" id="warehouse" >
- </select>
- </li>
- -->
<li>
<label>首选项代码：</label>
<input type="text" name="code"/>
@@ -38,119 +31,6 @@
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
name="endCreated"/>
</li>
-
- <!--<li>
- <label>入库流程：</label>
- <input type="text" name="receivingflow"/>
- </li>
- <li>
- <label>自动生成托盘号：</label>
- <input type="text" name="autoassignlpn"/>
- </li>
- <li>
- <label>允许超收：</label>
- <select name="allowoverreceiving">
- <option value="">所有</option>
- <option value="-1">代码生成请选择字典属性</option>
- </select>
- </li>
- <li>
- <label>允许超收范围：</label>
- <input type="text" name="allowoverreceivingqty"/>
- </li>
- <li>
- <label>自动定位：</label>
- <select name="autolocate">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>RF显示未收数量：</label>
- <input type="text" name="showopenqty"/>
- </li>
- <li>
- <label>RF组车收货：</label>
- <input type="text" name="groupputaway"/>
- </li>
- <li>
- <label>人工组盘：</label>
- <input type="text" name="manuallybuildlpn"/>
- </li>
- <li>
- <label>定位规则：</label>
- <input type="text" name="locationrule"/>
- </li>
- <li>
- <label>空库位规则：</label>
- <input type="text" name="emptylocrule"/>
- </li>
- <li>
- <label>RF逐件收货：</label>
- <select name="checkinbypiece">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>RF自动提交收货：</label>
- <select name="piececonfirm">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>abc分类：</label>
- <select name="allowoverreceiving">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>保质期(天)：</label>
- <input type="number" name="daystoexpire"/>
- </li>
- <li>
- <label>临期预警：</label>
- <select name="expiringdays">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>收货预警(天)：</label>
- <input type="number" name="minshelflifedays"/>
- </li>
- <li>
- <label>RF快速上架：</label>
- <select name="allowquickputaway">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>属性模板：</label>
- <input type="text" name="attributetemplatecode"/>
- </li>
- <li>
- <label>快速入库：</label>
- <select name="usequickcheckin">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>
- <li>
- <label>创建用户：</label>
- <input type="text" name="createdby"/>
- </li>
- <li>
- <label>更新用户：</label>
- <select name="lastupdatedby">
- <option value="0">否</option>
- <option value="-1">是</option>
- </select>
- </li>-->
-
<p style=" float:right;text-align: right; padding:5px 50px 0 0">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i> 搜索</a>
@@ -173,7 +53,7 @@
<ul>
<li>
<label>入库流程：</label>
- <select name="checkinbypiece">
+ <select name="receivingFlow">
<option value="0">否</option>
<option value="-1">是</option>
</select>
@@ -184,26 +64,26 @@
<div class="col-lg-4"><label>自动生成托盘号：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="autoassignlpn" name="autoassignlpn" checked="checked">
- <label class="onoffswitch-label" for="autoassignlpn">
+ <input type="checkbox" class="onoffswitch-checkbox" id="autoAssignLPN" name="autoAssignLPN" checked="checked">
+ <label class="onoffswitch-label" for="autoAssignLPN">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
</div>
</div>
</li>
- <li>
- <label>托盘生成号：</label>
- <input type="text" name="autoassignlpn" placeholder="on 就调出正则表达式" />
- </li>
+<!-- <li>-->
+<!-- <label>托盘生成号：</label>-->
+<!-- <input type="text" name="autoAssignLPN" placeholder="on 就调出正则表达式" />-->
+<!-- </li>-->
</ul>
<ul>
<li>
<div class="col-lg-4"><label>允许超收：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="allowoverreceiving" name="allowoverreceiving" checked="checked">
- <label class="onoffswitch-label" for="allowoverreceiving">
+ <input type="checkbox" class="onoffswitch-checkbox" id="allowOverReceiving" name="allowOverReceiving" checked="checked">
+ <label class="onoffswitch-label" for="allowOverReceiving">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -212,7 +92,7 @@
</li>
<li>
<label>允许超收范围：</label>
- <input type="text" name="allowoverreceivingqty" placeholder="%" />
+ <input type="number" name="allowOverReceivingQty" placeholder="%" />
</li>
</ul>
<ul>
@@ -220,8 +100,8 @@
<div class="col-lg-4"><label>自动定位：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="autolocate" name="autolocate" checked="checked">
- <label class="onoffswitch-label" for="autolocate">
+ <input type="checkbox" class="onoffswitch-checkbox" id="autoLocate" name="autoLocate" checked="checked">
+ <label class="onoffswitch-label" for="autoLocate">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -230,14 +110,14 @@
</li>
<li>
<label>定位规则：</label>
- <select name="locationrule">
+ <select name="locationRule">
<option value="0">否</option>
<option value="-1">是</option>
</select>
</li>
<li>
<label>容器选择规则：</label>
- <select name="checkinbypiece">
+ <select name="checkinByPiece">
<option value="0">否</option>
<option value="-1">是</option>
</select>
@@ -248,8 +128,8 @@
<div class="col-lg-4"><label>快速入库：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="usequickcheckin" name="usequickcheckin" checked="checked">
- <label class="onoffswitch-label" for="usequickcheckin">
+ <input type="checkbox" class="onoffswitch-checkbox" id="useQuickCheckIn" name="useQuickCheckIn" checked="checked">
+ <label class="onoffswitch-label" for="useQuickCheckIn">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -272,8 +152,8 @@
<div class="col-lg-4"><label>组车收货：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="groupputaway" name="groupputaway" checked="checked">
- <label class="onoffswitch-label" for="groupputaway">
+ <input type="checkbox" class="onoffswitch-checkbox" id="groupPutaway" name="groupPutaway" checked="checked">
+ <label class="onoffswitch-label" for="groupPutaway">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -284,8 +164,8 @@
<div class="col-lg-4"><label>显示未收货数量：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="showopenqty" name="showopenqty" checked="checked">
- <label class="onoffswitch-label" for="showopenqty">
+ <input type="checkbox" class="onoffswitch-checkbox" id="showOpenQty" name="showOpenQty" checked="checked">
+ <label class="onoffswitch-label" for="showOpenQty">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -296,8 +176,8 @@
<div class="col-lg-4"><label>人工组盘：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="manuallybuildlpn" name="manuallybuildlpn" checked="checked">
- <label class="onoffswitch-label" for="manuallybuildlpn">
+ <input type="checkbox" class="onoffswitch-checkbox" id="manuallyBuildLPN" name="manuallyBuildLPN" checked="checked">
+ <label class="onoffswitch-label" for="manuallyBuildLPN">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -308,8 +188,8 @@
<div class="col-lg-4"><label>逐件收货：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="checkinbypiece" name="checkinbypiece" checked="checked">
- <label class="onoffswitch-label" for="checkinbypiece">
+ <input type="checkbox" class="onoffswitch-checkbox" id="checkinByPiece" name="checkinByPiece" checked="checked">
+ <label class="onoffswitch-label" for="checkinByPiece">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -320,8 +200,8 @@
<div class="col-lg-4"><label>自动提交(平库)：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="status" name="status" checked="checked">
- <label class="onoffswitch-label" for="status">
+ <input type="checkbox" class="onoffswitch-checkbox" id="pieceConfirm" name="pieceConfirm" checked="checked">
+ <label class="onoffswitch-label" for="pieceConfirm">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -344,8 +224,8 @@
<div class="col-lg-4"><label>ABC分类：</label></div>
<div class="col-lg-8">
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" id="classification" name="classification" checked="checked">
- <label class="onoffswitch-label" for="classification">
+ <input type="checkbox" class="onoffswitch-checkbox" id="abcClass" name="abcClass" checked="checked">
+ <label class="onoffswitch-label" for="abcClass">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
@@ -354,24 +234,24 @@
</li>
<li>
<label>属性模板：</label>
- <select name="checkinbypiece">
+ <select name="attributeTemplateCode">
<option value="0">否</option>
- <option value="-1">是</option>
+ <option value="1">是</option>
</select>
</li>
</ul>
<ul>
<li>
<label>保质期(天)：</label>
- <input type="text" name="autoassignlpn"/>
+ <input type="number" name="daysToExpire"/>
</li>
<li>
<label>临期预警(天)：</label>
- <input type="text" name="autoassignlpn"/>
+ <input type="number" name="expiringDays"/>
</li>
<li>
<label>收货预警(天)：</label>
- <input type="text" name="autoassignlpn"/>
+ <input type="number" name="minShelfLifeDays"/>
</li>
</ul>
</div>
@@ -427,285 +307,184 @@
visible: false
},
{
- field: 'warehousecode',
+ field: 'warehouseCode',
title: '仓库'
},
- // {
- // field: 'warehousecode',
- // title: '仓库',
- // width: "10%",
- // formatter: function (value, row, index) {
- // var data = [{ index: index, warehousecode: value }];
- // return $("#javaTypeTpl").tmpl(data).html();
- // }
- // },
{
field: 'code',
title: '首选项代码'
},
- // {
- // field: 'name',
- // title: '首选项名字'
- // },
{
field: 'name',
title: '首选项名字',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'receivingflow',
- // title: '入库流程'
- // },
{
field: 'receivingFlow',
title: '入库流程',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'autoassignlpn',
- // title: '自动生成托盘号'
- // },
{
- field: 'autoassignlpn',
+ field: 'autoAssignLPN',
title: '自动生成托盘号',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'allowoverreceiving',
- // title: '允许超收'
- // },
{
- field: 'allowoverreceiving',
+ field: 'allowOverReceiving',
title: '允许超收',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'allowoverreceivingqty',
- // title: '允许超收范围'
- // },
{
- field: 'allowoverreceivingqty',
+ field: 'allowOverReceivingQty',
title: '允许超收范围',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'autolocate',
- // title: '自动定位'
- // },
{
- field: 'autolocate',
+ field: 'autoLocate',
title: '自动定位',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'showopenqty',
- // title: 'RF显示未收数量'
- // },
{
- field: 'showopenqty',
+ field: 'showOpenQty',
title: 'RF显示未收数量',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
-
- // {
- // field: 'groupputaway',
- // title: 'RF组车收货'
- // },
{
- field: 'groupputaway',
+ field: 'groupPutaway',
title: 'RF组车收货',
- width: "5%",
+ align: 'center',
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'manuallybuildlpn',
- // title: '人工组盘'
- // },
{
- field: 'manuallybuildlpn',
+ field: 'manuallyBuildLPN',
title: '人工组盘',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'locationrule',
- // title: '定位规则'
- // },
{
- field: 'locationrule',
+ field: 'locationRule',
title: '定位规则',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'emptylocrule',
- // title: '空库位规则'
- // },
{
- field: 'emptylocrule',
+ field: 'listingRules',
+ title: '上架规则',
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
+ },
+ {
+ field: 'emptyLocRule',
title: '空库位规则',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'checkinbypiece',
- // title: 'RF逐件收货'
- // },
{
- field: 'checkinbypiece',
+ field: 'checkinByPiece',
title: 'RF逐件收货',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'piececonfirm',
- // title: 'RF自动提交收货'
- // },
{
- field: 'piececonfirm',
+ field: 'pieceConfirm',
title: 'RF自动提交收货',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'abcclass',
- // title: 'abc分类 0 否 1是'
- // },
{
- field: 'abcclass',
+ field: 'abcClass',
title: 'abc分类',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'daystoexpire',
- // title: '保质期'
- // },
{
- field: 'daystoexpire',
+ field: 'daysToExpire',
title: '保质期',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'expiringdays',
- // title: '临期预警'
- // },
{
- field: 'expiringdays',
+ field: 'expiringDays',
title: '临期预警',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'minshelflifedays',
- // title: '收货预警(天)'
- // },
{
- field: 'minshelflifedays',
+ field: 'minShelfLifeDays',
title: '收货预警(天)',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'allowquickputaway',
- // title: 'RF快速上架'
- // },
{
- field: 'allowquickputaway',
+ field: 'allowQuickPutaway',
title: 'RF快速上架',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
- // {
- // field: 'attributetemplatecode',
- // title: '属性模板'
- // },
{
- field: 'attributetemplatecode',
+ field: 'attributeTemplateCode',
title: '属性模板',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'usequickcheckin',
- // title: '快速入库'
- // },
{
- field: 'usequickcheckin',
+ field: 'useQuickCheckIn',
title: '快速入库',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
@@ -715,38 +494,23 @@
field: 'created',
title: '创建时间'
},
- // {
- // field: 'createdby',
- // title: '创建用户'
- // },
{
- field: 'createdby',
+ field: 'createdBy',
title: '创建用户',
- width: "10%",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
return html;
}
},
- // {
- // field: 'lastupdated',
- // title: '创建时间'
- // },
- // {
- // field: 'lastupdatedby',
- // title: '更新用户'
- // },
{
- field: 'lastupdatedby',
+ field: 'lastUpdated',
title: '更新用户',
- width: "5%",
formatter: function (value, row, index) {
var isCheck = value == 1 ? 'checked' : '';
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
return html;
}
},
-
{
title: '操作',
align: 'center',
@@ -759,7 +523,7 @@
};
$.table.init(options);
- var a =$(".box2 ul li:gt(3):not(:last)");
+ let a =$(".box2 ul li:gt(3):not(:last)");
a.hide();
$(".boxdown").click(function(){
if(a.is(':visible')){
@@ -772,22 +536,22 @@
});
- $.ajax({
- url: "../getWarehouseByUserCode",
- type: 'post',
- dataType: "json",
- data: {
- username: "fxh"
- },
- success: function (value) {
- // console.log(value.data);
- $("#warehouse").contents().remove();
- if (value != null && value.data.length >= 1)
- for (var i = 0; i < value.data.length; i++) {
- $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
- }
- }
- })
+ $.ajax({
+ url: "../getWarehouseByUserCode",
+ type: 'post',
+ dataType: "json",
+ data: {
+ username: [[${@permission.getPrincipalProperty('id')}]]
+ },
+ success: function (value) {
+ // console.log(value.data);
+ $("#warehouse").contents().remove();
+ if (value != null && value.data.length >= 1)
+ for (var i = 0; i < value.data.length; i++) {
+ $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
+ }
+ }
+ })
});
diff --git a/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html b/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
index d70f99c..b6e9ead 100644
--- a/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
+++ b/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
@@ -72,7 +72,7 @@
</a>-->
</div>
<table id="bootstrap-table" data-mobile-responsive="true"
- class="table table-bordered table-hover"></table>
+ class="table table-bordered table-hover text-nowrap"></table>
</div>
<div class="tab-pane fade" id="tabDetail"></div>
</div>
diff --git a/src/main/resources/templates/monitor/locationstatus/locationstatus.html b/src/main/resources/templates/monitor/locationstatus/locationstatus.html
index 3ae01b2..8f9655a 100644
--- a/src/main/resources/templates/monitor/locationstatus/locationstatus.html
+++ b/src/main/resources/templates/monitor/locationstatus/locationstatus.html
@@ -9,13 +9,14 @@
font-size: 10px;
/*width: 50px;*/
text-align: left;
- margin: auto 3px;
+ margin: 5px 20px 5px 5px;
}
#img_list li img{
height: 35px;
width: 35px;
}
#info_list{
+ width: 100%;
display:inline-block;
}
#info_list li{
diff --git a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
index 9eb9795..30f5972 100644
--- a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
+++ b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
@@ -24,7 +24,7 @@
容器编号：<input type="text" name="receiptContainerCode"/>
</li>
<li>
- 库位编号：<input type="text" name="locationCode"/>
+ 库位编号：<input type="text" name="toLocation"/>
</li>
<li>
<!--入库类型：<input type="text" name="sourceCode"/>
diff --git a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
index 046149c..69400bd 100644
--- a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
+++ b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
@@ -56,16 +56,6 @@
</div>
</form>
</div>
- <div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
- shiro:hasPermission="receipt:receiptHeader:add">
- <i class="fa fa-plus"></i> 新增
- </a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
- shiro:hasPermission="receipt:receiptHeader:remove">
- <i class="fa fa-trash-o"></i> 删除
- </a>
- </div>
<table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
</div>
@@ -437,17 +427,6 @@
field : 'userDef3',
title : '自定义字段3' ,
visible:false
- },
- {
- title: '操作',
- align: 'center',
- events:'operateEvents',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
- return actions.join('');
- }
}]
});