wms / wms_wuhangelinmei · Commits

Commit e48b2bde26484883047769fbeea591080fadd428

Authored by xqs
2 parents b0efb821 9ef590f4
develop ... future/yangjie moreWarehouse

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms2 into develop

Inline Side-by-side
Showing 13 changed files with 167 additions and 440 deletions
src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
  View file @e48b2bd
@@ -95,6 +95,10 @@ public class ReceiptPreference implements Serializable { @@ -95,6 +95,10 @@ public class ReceiptPreference implements Serializable {
95 @ApiModelProperty(value="人工组盘") 95 @ApiModelProperty(value="人工组盘")
96 private Integer manuallyBuildLPN; 96 private Integer manuallyBuildLPN;
97 97
  98 + @TableField(value = "listingRules")
  99 + @ApiModelProperty(value = "上架规则")
  100 + private String listingRules;
  101 +
98 /** 102 /**
99 * 定位规则 103 * 定位规则
100 */ 104 */
src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java
  View file @e48b2bd
@@ -40,8 +40,6 @@ public class TaskDetailController extends BaseController { @@ -40,8 +40,6 @@ public class TaskDetailController extends BaseController {
40 private String prefix = "task/taskDetail"; 40 private String prefix = "task/taskDetail";
41 41
42 @Resource 42 @Resource
43 - private TaskHeaderService taskHeaderService;  
44 - @Resource  
45 private TaskDetailService taskDetailService; 43 private TaskDetailService taskDetailService;
46 44
47 @RequiresPermissions("task:taskHeader:view") 45 @RequiresPermissions("task:taskHeader:view")
@@ -95,12 +93,8 @@ public class TaskDetailController extends BaseController { @@ -95,12 +93,8 @@ public class TaskDetailController extends BaseController {
95 @Log(title = "任务", operating = "打印任务明细报表", action = BusinessType.OTHER) 93 @Log(title = "任务", operating = "打印任务明细报表", action = BusinessType.OTHER)
96 @GetMapping("/report/{ids}") 94 @GetMapping("/report/{ids}")
97 public String report(@PathVariable("ids") Integer[] ids, ModelMap mmap) { 95 public String report(@PathVariable("ids") Integer[] ids, ModelMap mmap) {
98 - List<TaskDetail> taskList = new ArrayList<>();  
99 - for (Integer id : ids) {  
100 - List<TaskDetail> taskDetailList = taskDetailService.findByTaskId(id);  
101 - taskList.addAll(taskDetailList);  
102 - }  
103 - mmap.put("task", taskList); 96 + List<TaskDetail> taskDetailList = taskDetailService.findByTaskId(ids);
  97 + mmap.put("task", taskDetailList);
104 return prefix + "/report"; 98 return prefix + "/report";
105 } 99 }
106 } 100 }
src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java
  View file @e48b2bd
@@ -13,6 +13,13 @@ public interface TaskDetailService extends IService&lt;TaskDetail&gt;{ @@ -13,6 +13,13 @@ public interface TaskDetailService extends IService&lt;TaskDetail&gt;{
13 13
14 /** 14 /**
15 * 根据任务头表id查询任务明细 15 * 根据任务头表id查询任务明细
  16 + * @param ids 头表id数组
  17 + * @return
  18 + */
  19 + List<TaskDetail> findByTaskId(Integer[] ids);
  20 +
  21 + /**
  22 + * 根据任务头表id查询任务明细
16 * @param id 23 * @param id
17 * @return 24 * @return
18 */ 25 */
src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java
  View file @e48b2bd
1 package com.huaheng.pc.task.taskDetail.service; 1 package com.huaheng.pc.task.taskDetail.service;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.StringUtils;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.huaheng.common.constant.QuantityConstant;
  7 +import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
  8 +import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
5 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference; 9 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
6 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService; 10 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
  11 +import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
  12 +import com.huaheng.pc.config.receiptPreference.service.ReceiptPreferenceService;
  13 +import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
  14 +import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
7 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail; 15 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
8 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService; 16 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
  17 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  18 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
9 import org.springframework.stereotype.Service; 19 import org.springframework.stereotype.Service;
10 import javax.annotation.Resource; 20 import javax.annotation.Resource;
11 import java.util.ArrayList; 21 import java.util.ArrayList;
@@ -24,10 +34,14 @@ public class TaskDetailServiceImpl extends ServiceImpl&lt;TaskDetailMapper, TaskDet @@ -24,10 +34,14 @@ public class TaskDetailServiceImpl extends ServiceImpl&lt;TaskDetailMapper, TaskDet
24 private CycleCountDetailService cycleCountDetailService; 34 private CycleCountDetailService cycleCountDetailService;
25 @Resource 35 @Resource
26 private CycleCountPreferenceService cycleCountPreferenceService; 36 private CycleCountPreferenceService cycleCountPreferenceService;
27 -  
28 -  
29 -  
30 - 37 + @Resource
  38 + private TaskHeaderService taskHeaderService;
  39 + @Resource
  40 + private ReceiptPreferenceService receiptPreferenceService;
  41 + @Resource
  42 + private ShipmentPreferenceService shipmentPreferenceService;
  43 + @Resource
  44 + private FilterConfigDetailService filterConfigDetailService;
31 45
32 /** 46 /**
33 * 盘点任务首选项 47 * 盘点任务首选项
@@ -86,6 +100,35 @@ public class TaskDetailServiceImpl extends ServiceImpl&lt;TaskDetailMapper, TaskDet @@ -86,6 +100,35 @@ public class TaskDetailServiceImpl extends ServiceImpl&lt;TaskDetailMapper, TaskDet
86 } 100 }
87 101
88 /** 102 /**
  103 + * 根据任务头表id查询任务明细,根据上架或贱货规则排序
  104 + * @param ids 头表id数组
  105 + * @return
  106 + */
  107 + @Override
  108 + public List<TaskDetail> findByTaskId(Integer[] ids) {
  109 + Integer taskType = taskHeaderService.getById(ids[0]).getTaskType();
  110 + String filterConfigCode = "";
  111 + if (taskType.equals(QuantityConstant.TASK_TYPE_WHOLERECEIPT) || taskType.equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
  112 + ReceiptPreference receiptPreference = receiptPreferenceService.list().get(0);
  113 + filterConfigCode = receiptPreference.getListingRules();
  114 + }
  115 + if (taskType.equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT) || taskType.equals(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)) {
  116 + ShipmentPreference shipmentPreference = shipmentPreferenceService.list().get(0);
  117 + filterConfigCode = shipmentPreference.getShipmentPickingRule();
  118 + }
  119 + FilterConfigDetail filterConfigDetail = new FilterConfigDetail();
  120 + if (StringUtils.isNotEmpty(filterConfigCode)) {
  121 + LambdaQueryWrapper<FilterConfigDetail> detailQueryWrapper = Wrappers.lambdaQuery();
  122 + detailQueryWrapper.eq(FilterConfigDetail::getCode, filterConfigCode);
  123 + filterConfigDetail = filterConfigDetailService.getOne(detailQueryWrapper);
  124 + }
  125 + LambdaQueryWrapper<TaskDetail> queryWrapper = Wrappers.lambdaQuery();
  126 + queryWrapper.in(TaskDetail::getTaskId, ids)
  127 + .last(StringUtils.isNotEmpty(filterConfigDetail.getStatement()), filterConfigDetail.getStatement());
  128 + return this.list(queryWrapper);
  129 + }
  130 +
  131 + /**
89 * 根据任务头表id查询任务明细 132 * 根据任务头表id查询任务明细
90 * @param id 133 * @param id
91 * @return 134 * @return
src/main/resources/static/css/style.css
  View file @e48b2bd
@@ -7496,7 +7496,7 @@ body.skin-yellow { @@ -7496,7 +7496,7 @@ body.skin-yellow {
7496 } 7496 }
7497 .input_list ul{ 7497 .input_list ul{
7498 width:100%; 7498 width:100%;
7499 - padding: 5px 0; 7499 + padding:3px 0;
7500 } 7500 }
7501 .input_list li{ 7501 .input_list li{
7502 width:25%; 7502 width:25%;
src/main/resources/static/huaheng/js/huahengUI.js
  View file @e48b2bd
@@ -69,6 +69,7 @@ var table = { @@ -69,6 +69,7 @@ var table = {
69 uniqueId: "id", 69 uniqueId: "id",
70 queryParams: $.table.queryParams, 70 queryParams: $.table.queryParams,
71 rowStyle: {}, 71 rowStyle: {},
  72 + formId: "formId"
72 }; 73 };
73 var options = $.extend(defaults, options); 74 var options = $.extend(defaults, options);
74 table.options = options; 75 table.options = options;
@@ -148,7 +149,7 @@ var table = { @@ -148,7 +149,7 @@ var table = {
148 149
149 // 查询条件 150 // 查询条件
150 queryParams: function(params) { 151 queryParams: function(params) {
151 - var curParams = { 152 + return {
152 // 传递参数查询参数 153 // 传递参数查询参数
153 pageSize: params.limit, 154 pageSize: params.limit,
154 pageNum: params.offset / params.limit + 1, 155 pageNum: params.offset / params.limit + 1,
@@ -156,8 +157,6 @@ var table = { @@ -156,8 +157,6 @@ var table = {
156 orderByColumn: params.sort, 157 orderByColumn: params.sort,
157 isAsc: params.order 158 isAsc: params.order
158 }; 159 };
159 - var currentId = $.common.isEmpty(table.options.formId) ? $('form').attr('id') : table.options.formId;  
160 - return $.extend(curParams, $.common.formToJSON(currentId));  
161 }, 160 },
162 // 请求获取数据后处理回调函数 161 // 请求获取数据后处理回调函数
163 responseHandler: function(res) { 162 responseHandler: function(res) {
src/main/resources/templates/config/receiptPreference/add.html
  View file @e48b2bd
@@ -98,6 +98,15 @@ @@ -98,6 +98,15 @@
98 </div> 98 </div>
99 </div> 99 </div>
100 <div class="form-group"> 100 <div class="form-group">
  101 + <label class="col-sm-3 control-label">上架规则：</label>
  102 + <div class="col-sm-8">
  103 + <select id="listingRules" name="listingRules" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('listingRules')}">
  104 + <option value="">请选择</option>
  105 + <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
  106 + </select>
  107 + </div>
  108 + </div>
  109 + <div class="form-group">
101 <label class="col-sm-3 control-label">空库位规则：</label> 110 <label class="col-sm-3 control-label">空库位规则：</label>
102 <div class="col-sm-8"> 111 <div class="col-sm-8">
103 <select id="emptyLocRule" name="emptyLocRule" class="form-control" 112 <select id="emptyLocRule" name="emptyLocRule" class="form-control"
@@ -110,7 +119,6 @@ @@ -110,7 +119,6 @@
110 <div class="form-group"> 119 <div class="form-group">
111 <label class="col-sm-3 control-label">RF逐件收货：</label> 120 <label class="col-sm-3 control-label">RF逐件收货：</label>
112 <div class="col-sm-8"> 121 <div class="col-sm-8">
113 -<!-- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">-->  
114 <select name="checkinByPiece" class="form-control" type="text" id="checkinByPiece"> 122 <select name="checkinByPiece" class="form-control" type="text" id="checkinByPiece">
115 <option value="0">否</option> 123 <option value="0">否</option>
116 <option value="-1">是</option> 124 <option value="-1">是</option>
@@ -120,7 +128,6 @@ @@ -120,7 +128,6 @@
120 <div class="form-group"> 128 <div class="form-group">
121 <label class="col-sm-3 control-label">RF自动提交收货：</label> 129 <label class="col-sm-3 control-label">RF自动提交收货：</label>
122 <div class="col-sm-8"> 130 <div class="col-sm-8">
123 -<!-- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">-->  
124 <select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text"> 131 <select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
125 <option value="0">否</option> 132 <option value="0">否</option>
126 <option value="-1">是</option> 133 <option value="-1">是</option>
@@ -130,7 +137,6 @@ @@ -130,7 +137,6 @@
130 <div class="form-group"> 137 <div class="form-group">
131 <label class="col-sm-3 control-label">abc分类：</label> 138 <label class="col-sm-3 control-label">abc分类：</label>
132 <div class="col-sm-8"> 139 <div class="col-sm-8">
133 -<!-- <input id="abcClass" name="allowoverreceiving" class="form-control" type="text">-->  
134 <select id="abcClass" name="allowoverreceiving" class="form-control" type="text"> 140 <select id="abcClass" name="allowoverreceiving" class="form-control" type="text">
135 <option value="0">否</option> 141 <option value="0">否</option>
136 <option value="-1">是</option> 142 <option value="-1">是</option>
@@ -146,7 +152,6 @@ @@ -146,7 +152,6 @@
146 <div class="form-group"> 152 <div class="form-group">
147 <label class="col-sm-3 control-label">临期预警：</label> 153 <label class="col-sm-3 control-label">临期预警：</label>
148 <div class="col-sm-8"> 154 <div class="col-sm-8">
149 -<!-- <input id="expiringDays" name="expiringdays" class="form-control" type="text">-->  
150 <select id="expiringDays" name="expiringdays" class="form-control" type="text"> 155 <select id="expiringDays" name="expiringdays" class="form-control" type="text">
151 <option value="0">否</option> 156 <option value="0">否</option>
152 <option value="-1">是</option> 157 <option value="-1">是</option>
@@ -183,85 +188,6 @@ @@ -183,85 +188,6 @@
183 </select> 188 </select>
184 </div> 189 </div>
185 </div> 190 </div>
186 - <!--<div class="form-group">  
187 - <label class="col-sm-3 control-label">数据版本：</label>  
188 - <div class="col-sm-8">  
189 - <input id="version" name="version" class="form-control" type="text">  
190 - </div>  
191 - </div>-->  
192 - <!--<div class="form-group"> -->  
193 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
194 - <!--<div class="col-sm-8">-->  
195 - <!--<input id="created" name="created" class="form-control" type="text">-->  
196 - <!--</div>-->  
197 - <!--</div>-->  
198 - <!--<div class="form-group"> -->  
199 - <!--<label class="col-sm-3 control-label">创建者：</label>-->  
200 - <!--<div class="col-sm-8">-->  
201 - <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->  
202 - <!--</div>-->  
203 - <!--</div>-->  
204 - <!--<div class="form-group"> -->  
205 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
206 - <!--<div class="col-sm-8">-->  
207 - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->  
208 - <!--</div>-->  
209 - <!--</div>-->  
210 - <!--<div class="form-group"> -->  
211 - <!--<label class="col-sm-3 control-label">更新者：</label>-->  
212 - <!--<div class="col-sm-8">-->  
213 - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->  
214 - <!--</div>-->  
215 - <!--</div>-->  
216 - <!--<div class="form-group"> -->  
217 - <!--<label class="col-sm-3 control-label">是否有效：</label>-->  
218 - <!--<div class="col-sm-8">-->  
219 - <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->  
220 - <!--<div class="onoffswitch">-->  
221 - <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->  
222 - <!--<label class="onoffswitch-label" for="enable">-->  
223 - <!--<span class="onoffswitch-inner"></span>-->  
224 - <!--<span class="onoffswitch-switch"></span>-->  
225 - <!--</label>-->  
226 - <!--</div>-->  
227 - <!--</div>-->  
228 - <!--</div>-->  
229 - <!--<div class="form-group"> -->  
230 - <!--<label class="col-sm-3 control-label">是否删除：</label>-->  
231 - <!--<div class="col-sm-8">-->  
232 - <!--<input id="deleted" name="deleted" class="form-control" type="text">-->  
233 - <!--</div>-->  
234 - <!--</div>-->  
235 - <!--<div class="form-group"> -->  
236 - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->  
237 - <!--<div class="col-sm-8">-->  
238 - <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->  
239 - <!--</div>-->  
240 - <!--</div>-->  
241 - <!--<div class="form-group"> -->  
242 - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->  
243 - <!--<div class="col-sm-8">-->  
244 - <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->  
245 - <!--</div>-->  
246 - <!--</div>-->  
247 - <!--<div class="form-group"> -->  
248 - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->  
249 - <!--<div class="col-sm-8">-->  
250 - <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->  
251 - <!--</div>-->  
252 - <!--</div>-->  
253 - <!--<div class="form-group"> -->  
254 - <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->  
255 - <!--<div class="col-sm-8">-->  
256 - <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->  
257 - <!--</div>-->  
258 - <!--</div>-->  
259 - <!--<div class="form-group"> -->  
260 - <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->  
261 - <!--<div class="col-sm-8">-->  
262 - <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->  
263 - <!--</div>-->  
264 - <!--</div>-->  
265 <div class="form-group"> 191 <div class="form-group">
266 <div class="form-control-static col-sm-offset-9"> 192 <div class="form-control-static col-sm-offset-9">
267 <button type="submit" class="btn btn-primary">提交</button> 193 <button type="submit" class="btn btn-primary">提交</button>
@@ -335,7 +261,7 @@ @@ -335,7 +261,7 @@
335 type: 'post', 261 type: 'post',
336 dataType: "json", 262 dataType: "json",
337 data: { 263 data: {
338 - username: "fxh" 264 + username: [[${@permission.getPrincipalProperty('id')}]]
339 }, 265 },
340 success: function (value) { 266 success: function (value) {
341 // console.log(value.data); 267 // console.log(value.data);
src/main/resources/templates/config/receiptPreference/edit.html
  View file @e48b2bd
@@ -91,6 +91,16 @@ @@ -91,6 +91,16 @@
91 </div> 91 </div>
92 </div> 92 </div>
93 <div class="form-group"> 93 <div class="form-group">
  94 + <label class="col-sm-3 control-label">上架规则：</label>
  95 + <div class="col-sm-8">
  96 + <select id="listingRules" name="listingRules" class="form-control"
  97 + th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('listingRules')}" th:field="*{listingRules}">
  98 + <option value="">请选择</option>
  99 + <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
  100 + </select>
  101 + </div>
  102 + </div>
  103 + <div class="form-group">
94 <label class="col-sm-3 control-label">空库位规则：</label> 104 <label class="col-sm-3 control-label">空库位规则：</label>
95 <div class="col-sm-8"> 105 <div class="col-sm-8">
96 <select id="emptyLocRule" name="emptyLocRule" class="form-control" 106 <select id="emptyLocRule" name="emptyLocRule" class="form-control"
src/main/resources/templates/config/receiptPreference/list.html
  View file @e48b2bd
@@ -15,13 +15,6 @@ @@ -15,13 +15,6 @@
15 <div class="box_all"> 15 <div class="box_all">
16 <div class="select-list box2"> 16 <div class="select-list box2">
17 <ul> 17 <ul>
18 - <!--  
19 - <li>  
20 - <label>仓库：</label>  
21 - <select name="warehousecode" id="warehouse" >  
22 - </select>  
23 - </li>  
24 - -->  
25 <li> 18 <li>
26 <label>首选项代码：</label> 19 <label>首选项代码：</label>
27 <input type="text" name="code"/> 20 <input type="text" name="code"/>
@@ -38,119 +31,6 @@ @@ -38,119 +31,6 @@
38 <input type="text" class="time-input" id="endTime" placeholder="结束时间" 31 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
39 name="endCreated"/> 32 name="endCreated"/>
40 </li> 33 </li>
41 -  
42 - <!--<li>  
43 - <label>入库流程：</label>  
44 - <input type="text" name="receivingflow"/>  
45 - </li>  
46 - <li>  
47 - <label>自动生成托盘号：</label>  
48 - <input type="text" name="autoassignlpn"/>  
49 - </li>  
50 - <li>  
51 - <label>允许超收：</label>  
52 - <select name="allowoverreceiving">  
53 - <option value="">所有</option>  
54 - <option value="-1">代码生成请选择字典属性</option>  
55 - </select>  
56 - </li>  
57 - <li>  
58 - <label>允许超收范围：</label>  
59 - <input type="text" name="allowoverreceivingqty"/>  
60 - </li>  
61 - <li>  
62 - <label>自动定位：</label>  
63 - <select name="autolocate">  
64 - <option value="0">否</option>  
65 - <option value="-1">是</option>  
66 - </select>  
67 - </li>  
68 - <li>  
69 - <label>RF显示未收数量：</label>  
70 - <input type="text" name="showopenqty"/>  
71 - </li>  
72 - <li>  
73 - <label>RF组车收货：</label>  
74 - <input type="text" name="groupputaway"/>  
75 - </li>  
76 - <li>  
77 - <label>人工组盘：</label>  
78 - <input type="text" name="manuallybuildlpn"/>  
79 - </li>  
80 - <li>  
81 - <label>定位规则：</label>  
82 - <input type="text" name="locationrule"/>  
83 - </li>  
84 - <li>  
85 - <label>空库位规则：</label>  
86 - <input type="text" name="emptylocrule"/>  
87 - </li>  
88 - <li>  
89 - <label>RF逐件收货：</label>  
90 - <select name="checkinbypiece">  
91 - <option value="0">否</option>  
92 - <option value="-1">是</option>  
93 - </select>  
94 - </li>  
95 - <li>  
96 - <label>RF自动提交收货：</label>  
97 - <select name="piececonfirm">  
98 - <option value="0">否</option>  
99 - <option value="-1">是</option>  
100 - </select>  
101 - </li>  
102 - <li>  
103 - <label>abc分类：</label>  
104 - <select name="allowoverreceiving">  
105 - <option value="0">否</option>  
106 - <option value="-1">是</option>  
107 - </select>  
108 - </li>  
109 - <li>  
110 - <label>保质期(天)：</label>  
111 - <input type="number" name="daystoexpire"/>  
112 - </li>  
113 - <li>  
114 - <label>临期预警：</label>  
115 - <select name="expiringdays">  
116 - <option value="0">否</option>  
117 - <option value="-1">是</option>  
118 - </select>  
119 - </li>  
120 - <li>  
121 - <label>收货预警(天)：</label>  
122 - <input type="number" name="minshelflifedays"/>  
123 - </li>  
124 - <li>  
125 - <label>RF快速上架：</label>  
126 - <select name="allowquickputaway">  
127 - <option value="0">否</option>  
128 - <option value="-1">是</option>  
129 - </select>  
130 - </li>  
131 - <li>  
132 - <label>属性模板：</label>  
133 - <input type="text" name="attributetemplatecode"/>  
134 - </li>  
135 - <li>  
136 - <label>快速入库：</label>  
137 - <select name="usequickcheckin">  
138 - <option value="0">否</option>  
139 - <option value="-1">是</option>  
140 - </select>  
141 - </li>  
142 - <li>  
143 - <label>创建用户：</label>  
144 - <input type="text" name="createdby"/>  
145 - </li>  
146 - <li>  
147 - <label>更新用户：</label>  
148 - <select name="lastupdatedby">  
149 - <option value="0">否</option>  
150 - <option value="-1">是</option>  
151 - </select>  
152 - </li>-->  
153 -  
154 <p style=" float:right;text-align: right; padding:5px 50px 0 0"> 34 <p style=" float:right;text-align: right; padding:5px 50px 0 0">
155 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i 35 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
156 class="fa fa-search"></i>&nbsp;搜索</a> 36 class="fa fa-search"></i>&nbsp;搜索</a>
@@ -173,7 +53,7 @@ @@ -173,7 +53,7 @@
173 <ul> 53 <ul>
174 <li> 54 <li>
175 <label>入库流程：</label> 55 <label>入库流程：</label>
176 - <select name="checkinbypiece"> 56 + <select name="receivingFlow">
177 <option value="0">否</option> 57 <option value="0">否</option>
178 <option value="-1">是</option> 58 <option value="-1">是</option>
179 </select> 59 </select>
@@ -184,26 +64,26 @@ @@ -184,26 +64,26 @@
184 <div class="col-lg-4"><label>自动生成托盘号：</label></div> 64 <div class="col-lg-4"><label>自动生成托盘号：</label></div>
185 <div class="col-lg-8"> 65 <div class="col-lg-8">
186 <div class="onoffswitch"> 66 <div class="onoffswitch">
187 - <input type="checkbox" class="onoffswitch-checkbox" id="autoassignlpn" name="autoassignlpn" checked="checked">  
188 - <label class="onoffswitch-label" for="autoassignlpn"> 67 + <input type="checkbox" class="onoffswitch-checkbox" id="autoAssignLPN" name="autoAssignLPN" checked="checked">
  68 + <label class="onoffswitch-label" for="autoAssignLPN">
189 <span class="onoffswitch-inner"></span> 69 <span class="onoffswitch-inner"></span>
190 <span class="onoffswitch-switch"></span> 70 <span class="onoffswitch-switch"></span>
191 </label> 71 </label>
192 </div> 72 </div>
193 </div> 73 </div>
194 </li> 74 </li>
195 - <li>  
196 - <label>托盘生成号：</label>  
197 - <input type="text" name="autoassignlpn" placeholder="on 就调出正则表达式" />  
198 - </li> 75 +<!-- <li>-->
  76 +<!-- <label>托盘生成号：</label>-->
  77 +<!-- <input type="text" name="autoAssignLPN" placeholder="on 就调出正则表达式" />-->
  78 +<!-- </li>-->
199 </ul> 79 </ul>
200 <ul> 80 <ul>
201 <li> 81 <li>
202 <div class="col-lg-4"><label>允许超收：</label></div> 82 <div class="col-lg-4"><label>允许超收：</label></div>
203 <div class="col-lg-8"> 83 <div class="col-lg-8">
204 <div class="onoffswitch"> 84 <div class="onoffswitch">
205 - <input type="checkbox" class="onoffswitch-checkbox" id="allowoverreceiving" name="allowoverreceiving" checked="checked">  
206 - <label class="onoffswitch-label" for="allowoverreceiving"> 85 + <input type="checkbox" class="onoffswitch-checkbox" id="allowOverReceiving" name="allowOverReceiving" checked="checked">
  86 + <label class="onoffswitch-label" for="allowOverReceiving">
207 <span class="onoffswitch-inner"></span> 87 <span class="onoffswitch-inner"></span>
208 <span class="onoffswitch-switch"></span> 88 <span class="onoffswitch-switch"></span>
209 </label> 89 </label>
@@ -212,7 +92,7 @@ @@ -212,7 +92,7 @@
212 </li> 92 </li>
213 <li> 93 <li>
214 <label>允许超收范围：</label> 94 <label>允许超收范围：</label>
215 - <input type="text" name="allowoverreceivingqty" placeholder="%" /> 95 + <input type="number" name="allowOverReceivingQty" placeholder="%" />
216 </li> 96 </li>
217 </ul> 97 </ul>
218 <ul> 98 <ul>
@@ -220,8 +100,8 @@ @@ -220,8 +100,8 @@
220 <div class="col-lg-4"><label>自动定位：</label></div> 100 <div class="col-lg-4"><label>自动定位：</label></div>
221 <div class="col-lg-8"> 101 <div class="col-lg-8">
222 <div class="onoffswitch"> 102 <div class="onoffswitch">
223 - <input type="checkbox" class="onoffswitch-checkbox" id="autolocate" name="autolocate" checked="checked">  
224 - <label class="onoffswitch-label" for="autolocate"> 103 + <input type="checkbox" class="onoffswitch-checkbox" id="autoLocate" name="autoLocate" checked="checked">
  104 + <label class="onoffswitch-label" for="autoLocate">
225 <span class="onoffswitch-inner"></span> 105 <span class="onoffswitch-inner"></span>
226 <span class="onoffswitch-switch"></span> 106 <span class="onoffswitch-switch"></span>
227 </label> 107 </label>
@@ -230,14 +110,14 @@ @@ -230,14 +110,14 @@
230 </li> 110 </li>
231 <li> 111 <li>
232 <label>定位规则：</label> 112 <label>定位规则：</label>
233 - <select name="locationrule"> 113 + <select name="locationRule">
234 <option value="0">否</option> 114 <option value="0">否</option>
235 <option value="-1">是</option> 115 <option value="-1">是</option>
236 </select> 116 </select>
237 </li> 117 </li>
238 <li> 118 <li>
239 <label>容器选择规则：</label> 119 <label>容器选择规则：</label>
240 - <select name="checkinbypiece"> 120 + <select name="checkinByPiece">
241 <option value="0">否</option> 121 <option value="0">否</option>
242 <option value="-1">是</option> 122 <option value="-1">是</option>
243 </select> 123 </select>
@@ -248,8 +128,8 @@ @@ -248,8 +128,8 @@
248 <div class="col-lg-4"><label>快速入库：</label></div> 128 <div class="col-lg-4"><label>快速入库：</label></div>
249 <div class="col-lg-8"> 129 <div class="col-lg-8">
250 <div class="onoffswitch"> 130 <div class="onoffswitch">
251 - <input type="checkbox" class="onoffswitch-checkbox" id="usequickcheckin" name="usequickcheckin" checked="checked">  
252 - <label class="onoffswitch-label" for="usequickcheckin"> 131 + <input type="checkbox" class="onoffswitch-checkbox" id="useQuickCheckIn" name="useQuickCheckIn" checked="checked">
  132 + <label class="onoffswitch-label" for="useQuickCheckIn">
253 <span class="onoffswitch-inner"></span> 133 <span class="onoffswitch-inner"></span>
254 <span class="onoffswitch-switch"></span> 134 <span class="onoffswitch-switch"></span>
255 </label> 135 </label>
@@ -272,8 +152,8 @@ @@ -272,8 +152,8 @@
272 <div class="col-lg-4"><label>组车收货：</label></div> 152 <div class="col-lg-4"><label>组车收货：</label></div>
273 <div class="col-lg-8"> 153 <div class="col-lg-8">
274 <div class="onoffswitch"> 154 <div class="onoffswitch">
275 - <input type="checkbox" class="onoffswitch-checkbox" id="groupputaway" name="groupputaway" checked="checked">  
276 - <label class="onoffswitch-label" for="groupputaway"> 155 + <input type="checkbox" class="onoffswitch-checkbox" id="groupPutaway" name="groupPutaway" checked="checked">
  156 + <label class="onoffswitch-label" for="groupPutaway">
277 <span class="onoffswitch-inner"></span> 157 <span class="onoffswitch-inner"></span>
278 <span class="onoffswitch-switch"></span> 158 <span class="onoffswitch-switch"></span>
279 </label> 159 </label>
@@ -284,8 +164,8 @@ @@ -284,8 +164,8 @@
284 <div class="col-lg-4"><label>显示未收货数量：</label></div> 164 <div class="col-lg-4"><label>显示未收货数量：</label></div>
285 <div class="col-lg-8"> 165 <div class="col-lg-8">
286 <div class="onoffswitch"> 166 <div class="onoffswitch">
287 - <input type="checkbox" class="onoffswitch-checkbox" id="showopenqty" name="showopenqty" checked="checked">  
288 - <label class="onoffswitch-label" for="showopenqty"> 167 + <input type="checkbox" class="onoffswitch-checkbox" id="showOpenQty" name="showOpenQty" checked="checked">
  168 + <label class="onoffswitch-label" for="showOpenQty">
289 <span class="onoffswitch-inner"></span> 169 <span class="onoffswitch-inner"></span>
290 <span class="onoffswitch-switch"></span> 170 <span class="onoffswitch-switch"></span>
291 </label> 171 </label>
@@ -296,8 +176,8 @@ @@ -296,8 +176,8 @@
296 <div class="col-lg-4"><label>人工组盘：</label></div> 176 <div class="col-lg-4"><label>人工组盘：</label></div>
297 <div class="col-lg-8"> 177 <div class="col-lg-8">
298 <div class="onoffswitch"> 178 <div class="onoffswitch">
299 - <input type="checkbox" class="onoffswitch-checkbox" id="manuallybuildlpn" name="manuallybuildlpn" checked="checked">  
300 - <label class="onoffswitch-label" for="manuallybuildlpn"> 179 + <input type="checkbox" class="onoffswitch-checkbox" id="manuallyBuildLPN" name="manuallyBuildLPN" checked="checked">
  180 + <label class="onoffswitch-label" for="manuallyBuildLPN">
301 <span class="onoffswitch-inner"></span> 181 <span class="onoffswitch-inner"></span>
302 <span class="onoffswitch-switch"></span> 182 <span class="onoffswitch-switch"></span>
303 </label> 183 </label>
@@ -308,8 +188,8 @@ @@ -308,8 +188,8 @@
308 <div class="col-lg-4"><label>逐件收货：</label></div> 188 <div class="col-lg-4"><label>逐件收货：</label></div>
309 <div class="col-lg-8"> 189 <div class="col-lg-8">
310 <div class="onoffswitch"> 190 <div class="onoffswitch">
311 - <input type="checkbox" class="onoffswitch-checkbox" id="checkinbypiece" name="checkinbypiece" checked="checked">  
312 - <label class="onoffswitch-label" for="checkinbypiece"> 191 + <input type="checkbox" class="onoffswitch-checkbox" id="checkinByPiece" name="checkinByPiece" checked="checked">
  192 + <label class="onoffswitch-label" for="checkinByPiece">
313 <span class="onoffswitch-inner"></span> 193 <span class="onoffswitch-inner"></span>
314 <span class="onoffswitch-switch"></span> 194 <span class="onoffswitch-switch"></span>
315 </label> 195 </label>
@@ -320,8 +200,8 @@ @@ -320,8 +200,8 @@
320 <div class="col-lg-4"><label>自动提交(平库)：</label></div> 200 <div class="col-lg-4"><label>自动提交(平库)：</label></div>
321 <div class="col-lg-8"> 201 <div class="col-lg-8">
322 <div class="onoffswitch"> 202 <div class="onoffswitch">
323 - <input type="checkbox" class="onoffswitch-checkbox" id="status" name="status" checked="checked">  
324 - <label class="onoffswitch-label" for="status"> 203 + <input type="checkbox" class="onoffswitch-checkbox" id="pieceConfirm" name="pieceConfirm" checked="checked">
  204 + <label class="onoffswitch-label" for="pieceConfirm">
325 <span class="onoffswitch-inner"></span> 205 <span class="onoffswitch-inner"></span>
326 <span class="onoffswitch-switch"></span> 206 <span class="onoffswitch-switch"></span>
327 </label> 207 </label>
@@ -344,8 +224,8 @@ @@ -344,8 +224,8 @@
344 <div class="col-lg-4"><label>ABC分类：</label></div> 224 <div class="col-lg-4"><label>ABC分类：</label></div>
345 <div class="col-lg-8"> 225 <div class="col-lg-8">
346 <div class="onoffswitch"> 226 <div class="onoffswitch">
347 - <input type="checkbox" class="onoffswitch-checkbox" id="classification" name="classification" checked="checked">  
348 - <label class="onoffswitch-label" for="classification"> 227 + <input type="checkbox" class="onoffswitch-checkbox" id="abcClass" name="abcClass" checked="checked">
  228 + <label class="onoffswitch-label" for="abcClass">
349 <span class="onoffswitch-inner"></span> 229 <span class="onoffswitch-inner"></span>
350 <span class="onoffswitch-switch"></span> 230 <span class="onoffswitch-switch"></span>
351 </label> 231 </label>
@@ -354,24 +234,24 @@ @@ -354,24 +234,24 @@
354 </li> 234 </li>
355 <li> 235 <li>
356 <label>属性模板：</label> 236 <label>属性模板：</label>
357 - <select name="checkinbypiece"> 237 + <select name="attributeTemplateCode">
358 <option value="0">否</option> 238 <option value="0">否</option>
359 - <option value="-1">是</option> 239 + <option value="1">是</option>
360 </select> 240 </select>
361 </li> 241 </li>
362 </ul> 242 </ul>
363 <ul> 243 <ul>
364 <li> 244 <li>
365 <label>保质期(天)：</label> 245 <label>保质期(天)：</label>
366 - <input type="text" name="autoassignlpn"/> 246 + <input type="number" name="daysToExpire"/>
367 </li> 247 </li>
368 <li> 248 <li>
369 <label>临期预警(天)：</label> 249 <label>临期预警(天)：</label>
370 - <input type="text" name="autoassignlpn"/> 250 + <input type="number" name="expiringDays"/>
371 </li> 251 </li>
372 <li> 252 <li>
373 <label>收货预警(天)：</label> 253 <label>收货预警(天)：</label>
374 - <input type="text" name="autoassignlpn"/> 254 + <input type="number" name="minShelfLifeDays"/>
375 </li> 255 </li>
376 </ul> 256 </ul>
377 </div> 257 </div>
@@ -427,285 +307,184 @@ @@ -427,285 +307,184 @@
427 visible: false 307 visible: false
428 }, 308 },
429 { 309 {
430 - field: 'warehousecode', 310 + field: 'warehouseCode',
431 title: '仓库' 311 title: '仓库'
432 }, 312 },
433 - // {  
434 - // field: 'warehousecode',  
435 - // title: '仓库',  
436 - // width: "10%",  
437 - // formatter: function (value, row, index) {  
438 - // var data = [{ index: index, warehousecode: value }];  
439 - // return $("#javaTypeTpl").tmpl(data).html();  
440 - // }  
441 - // },  
442 { 313 {
443 field: 'code', 314 field: 'code',
444 title: '首选项代码' 315 title: '首选项代码'
445 }, 316 },
446 - // {  
447 - // field: 'name',  
448 - // title: '首选项名字'  
449 - // },  
450 { 317 {
451 field: 'name', 318 field: 'name',
452 title: '首选项名字', 319 title: '首选项名字',
453 - width: "10%",  
454 formatter: function (value, row, index) { 320 formatter: function (value, row, index) {
455 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 321 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
456 return html; 322 return html;
457 } 323 }
458 }, 324 },
459 - // {  
460 - // field: 'receivingflow',  
461 - // title: '入库流程'  
462 - // },  
463 { 325 {
464 field: 'receivingFlow', 326 field: 'receivingFlow',
465 title: '入库流程', 327 title: '入库流程',
466 - width: "10%",  
467 formatter: function (value, row, index) { 328 formatter: function (value, row, index) {
468 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 329 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
469 return html; 330 return html;
470 } 331 }
471 }, 332 },
472 - // {  
473 - // field: 'autoassignlpn',  
474 - // title: '自动生成托盘号'  
475 - // },  
476 { 333 {
477 - field: 'autoassignlpn', 334 + field: 'autoAssignLPN',
478 title: '自动生成托盘号', 335 title: '自动生成托盘号',
479 - width: "10%",  
480 formatter: function (value, row, index) { 336 formatter: function (value, row, index) {
481 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 337 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
482 return html; 338 return html;
483 } 339 }
484 }, 340 },
485 - // {  
486 - // field: 'allowoverreceiving',  
487 - // title: '允许超收'  
488 - // },  
489 { 341 {
490 - field: 'allowoverreceiving', 342 + field: 'allowOverReceiving',
491 title: '允许超收', 343 title: '允许超收',
492 - width: "10%",  
493 formatter: function (value, row, index) { 344 formatter: function (value, row, index) {
494 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 345 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
495 return html; 346 return html;
496 } 347 }
497 }, 348 },
498 - // {  
499 - // field: 'allowoverreceivingqty',  
500 - // title: '允许超收范围'  
501 - // },  
502 { 349 {
503 - field: 'allowoverreceivingqty', 350 + field: 'allowOverReceivingQty',
504 title: '允许超收范围', 351 title: '允许超收范围',
505 - width: "10%",  
506 formatter: function (value, row, index) { 352 formatter: function (value, row, index) {
507 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 353 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
508 return html; 354 return html;
509 } 355 }
510 }, 356 },
511 - // {  
512 - // field: 'autolocate',  
513 - // title: '自动定位'  
514 - // },  
515 { 357 {
516 - field: 'autolocate', 358 + field: 'autoLocate',
517 title: '自动定位', 359 title: '自动定位',
518 - width: "5%",  
519 formatter: function (value, row, index) { 360 formatter: function (value, row, index) {
520 var isCheck = value == 1 ? 'checked' : ''; 361 var isCheck = value == 1 ? 'checked' : '';
521 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 362 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
522 return html; 363 return html;
523 } 364 }
524 }, 365 },
525 - // {  
526 - // field: 'showopenqty',  
527 - // title: 'RF显示未收数量'  
528 - // },  
529 { 366 {
530 - field: 'showopenqty', 367 + field: 'showOpenQty',
531 title: 'RF显示未收数量', 368 title: 'RF显示未收数量',
532 - width: "10%",  
533 formatter: function (value, row, index) { 369 formatter: function (value, row, index) {
534 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 370 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
535 return html; 371 return html;
536 } 372 }
537 }, 373 },
538 -  
539 - // {  
540 - // field: 'groupputaway',  
541 - // title: 'RF组车收货'  
542 - // },  
543 { 374 {
544 - field: 'groupputaway', 375 + field: 'groupPutaway',
545 title: 'RF组车收货', 376 title: 'RF组车收货',
546 - width: "5%", 377 + align: 'center',
547 formatter: function (value, row, index) { 378 formatter: function (value, row, index) {
548 var isCheck = value == 1 ? 'checked' : ''; 379 var isCheck = value == 1 ? 'checked' : '';
549 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 380 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
550 return html; 381 return html;
551 } 382 }
552 }, 383 },
553 - // {  
554 - // field: 'manuallybuildlpn',  
555 - // title: '人工组盘'  
556 - // },  
557 { 384 {
558 - field: 'manuallybuildlpn', 385 + field: 'manuallyBuildLPN',
559 title: '人工组盘', 386 title: '人工组盘',
560 - width: "10%",  
561 formatter: function (value, row, index) { 387 formatter: function (value, row, index) {
562 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 388 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
563 return html; 389 return html;
564 } 390 }
565 }, 391 },
566 - // {  
567 - // field: 'locationrule',  
568 - // title: '定位规则'  
569 - // },  
570 { 392 {
571 - field: 'locationrule', 393 + field: 'locationRule',
572 title: '定位规则', 394 title: '定位规则',
573 - width: "10%",  
574 formatter: function (value, row, index) { 395 formatter: function (value, row, index) {
575 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 396 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
576 return html; 397 return html;
577 } 398 }
578 }, 399 },
579 - // {  
580 - // field: 'emptylocrule',  
581 - // title: '空库位规则'  
582 - // },  
583 { 400 {
584 - field: 'emptylocrule', 401 + field: 'listingRules',
  402 + title: '上架规则',
  403 + formatter: function (value, row, index) {
  404 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  405 + return html;
  406 + }
  407 + },
  408 + {
  409 + field: 'emptyLocRule',
585 title: '空库位规则', 410 title: '空库位规则',
586 - width: "10%",  
587 formatter: function (value, row, index) { 411 formatter: function (value, row, index) {
588 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 412 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
589 return html; 413 return html;
590 } 414 }
591 }, 415 },
592 - // {  
593 - // field: 'checkinbypiece',  
594 - // title: 'RF逐件收货'  
595 - // },  
596 { 416 {
597 - field: 'checkinbypiece', 417 + field: 'checkinByPiece',
598 title: 'RF逐件收货', 418 title: 'RF逐件收货',
599 - width: "5%",  
600 formatter: function (value, row, index) { 419 formatter: function (value, row, index) {
601 var isCheck = value == 1 ? 'checked' : ''; 420 var isCheck = value == 1 ? 'checked' : '';
602 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 421 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
603 return html; 422 return html;
604 } 423 }
605 }, 424 },
606 - // {  
607 - // field: 'piececonfirm',  
608 - // title: 'RF自动提交收货'  
609 - // },  
610 { 425 {
611 - field: 'piececonfirm', 426 + field: 'pieceConfirm',
612 title: 'RF自动提交收货', 427 title: 'RF自动提交收货',
613 - width: "5%",  
614 formatter: function (value, row, index) { 428 formatter: function (value, row, index) {
615 var isCheck = value == 1 ? 'checked' : ''; 429 var isCheck = value == 1 ? 'checked' : '';
616 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 430 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
617 return html; 431 return html;
618 } 432 }
619 }, 433 },
620 - // {  
621 - // field: 'abcclass',  
622 - // title: 'abc分类 0 否 1是'  
623 - // },  
624 { 434 {
625 - field: 'abcclass', 435 + field: 'abcClass',
626 title: 'abc分类', 436 title: 'abc分类',
627 - width: "5%",  
628 formatter: function (value, row, index) { 437 formatter: function (value, row, index) {
629 var isCheck = value == 1 ? 'checked' : ''; 438 var isCheck = value == 1 ? 'checked' : '';
630 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 439 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
631 return html; 440 return html;
632 } 441 }
633 }, 442 },
634 - // {  
635 - // field: 'daystoexpire',  
636 - // title: '保质期'  
637 - // },  
638 { 443 {
639 - field: 'daystoexpire', 444 + field: 'daysToExpire',
640 title: '保质期', 445 title: '保质期',
641 - width: "10%",  
642 formatter: function (value, row, index) { 446 formatter: function (value, row, index) {
643 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 447 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
644 return html; 448 return html;
645 } 449 }
646 }, 450 },
647 - // {  
648 - // field: 'expiringdays',  
649 - // title: '临期预警'  
650 - // },  
651 { 451 {
652 - field: 'expiringdays', 452 + field: 'expiringDays',
653 title: '临期预警', 453 title: '临期预警',
654 - width: "5%",  
655 formatter: function (value, row, index) { 454 formatter: function (value, row, index) {
656 var isCheck = value == 1 ? 'checked' : ''; 455 var isCheck = value == 1 ? 'checked' : '';
657 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 456 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
658 return html; 457 return html;
659 } 458 }
660 }, 459 },
661 - // {  
662 - // field: 'minshelflifedays',  
663 - // title: '收货预警(天)'  
664 - // },  
665 { 460 {
666 - field: 'minshelflifedays', 461 + field: 'minShelfLifeDays',
667 title: '收货预警(天)', 462 title: '收货预警(天)',
668 - width: "10%",  
669 formatter: function (value, row, index) { 463 formatter: function (value, row, index) {
670 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 464 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
671 return html; 465 return html;
672 } 466 }
673 }, 467 },
674 - // {  
675 - // field: 'allowquickputaway',  
676 - // title: 'RF快速上架'  
677 - // },  
678 { 468 {
679 - field: 'allowquickputaway', 469 + field: 'allowQuickPutaway',
680 title: 'RF快速上架', 470 title: 'RF快速上架',
681 - width: "5%",  
682 formatter: function (value, row, index) { 471 formatter: function (value, row, index) {
683 var isCheck = value == 1 ? 'checked' : ''; 472 var isCheck = value == 1 ? 'checked' : '';
684 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 473 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
685 return html; 474 return html;
686 } 475 }
687 }, 476 },
688 - // {  
689 - // field: 'attributetemplatecode',  
690 - // title: '属性模板'  
691 - // },  
692 { 477 {
693 - field: 'attributetemplatecode', 478 + field: 'attributeTemplateCode',
694 title: '属性模板', 479 title: '属性模板',
695 - width: "10%",  
696 formatter: function (value, row, index) { 480 formatter: function (value, row, index) {
697 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 481 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
698 return html; 482 return html;
699 } 483 }
700 }, 484 },
701 - // {  
702 - // field: 'usequickcheckin',  
703 - // title: '快速入库'  
704 - // },  
705 { 485 {
706 - field: 'usequickcheckin', 486 + field: 'useQuickCheckIn',
707 title: '快速入库', 487 title: '快速入库',
708 - width: "10%",  
709 formatter: function (value, row, index) { 488 formatter: function (value, row, index) {
710 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 489 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
711 return html; 490 return html;
@@ -715,38 +494,23 @@ @@ -715,38 +494,23 @@
715 field: 'created', 494 field: 'created',
716 title: '创建时间' 495 title: '创建时间'
717 }, 496 },
718 - // {  
719 - // field: 'createdby',  
720 - // title: '创建用户'  
721 - // },  
722 { 497 {
723 - field: 'createdby', 498 + field: 'createdBy',
724 title: '创建用户', 499 title: '创建用户',
725 - width: "10%",  
726 formatter: function (value, row, index) { 500 formatter: function (value, row, index) {
727 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value)); 501 var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
728 return html; 502 return html;
729 } 503 }
730 }, 504 },
731 - // {  
732 - // field: 'lastupdated',  
733 - // title: '创建时间'  
734 - // },  
735 - // {  
736 - // field: 'lastupdatedby',  
737 - // title: '更新用户'  
738 - // },  
739 { 505 {
740 - field: 'lastupdatedby', 506 + field: 'lastUpdated',
741 title: '更新用户', 507 title: '更新用户',
742 - width: "5%",  
743 formatter: function (value, row, index) { 508 formatter: function (value, row, index) {
744 var isCheck = value == 1 ? 'checked' : ''; 509 var isCheck = value == 1 ? 'checked' : '';
745 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck); 510 var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
746 return html; 511 return html;
747 } 512 }
748 }, 513 },
749 -  
750 { 514 {
751 title: '操作', 515 title: '操作',
752 align: 'center', 516 align: 'center',
@@ -759,7 +523,7 @@ @@ -759,7 +523,7 @@
759 }; 523 };
760 $.table.init(options); 524 $.table.init(options);
761 525
762 - var a =$(".box2 ul li:gt(3):not(:last)"); 526 + let a =$(".box2 ul li:gt(3):not(:last)");
763 a.hide(); 527 a.hide();
764 $(".boxdown").click(function(){ 528 $(".boxdown").click(function(){
765 if(a.is(':visible')){ 529 if(a.is(':visible')){
@@ -772,22 +536,22 @@ @@ -772,22 +536,22 @@
772 }); 536 });
773 537
774 538
775 - $.ajax({  
776 - url: "../getWarehouseByUserCode",  
777 - type: 'post',  
778 - dataType: "json",  
779 - data: {  
780 - username: "fxh"  
781 - },  
782 - success: function (value) {  
783 - // console.log(value.data);  
784 - $("#warehouse").contents().remove();  
785 - if (value != null && value.data.length >= 1)  
786 - for (var i = 0; i < value.data.length; i++) {  
787 - $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');  
788 - }  
789 - }  
790 - }) 539 + $.ajax({
  540 + url: "../getWarehouseByUserCode",
  541 + type: 'post',
  542 + dataType: "json",
  543 + data: {
  544 + username: [[${@permission.getPrincipalProperty('id')}]]
  545 + },
  546 + success: function (value) {
  547 + // console.log(value.data);
  548 + $("#warehouse").contents().remove();
  549 + if (value != null && value.data.length >= 1)
  550 + for (var i = 0; i < value.data.length; i++) {
  551 + $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
  552 + }
  553 + }
  554 + })
791 555
792 }); 556 });
793 557
src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
  View file @e48b2bd
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </a>--> 72 </a>-->
73 </div> 73 </div>
74 <table id="bootstrap-table" data-mobile-responsive="true" 74 <table id="bootstrap-table" data-mobile-responsive="true"
75 - class="table table-bordered table-hover"></table> 75 + class="table table-bordered table-hover text-nowrap"></table>
76 </div> 76 </div>
77 <div class="tab-pane fade" id="tabDetail"></div> 77 <div class="tab-pane fade" id="tabDetail"></div>
78 </div> 78 </div>
src/main/resources/templates/monitor/locationstatus/locationstatus.html
  View file @e48b2bd
@@ -9,13 +9,14 @@ @@ -9,13 +9,14 @@
9 font-size: 10px; 9 font-size: 10px;
10 /*width: 50px;*/ 10 /*width: 50px;*/
11 text-align: left; 11 text-align: left;
12 - margin: auto 3px; 12 + margin: 5px 20px 5px 5px;
13 } 13 }
14 #img_list li img{ 14 #img_list li img{
15 height: 35px; 15 height: 35px;
16 width: 35px; 16 width: 35px;
17 } 17 }
18 #info_list{ 18 #info_list{
  19 + width: 100%;
19 display:inline-block; 20 display:inline-block;
20 } 21 }
21 #info_list li{ 22 #info_list li{
src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
  View file @e48b2bd
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 容器编号：<input type="text" name="receiptContainerCode"/> 24 容器编号：<input type="text" name="receiptContainerCode"/>
25 </li> 25 </li>
26 <li> 26 <li>
27 - 库位编号：<input type="text" name="locationCode"/> 27 + 库位编号：<input type="text" name="toLocation"/>
28 </li> 28 </li>
29 <li> 29 <li>
30 <!--入库类型：<input type="text" name="sourceCode"/> 30 <!--入库类型：<input type="text" name="sourceCode"/>
src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
  View file @e48b2bd
@@ -56,16 +56,6 @@ @@ -56,16 +56,6 @@
56 </div> 56 </div>
57 </form> 57 </form>
58 </div> 58 </div>
59 - <div class="btn-group hidden-xs" id="toolbar" role="group">  
60 - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"  
61 - shiro:hasPermission="receipt:receiptHeader:add">  
62 - <i class="fa fa-plus"></i> 新增  
63 - </a>  
64 - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"  
65 - shiro:hasPermission="receipt:receiptHeader:remove">  
66 - <i class="fa fa-trash-o"></i> 删除  
67 - </a>  
68 - </div>  
69 <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table> 59 <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
70 </div> 60 </div>
71 61
@@ -437,17 +427,6 @@ @@ -437,17 +427,6 @@
437 field : 'userDef3', 427 field : 'userDef3',
438 title : '自定义字段3' , 428 title : '自定义字段3' ,
439 visible:false 429 visible:false
440 - },  
441 - {  
442 - title: '操作',  
443 - align: 'center',  
444 - events:'operateEvents',  
445 - formatter: function(value, row, index) {  
446 - var actions = [];  
447 - 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> ');  
448 - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');  
449 - return actions.join('');  
450 - }  
451 }] 430 }]
452 }); 431 });
453 432