wms / wms_tianjinggelinmei · Commits

Commit 68fd1e15fcacd44fb3d0620dc522d3abe4923c4a

Authored by 周鸿
2 parents 3434d8e7 611b083c
develop

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 12 changed files with 573 additions and 553 deletions
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
  View file @68fd1e1
... ... @@ -43,6 +43,8 @@ import java.math.BigDecimal;
43 43 import java.util.ArrayList;
44 44 import java.util.List;
45 45  
  46 +import static com.huaheng.common.constant.QuantityConstant.*;
  47 +
46 48 /**
47 49 * @ClassName AcsServiceImpl
48 50 * @Description TODO
... ... @@ -185,7 +187,7 @@ public class AcsServiceImpl implements AcsService {
185 187 }
186 188 }
187 189 break;
188   - case QuantityConstant.TASK_TYPE_SORTINGSHIPMENT:
  190 + case TASK_TYPE_SORTINGSHIPMENT:
189 191 //任务类型分拣出库，agv类型为入库，不完成接口
190 192 if(agvTask.getTaskType().equals(QuantityConstant.AGV_TYPE_TAKE)){
191 193 //更新库存重量和库位重量
... ... @@ -278,7 +280,7 @@ public class AcsServiceImpl implements AcsService {
278 280 AgvTask agvTask=null;
279 281 //补充入库：先出库 agvtaskid2 状态400，后入库 agvtaskid 状态300
280 282 //分拣出库：先出库 agvtaskid 状态400，后入库 agvtaskid2 状态300
281   - if(taskHeader.getTaskType().intValue()==QuantityConstant.TASK_TYPE_SORTINGSHIPMENT
  283 + if(taskHeader.getTaskType().intValue()== TASK_TYPE_SORTINGSHIPMENT
282 284 ||taskHeader.getTaskType().intValue()==QuantityConstant.TASK_TYPE_VIEW){
283 285 agvTask=agvTaskService.getById(taskHeader.getAgvTaskId2());
284 286 }else{
... ... @@ -304,20 +306,26 @@ public class AcsServiceImpl implements AcsService {
304 306 public List<TaskHeader> getTaskHeader(AcsWeightHeight acsWeightHeight){
305 307 LambdaQueryWrapper<TaskHeader> taskHeaderLamb = Wrappers.lambdaQuery();
306 308 taskHeaderLamb.eq(TaskHeader::getContainerCode, acsWeightHeight.getContainerCode());
307   - taskHeaderLamb.eq(TaskHeader::getStatus,QuantityConstant.TASK_STATUS_BUILD);
308   - taskHeaderLamb.in(TaskHeader::getTaskType,QuantityConstant.TASK_TYPE_WHOLERECEIPT,
309   - QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT,QuantityConstant.TASK_TYPE_VIEW);
  309 + taskHeaderLamb.eq(TaskHeader::getStatus,TASK_STATUS_BUILD);
  310 + taskHeaderLamb.in(TaskHeader::getTaskType,TASK_TYPE_WHOLERECEIPT, TASK_TYPE_SUPPLEMENTRECEIPT,TASK_TYPE_VIEW);
310 311 taskHeaderLamb.orderByDesc(TaskHeader::getId);
311 312 List<TaskHeader> taskHeaders = taskHeaderService.list(taskHeaderLamb);
312 313 TaskHeader taskHeader=null;
313 314 if(taskHeaders==null||taskHeaders.size()==0){
314 315 LambdaQueryWrapper<TaskHeader> lam = Wrappers.lambdaQuery();
315 316 lam.eq(TaskHeader::getContainerCode, acsWeightHeight.getContainerCode());
316   - lam.eq(TaskHeader::getStatus,QuantityConstant.TASK_STATUS_COMPLETED);
317   - lam.in(TaskHeader::getTaskType,QuantityConstant.TASK_TYPE_SORTINGSHIPMENT,QuantityConstant.TASK_TYPE_VIEW);
  317 + lam.eq(TaskHeader::getStatus,TASK_STATUS_COMPLETED);
  318 + lam.in(TaskHeader::getTaskType, TASK_TYPE_SORTINGSHIPMENT,TASK_TYPE_VIEW);
318 319 lam.orderByDesc(TaskHeader::getId);
319 320 taskHeaders = taskHeaderService.list(lam);
320 321 if(taskHeaders==null||taskHeaders.size()==0){
  322 + //List<TaskHeader> list = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
  323 + // .eq(TaskHeader::getContainerCode, acsWeightHeight.getContainerCode())
  324 + // .in(TaskHeader::getStatus, TASK_STATUS_BUILD,TASK_STATUS_RELEASE,TASK_STATUS_RUNNING,TASK_STATUS_ARRIVED_STATION)
  325 + // .in(TaskHeader::getTaskType, TASK_TYPE_SORTINGSHIPMENT,TASK_TYPE_VIEW));
  326 + //if (list.size()==1) {
  327 + // throw new ServiceException("AGV没传出库完成信号，这个任务未完成，托盘:"+acsWeightHeight.getContainerCode());
  328 + //}
321 329 throw new ServiceException("传递AGV托盘重量高度,"+acsWeightHeight.getContainerCode()+"该托盘在任务中找不到，请先生成任务");
322 330 }
323 331  
... ...
src/main/java/com/huaheng/api/general/controller/BigScreenController.java
  View file @68fd1e1
... ... @@ -43,43 +43,50 @@ public class BigScreenController {
43 43 List<LinkedHashMap<String, Object>> locationProp = mapper.selectCommon(sql1);
44 44  
45 45 String sql2 = "select a.click_date as date,ifnull(b.taskQty,0) as qty\n" +
46   - "from (\n" +
47   - " SELECT curdate() as click_date\n" +
48   - " union all\n" +
49   - " SELECT date_sub(curdate(), interval 1 day) as click_date\n" +
50   - " union all\n" +
51   - " SELECT date_sub(curdate(), interval 2 day) as click_date\n" +
52   - " union all\n" +
53   - " SELECT date_sub(curdate(), interval 3 day) as click_date\n" +
54   - " union all\n" +
55   - " SELECT date_sub(curdate(), interval 4 day) as click_date\n" +
56   - " union all\n" +
57   - " SELECT date_sub(curdate(), interval 5 day) as click_date\n" +
58   - " union all\n" +
59   - " SELECT date_sub(curdate(), interval 6 day) as click_date\n" +
60   - ") a left join (\n" +
61   - "SELECT DATE(h.created) AS created , SUM(d.qty) AS taskQty from shipment_container_detail d join shipment_container_header h on d.shippingContainerId = h.id and h.warehouseCode='"+ShiroUtils.getWarehouseCodeCS0001()+"' WHERE h.created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND h.status=20 GROUP BY DATE(h.created)\n" +
62   - ") b on a.click_date = b.created ORDER BY a.click_date;";;
  46 + " FROM (\n" +
  47 + " SELECT curdate() as click_date\n" +
  48 + " UNION all\n" +
  49 + " SELECT date_sub(curdate(), interval 1 day) as click_date\n" +
  50 + " UNION all\n" +
  51 + " SELECT date_sub(curdate(), interval 2 day) as click_date\n" +
  52 + " UNION all\n" +
  53 + " SELECT date_sub(curdate(), interval 3 day) as click_date\n" +
  54 + " UNION all\n" +
  55 + " SELECT date_sub(curdate(), interval 4 day) as click_date\n" +
  56 + " UNION all\n" +
  57 + " SELECT date_sub(curdate(), interval 5 day) as click_date\n" +
  58 + " UNION all\n" +
  59 + " SELECT date_sub(curdate(), interval 6 day) as click_date ) a\n" +
  60 + " LEFT JOIN (\n" +
  61 + " SELECT DATE(h.completeTime) AS completeTime , SUM(d.qty) AS taskQty\n" +
  62 + " FROM task_detail d join task_header h\n" +
  63 + " ON d.taskId = h.id and h.warehouseCode='CS0001'\n" +
  64 + " WHERE h.completeTime >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND h.status=100 and h.zoneCode='B'" +
  65 + " and h.taskType=100 or h.taskType=200 GROUP BY DATE(h.completeTime)) b\n" +
  66 + " ON a.click_date = b.completeTime ORDER BY a.click_date;";
63 67 List<LinkedHashMap<String, Object>> receiptNum = mapper.selectCommon(sql2);
64 68  
65 69 String sql3 = "select a.click_date as date,ifnull(b.taskQty,0) as qty\n" +
66   - "from (\n" +
67   - " SELECT curdate() as click_date\n" +
68   - " union all\n" +
69   - " SELECT date_sub(curdate(), interval 1 day) as click_date\n" +
70   - " union all\n" +
71   - " SELECT date_sub(curdate(), interval 2 day) as click_date\n" +
72   - " union all\n" +
73   - " SELECT date_sub(curdate(), interval 3 day) as click_date\n" +
74   - " union all\n" +
75   - " SELECT date_sub(curdate(), interval 4 day) as click_date\n" +
76   - " union all\n" +
77   - " SELECT date_sub(curdate(), interval 5 day) as click_date\n" +
78   - " union all\n" +
79   - " SELECT date_sub(curdate(), interval 6 day) as click_date\n" +
80   - ") a left join (\n" +
81   - "SELECT DATE(h.created) AS created , SUM(d.qty) AS taskQty from receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id and h.warehouseCode='"+ShiroUtils.getWarehouseCodeCS0001()+"' WHERE h.created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND d.status=20 GROUP BY DATE(h.created)\n" +
82   - ") b on a.click_date = b.created ORDER BY a.click_date;";
  70 + " FROM (\n" +
  71 + " SELECT curdate() as click_date\n" +
  72 + " UNION all\n" +
  73 + " SELECT date_sub(curdate(), interval 1 day) as click_date\n" +
  74 + " UNION all\n" +
  75 + " SELECT date_sub(curdate(), interval 2 day) as click_date\n" +
  76 + " UNION all\n" +
  77 + " SELECT date_sub(curdate(), interval 3 day) as click_date\n" +
  78 + " UNION all\n" +
  79 + " SELECT date_sub(curdate(), interval 4 day) as click_date\n" +
  80 + " UNION all\n" +
  81 + " SELECT date_sub(curdate(), interval 5 day) as click_date\n" +
  82 + " UNION all\n" +
  83 + " SELECT date_sub(curdate(), interval 6 day) as click_date ) a\n" +
  84 + " LEFT JOIN (\n" +
  85 + " SELECT DATE(h.completeTime) AS completeTime , SUM(d.qty) AS taskQty\n" +
  86 + " FROM task_detail d join task_header h\n" +
  87 + " ON d.taskId = h.id and h.warehouseCode='CS0001'\n" +
  88 + " WHERE h.completeTime >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND h.status=100 and h.zoneCode='B' and h.taskType=300 or h.taskType=400 GROUP BY DATE(h.completeTime)) b\n" +
  89 + " ON a.click_date = b.completeTime ORDER BY a.click_date;";
83 90 List<LinkedHashMap<String, Object>> shipmentNum = mapper.selectCommon(sql3);
84 91  
85 92 List<BigScreenTask> itemReceipts= bigScreenService.selectReceiptTask();
... ... @@ -101,18 +108,15 @@ public class BigScreenController {
101 108  
102 109 public AjaxResult getCommonData(){
103 110 String condition = " and warehouseCode = '" + ShiroUtils.getWarehouseCodeCS0001() +"'";
104   - String bllCount = "SELECT ifnull(sum(t.a),0) 'total' from (\n" +
105   - "SELECT COUNT(*) 'a' FROM receipt_header WHERE DATEDIFF(NOW(), created)=0 " + condition +
106   - " UNION \n" +
107   - "SELECT COUNT(*) 'a' FROM shipment_header WHERE DATEDIFF(NOW(), created)=0 " + condition +
108   - ") t";
109   - String receiptTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' FROM receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND d.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCodeCS0001()+"' ;";
110   - String shipmentTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' from shipment_container_detail d JOIN shipment_container_header h on d.shippingContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND h.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCodeCS0001()+"' ;";
111   - String inventoryTotal = "SELECT IFNULL(SUM(totalQty),0) 'total' from inventory_header where 1=1 " + condition;
112   - String materialCount = "SELECT count(DISTINCT materialSkuQty) 'total' from inventory_header WHERE 1=1" + condition;
113   - String taskUncompletedTotal = "SELECT COUNT(*) 'total' from task_header WHERE status < 100 " + condition;
  111 + String bllCount = "select ifnull(sum( d.qty ),0) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=100 or h.taskType=200 or h.taskType=300 or h.taskType=400) and h.zoneCode='B' and h.status=100" ;
  112 +
  113 + String receiptTotal= "select ifnull(sum( d.qty ),0) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=100 or h.taskType=200) and h.zoneCode='B' and h.status=100" ;
  114 + String shipmentTotal = "select ifnull(sum( d.qty ),0) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=300 or h.taskType=400) and h.zoneCode='B' and h.status=100";
  115 + String inventoryTotal = "SELECT IFNULL(SUM(totalQty),0) 'total' from inventory_header where 1=1 and zoneCode='B'" ;
  116 + String materialCount = "SELECT ifnull(count(DISTINCT materialCode),0) 'total' from inventory_detail WHERE 1=1 and h.zoneCode='B'" ;
114 117 //AGV库，空闲库位数
115   - String availableLocationCount="SELECT COUNT(*) 'total' from location where containerCode is null or trim(containerCode)='' and status='empty' and zoneCode='B'";
  118 + String availableLocationCount="SELECT COUNT(*) 'total' from location where containerCode is null or trim(containerCode)='' and zoneCode='B' and status='empty'" ;
  119 + String taskUncompletedTotal = "SELECT ifnull(COUNT(*),0) 'total' from task_header WHERE zoneCode='B' and status < 100" ;
116 120  
117 121 Map<String, Object> map = new HashMap<>();
118 122 List<LinkedHashMap<String, Object>> temp1 = mapper.selectCommon(bllCount);
... ...
src/main/java/com/huaheng/pc/config/materialType/service/MaterialTypeService.java
  View file @68fd1e1
... ... @@ -29,12 +29,14 @@ public class MaterialTypeService extends ServiceImpl&lt;MaterialTypeMapper, Materia
29 29 }
30 30  
31 31 public String getMaterialTypeByCode(String code){
32   - LambdaQueryWrapper<MaterialType> lambda = Wrappers.lambdaQuery();
33   - lambda.eq(MaterialType::getCode, code);
34   - lambda.last("limit 1");
35   - MaterialType materialType=this.getOne(lambda);
36   - if(materialType!=null){
37   - return materialType.getRows();
  32 + //LambdaQueryWrapper<MaterialType> lambda = Wrappers.lambdaQuery();
  33 + //lambda.eq(MaterialType::getCode, code);
  34 + //lambda.last("limit 1");
  35 + //MaterialType materialType=this.getOne(lambda);
  36 +
  37 + List<MaterialType> materialTypes=this.list(new LambdaQueryWrapper<MaterialType>().eq(MaterialType ::getCode,code).last("limit 1"));
  38 + if(materialTypes.size() > 0){
  39 + return materialTypes.get(0).getRows();
38 40 }else{
39 41 return null;
40 42 }
... ...
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
  View file @68fd1e1
... ... @@ -219,7 +219,7 @@ public class RyTask extends BaseController {
219 219 if (ajaxResult.getCode() != 200) {
220 220 //回传失败，修改回传次数
221 221 Integer pushErrorCount = receiptHeader.getPushErrorCount() == null ? 0 : receiptHeader.getPushErrorCount();
222   - if (receiptHeader.getPushErrorCount()!=1) {
  222 + if (receiptHeader.getPushSuccessStatus()!=1) {
223 223 receiptHeader.setPushErrorCount(pushErrorCount + 1);//错误次数+1
224 224 receiptHeader.setPushSuccessStatus(2);//2失败
225 225 receiptHeader.setErpErrorMsg(ajaxResult.getMsg());
... ... @@ -443,6 +443,8 @@ public class RyTask extends BaseController {
443 443 List<Supplier> list1 = supplierService.list(new LambdaQueryWrapper<Supplier>().eq(Supplier::getCode, detail.getSupplierCode()));
444 444 if (list1.isEmpty()) {
445 445 supplier.setName("没有供应商");
  446 + }else {
  447 + supplier.setName(list1.get(0).getName());
446 448 }
447 449 barcodedataDTO.setBatterybarcode(detail.getBatteryPackTwoCode());
448 450 barcodedataDTO.setBatterysource(supplier.getName());
... ...
src/main/java/com/huaheng/pc/task/agvTask/controller/AgvTaskController.java
  View file @68fd1e1
... ... @@ -201,11 +201,15 @@ public class AgvTaskController extends BaseController {
201 201 List<AgvTask> agvTaskList = agvTaskService.list(new LambdaQueryWrapper<AgvTask>()
202 202 .in(AgvTask::getFromPort, split).or()
203 203 .in(AgvTask::getToPort, split)
  204 + //.ne(AgvTask::getStatus,100)
204 205 .orderByDesc(AgvTask::getId));
205   - for (int i = 0; i < agvTaskList.size(); i++) {
206   - AgvTask agvTask = agvTaskList.get(i);
207   - TaskHeader taskHeader = taskHeaderService.getOne(new LambdaQueryWrapper<TaskHeader>().eq(TaskHeader::getAgvTaskId, agvTask.getId()));
208   - List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
  206 + for (AgvTask agvTask : agvTaskList) {
  207 + List<TaskHeader> taskHeader = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
  208 + .eq(TaskHeader::getAgvTaskId, agvTask.getId()).ne(TaskHeader::getStatus,100));
  209 + if (taskHeader.size() == 0) {
  210 + continue;
  211 + }
  212 + List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.get(0).getId()));
209 213 AgvTV agvTV = new AgvTV();
210 214 agvTV.setTaskDetails(taskDetailList);
211 215 agvTV.setFromPort(agvTask.getFromPort());
... ... @@ -213,6 +217,9 @@ public class AgvTaskController extends BaseController {
213 217 agvTV.setId(agvTask.getId());
214 218 agvTV.setCreated(agvTask.getCreated());
215 219 agvTV.setCreatedBy(agvTask.getCreatedBy());
  220 + if (agvTask.getQty()==null) {
  221 + agvTV.setQty(0);
  222 + }
216 223 agvTV.setQty(agvTask.getQty());
217 224 agvTV.setCarNo(agvTask.getCarNo());
218 225 agvTV.setContainerCode(agvTask.getContainerCode());
... ...
src/main/resources/application-druid.properties
  View file @68fd1e1
1 1 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
2 2 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
3   -spring.datasource.druid.master.url=jdbc:mysql://127.0.0.1:3306/wms_wuhangelinmeisheji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
4   -#spring.datasource.druid.master.url=jdbc:mysql://110.42.132.113:3306/wms_wuhangelinmei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
5   -#spring.datasource.druid.master.url=jdbc:mysql://10.2.7.251:3306/wms_wuhangelinmeisheji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
  3 +spring.datasource.druid.master.url=jdbc:mysql://127.0.0.1:3306/wms_wuhangelinmei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
  4 +#spring.datasource.druid.master.url=jdbc:mysql://127.0.0.1:3306/wms_wuhangelinmeisheji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
6 5 #spring.datasource.druid.master.url=jdbc:mysql://10.2.7.251:3306/wms_wuhangelinmei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
7 6  
8 7 spring.datasource.druid.master.username=root
9   -spring.datasource.druid.master.password=hhsoftware
10   -#spring.datasource.druid.master.password=HHsoft123.
  8 +spring.datasource.druid.master.password=HHsoft123.
11 9 #spring.datasource.druid.master.password=123456
12 10  
13 11  
14   -spring.datasource.druid.mes.url=jdbc:sqlserver://10.2.4.186:1433;DatabaseName=SMES_Test
  12 +spring.datasource.druid.mes.url=jdbc:sqlserver://10.2.4.186:1433;DatabaseName=SMES_Production
15 13 spring.datasource.druid.mes.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
16 14 spring.datasource.druid.mes.username=sa
17 15 spring.datasource.druid.mes.password=SQLserver..
18 16  
19 17  
20   -
21 18 spring.datasource.druid.initial-size=10
22 19 spring.datasource.druid.max-active=10
23 20 spring.datasource.druid.min-idle=4
... ...
src/main/resources/application.yml
  View file @68fd1e1
1 1 spring:
2 2 profiles:
3   - active: test
  3 + active: druid
4 4 ---
5 5 #项目相关配置
6 6 #名称
... ... @@ -168,7 +168,7 @@ shiro:
168 168 # 同步session到数据库的周期（默认1分钟）
169 169 dbSyncPeriod: 1
170 170 # 相隔多久检查一次session的有效性，默认就是10分钟
171   - validationInterval: 10
  171 + validationInterval: 30
172 172  
173 173 # 防止XSS攻击
174 174 xss:
... ...
src/main/resources/templates/config/material/add.html
  View file @68fd1e1
... ... @@ -45,118 +45,118 @@
45 45 </select>
46 46 </div>
47 47 </div>
48   - <div class="form-group">
49   - <label class="col-sm-3 control-label">ABC分类：</label>
50   - <div class="col-sm-8">
51   - <input id="abcClass" name="abcClass" class="form-control" type="text">
52   - </div>
53   - </div>
54   - <div class="form-group">
55   - <label class="col-sm-3 control-label">保质期(天)</label>
56   - <div class="col-sm-8">
57   - <input id="daysToExpire" name="daysToExpire" class="form-control" type="text"/>
58   - </div>
59   - </div>
60   - <div class="form-group">
61   - <label class="col-sm-3 control-label">定位规则：</label>
62   - <div class="col-sm-8">
63   - <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}">
64   - <option value="">请选择</option>
65   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
66   - </select>
67   - </div>
68   - </div>
69   - <div class="form-group">
70   - <label class="col-sm-3 control-label">分配规则：</label>
71   - <div class="col-sm-8">
72   - <select id="allocationRule" name="allocationRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">
73   - <option value="">请选择</option>
74   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
75   - </select>
76   - </div>
77   - </div>
78   - <div class="form-group">
79   - <label class="col-sm-3 control-label">补货规则：</label>
80   - <div class="col-sm-8">
81   - <select id="replenishmentRule" name="replenishmentRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('replenishmentRule')}">
82   - <option value="">请选择</option>
83   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
84   - </select>
85   - </div>
86   - </div>
87   - <div class="form-group">
88   - <label class="col-sm-3 control-label">空货位规则：</label>
89   - <div class="col-sm-8">
90   - <select id="emptyLocRule" name="emptyLocRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('emptyLocRule')}">
91   - <option value="">请选择</option>
92   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
93   - </select>
94   - </div>
95   - </div>
96   - <div class="form-group">
97   - <label class="col-sm-3 control-label">入库规则：</label>
98   - <div class="col-sm-8">
99   - <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('receivingFlow')}">
100   - <option value="">请选择</option>
101   - <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
102   - </select>
103   - </div>
104   - </div>
105   - <div class="form-group">
106   - <label class="col-sm-3 control-label">出库流程：</label>
107   - <div class="col-sm-8">
108   - <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('shippingFlow')}">
109   - <option value="">请选择</option>
110   - <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
111   - </select>
112   - </div>
113   - </div>
114   - <div class="form-group">
115   - <label class="col-sm-3 control-label">属性模板：</label>
116   - <div class="col-sm-8">
117   - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
118   - </div>
119   - </div>
120   - <div class="form-group">
121   - <label class="col-sm-3 control-label">记录序列号：</label>
122   - <div class="col-sm-8">
123   - <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text">
124   - </div>
125   - </div>
126   - <div class="form-group">
127   - <label class="col-sm-3 control-label">自动生成序列号：</label>
128   - <div class="col-sm-8">
129   - <select id="autoGenSerialNum" name="autoGenSerialNum" class="form-control">
130   - <option value="">请选择</option>
131   - <option value="0">是</option>
132   - <option value="1">否</option>
133   - </select>
134   - </div>
135   - </div>
136   - <div class="form-group">
137   - <label class="col-sm-3 control-label">自动生成序列号表达式：</label>
138   - <div class="col-sm-8">
139   - <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text">
140   - </div>
141   - </div>
142   - <div class="form-group">
143   - <label class="col-sm-3 control-label">序列号模板：</label>
144   - <div class="col-sm-8">
145   - <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text">
146   - </div>
147   - </div>
148   - <div class="form-group">
149   - <label class="col-sm-3 control-label">临期预警天数：</label>
150   - <div class="col-sm-8">
151   - <input id="expiringDays" name="expiringDays" class="form-control" type="text">
152   - </div>
153   - </div>
154   - <div class="form-group">
155   - <label class="col-sm-3 control-label">收货预警天数：</label>
156   - <div class="col-sm-8">
157   - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
158   - </div>
159   - </div>
  48 +<!-- <div class="form-group">-->
  49 +<!-- <label class="col-sm-3 control-label">ABC分类：</label>-->
  50 +<!-- <div class="col-sm-8">-->
  51 +<!-- <input id="abcClass" name="abcClass" class="form-control" type="text">-->
  52 +<!-- </div>-->
  53 +<!-- </div>-->
  54 +<!-- <div class="form-group">-->
  55 +<!-- <label class="col-sm-3 control-label">保质期(天)</label>-->
  56 +<!-- <div class="col-sm-8">-->
  57 +<!-- <input id="daysToExpire" name="daysToExpire" class="form-control" type="text"/>-->
  58 +<!-- </div>-->
  59 +<!-- </div>-->
  60 +<!-- <div class="form-group"> -->
  61 +<!-- <label class="col-sm-3 control-label">定位规则：</label>-->
  62 +<!-- <div class="col-sm-8">-->
  63 +<!-- <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}">-->
  64 +<!-- <option value="">请选择</option>-->
  65 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  66 +<!-- </select>-->
  67 +<!-- </div>-->
  68 +<!-- </div>-->
  69 +<!-- <div class="form-group"> -->
  70 +<!-- <label class="col-sm-3 control-label">分配规则：</label>-->
  71 +<!-- <div class="col-sm-8">-->
  72 +<!-- <select id="allocationRule" name="allocationRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">-->
  73 +<!-- <option value="">请选择</option>-->
  74 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  75 +<!-- </select>-->
  76 +<!-- </div>-->
  77 +<!-- </div>-->
  78 +<!-- <div class="form-group"> -->
  79 +<!-- <label class="col-sm-3 control-label">补货规则：</label>-->
  80 +<!-- <div class="col-sm-8">-->
  81 +<!-- <select id="replenishmentRule" name="replenishmentRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('replenishmentRule')}">-->
  82 +<!-- <option value="">请选择</option>-->
  83 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  84 +<!-- </select>-->
  85 +<!-- </div>-->
  86 +<!-- </div>-->
  87 +<!-- <div class="form-group">-->
  88 +<!-- <label class="col-sm-3 control-label">空货位规则：</label>-->
  89 +<!-- <div class="col-sm-8">-->
  90 +<!-- <select id="emptyLocRule" name="emptyLocRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('emptyLocRule')}">-->
  91 +<!-- <option value="">请选择</option>-->
  92 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  93 +<!-- </select>-->
  94 +<!-- </div>-->
  95 +<!-- </div>-->
  96 +<!-- <div class="form-group"> -->
  97 +<!-- <label class="col-sm-3 control-label">入库规则：</label>-->
  98 +<!-- <div class="col-sm-8">-->
  99 +<!-- <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('receivingFlow')}">-->
  100 +<!-- <option value="">请选择</option>-->
  101 +<!-- <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>-->
  102 +<!-- </select>-->
  103 +<!-- </div>-->
  104 +<!-- </div>-->
  105 +<!-- <div class="form-group"> -->
  106 +<!-- <label class="col-sm-3 control-label">出库流程：</label>-->
  107 +<!-- <div class="col-sm-8">-->
  108 +<!-- <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('shippingFlow')}">-->
  109 +<!-- <option value="">请选择</option>-->
  110 +<!-- <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>-->
  111 +<!-- </select>-->
  112 +<!-- </div>-->
  113 +<!-- </div>-->
  114 +<!-- <div class="form-group"> -->
  115 +<!-- <label class="col-sm-3 control-label">属性模板：</label>-->
  116 +<!-- <div class="col-sm-8">-->
  117 +<!-- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">-->
  118 +<!-- </div>-->
  119 +<!-- </div>-->
  120 +<!-- <div class="form-group"> -->
  121 +<!-- <label class="col-sm-3 control-label">记录序列号：</label>-->
  122 +<!-- <div class="col-sm-8">-->
  123 +<!-- <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text">-->
  124 +<!-- </div>-->
  125 +<!-- </div>-->
  126 +<!-- <div class="form-group"> -->
  127 +<!-- <label class="col-sm-3 control-label">自动生成序列号：</label>-->
  128 +<!-- <div class="col-sm-8">-->
  129 +<!-- <select id="autoGenSerialNum" name="autoGenSerialNum" class="form-control">-->
  130 +<!-- <option value="">请选择</option>-->
  131 +<!-- <option value="0">是</option>-->
  132 +<!-- <option value="1">否</option>-->
  133 +<!-- </select>-->
  134 +<!-- </div>-->
  135 +<!-- </div>-->
  136 +<!-- <div class="form-group"> -->
  137 +<!-- <label class="col-sm-3 control-label">自动生成序列号表达式：</label>-->
  138 +<!-- <div class="col-sm-8">-->
  139 +<!-- <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text">-->
  140 +<!-- </div>-->
  141 +<!-- </div>-->
  142 +<!-- <div class="form-group">-->
  143 +<!-- <label class="col-sm-3 control-label">序列号模板：</label>-->
  144 +<!-- <div class="col-sm-8">-->
  145 +<!-- <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text">-->
  146 +<!-- </div>-->
  147 +<!-- </div>-->
  148 +<!-- <div class="form-group">-->
  149 +<!-- <label class="col-sm-3 control-label">临期预警天数：</label>-->
  150 +<!-- <div class="col-sm-8">-->
  151 +<!-- <input id="expiringDays" name="expiringDays" class="form-control" type="text">-->
  152 +<!-- </div>-->
  153 +<!-- </div>-->
  154 +<!-- <div class="form-group">-->
  155 +<!-- <label class="col-sm-3 control-label">收货预警天数：</label>-->
  156 +<!-- <div class="col-sm-8">-->
  157 +<!-- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">-->
  158 +<!-- </div>-->
  159 +<!-- </div>-->
160 160 <!--<div class="form-group">
161 161 <label class="col-sm-3 control-label">数据版本：</label>
162 162 <div class="col-sm-8">
... ... @@ -188,18 +188,18 @@
188 188 <!--</div>-->
189 189 <!--</div>-->
190 190  
191   - <div class="form-group">
192   - <label class="col-sm-3 control-label">状态：</label>
193   - <div class="col-sm-8">
194   - <div class="onoffswitch">
195   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
196   - <label class="onoffswitch-label" for="enable">
197   - <span class="onoffswitch-inner"></span>
198   - <span class="onoffswitch-switch"></span>
199   - </label>
200   - </div>
201   - </div>
202   - </div>
  191 +<!-- <div class="form-group"> -->
  192 +<!-- <label class="col-sm-3 control-label">状态：</label>-->
  193 +<!-- <div class="col-sm-8">-->
  194 +<!-- <div class="onoffswitch">-->
  195 +<!-- <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  196 +<!-- <label class="onoffswitch-label" for="enable">-->
  197 +<!-- <span class="onoffswitch-inner"></span>-->
  198 +<!-- <span class="onoffswitch-switch"></span>-->
  199 +<!-- </label>-->
  200 +<!-- </div>-->
  201 +<!-- </div>-->
  202 +<!-- </div>-->
203 203 <!--<div class="form-group"> -->
204 204 <!--<label class="col-sm-3 control-label">是否删除：</label>-->
205 205 <!--<div class="col-sm-8">-->
... ...
src/main/resources/templates/config/material/edit.html
  View file @68fd1e1
... ... @@ -38,110 +38,110 @@
38 38 </select>
39 39 </div>
40 40 </div>
41   - <div class="form-group">
42   - <label class="col-sm-3 control-label">ABC分类：</label>
43   - <div class="col-sm-8">
44   - <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}"/>
45   - </div>
46   - </div>
47   - <div class="form-group">
48   - <label class="col-sm-3 control-label">保质期(天)</label>
49   - <div class="col-sm-8">
50   - <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}"/>
51   - </div>
52   - </div>
53   - <div class="form-group">
54   - <label class="col-sm-3 control-label">定位规则：</label>
55   - <div class="col-sm-8">
56   - <input id="locatingRule" name="locatingRule" class="form-control" type="text" th:field="*{locatingRule}">
57   - </div>
58   - </div>
59   - <div class="form-group">
60   - <label class="col-sm-3 control-label">分配规则：</label>
61   - <div class="col-sm-8">
62   - <input id="allocationRule" name="allocationRule" class="form-control" type="text" th:field="*{allocationRule}">
63   - </div>
64   - </div>
65   - <div class="form-group">
66   - <label class="col-sm-3 control-label">补货规则：</label>
67   - <div class="col-sm-8">
68   - <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text" th:field="*{replenishmentRule}">
69   - </div>
70   - </div>
71   - <div class="form-group">
72   - <label class="col-sm-3 control-label">空货位规则：</label>
73   - <div class="col-sm-8">
74   - <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}">
75   - </div>
76   - </div>
77   - <div class="form-group">
78   - <label class="col-sm-3 control-label">入库规则</label>
79   - <div class="col-sm-8">
80   - <input id="receivingFlow" name="receivingFlow" class="form-control" type="text" th:field="*{receivingFlow}">
81   - </div>
82   - </div>
83   - <div class="form-group">
84   - <label class="col-sm-3 control-label">出库流程：</label>
85   - <div class="col-sm-8">
86   - <input id="shippingFlow" name="shippingFlow" class="form-control" type="text" th:field="*{shippingFlow}">
87   - </div>
88   - </div>
89   - <div class="form-group">
90   - <label class="col-sm-3 control-label">属性模板：</label>
91   - <div class="col-sm-8">
92   - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">
93   - </div>
94   - </div>
95   - <div class="form-group">
96   - <label class="col-sm-3 control-label">记录序列号：</label>
97   - <div class="col-sm-8">
98   - <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text" th:field="*{trackSerialNum}">
99   - </div>
100   - </div>
101   - <div class="form-group">
102   - <label class="col-sm-3 control-label">自动生成序列号：</label>
103   - <div class="col-sm-8">
104   - <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text" th:field="*{autoGenSerialNum}">
105   - </div>
106   - </div>
107   - <div class="form-group">
108   - <label class="col-sm-3 control-label">自动生成序列号表达式：</label>
109   - <div class="col-sm-8">
110   - <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text" th:field="*{autoGenSerialNumFormat}">
111   - </div>
112   - </div>
113   - <div class="form-group">
114   - <label class="col-sm-3 control-label">序列号模板：</label>
115   - <div class="col-sm-8">
116   - <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text" th:field="*{snTemplateCode}">
117   - </div>
118   - </div>
119   - <div class="form-group">
120   - <label class="col-sm-3 control-label">临期预警天数：</label>
121   - <div class="col-sm-8">
122   - <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
123   - </div>
124   - </div>
125   - <div class="form-group">
126   - <label class="col-sm-3 control-label">收货预警天数：</label>
127   - <div class="col-sm-8">
128   - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
129   - </div>
130   - </div>
  41 +<!-- <div class="form-group">-->
  42 +<!-- <label class="col-sm-3 control-label">ABC分类：</label>-->
  43 +<!-- <div class="col-sm-8">-->
  44 +<!-- <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}"/>-->
  45 +<!-- </div>-->
  46 +<!-- </div>-->
  47 +<!-- <div class="form-group">-->
  48 +<!-- <label class="col-sm-3 control-label">保质期(天)</label>-->
  49 +<!-- <div class="col-sm-8">-->
  50 +<!-- <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}"/>-->
  51 +<!-- </div>-->
  52 +<!-- </div>-->
  53 +<!-- <div class="form-group">-->
  54 +<!-- <label class="col-sm-3 control-label">定位规则：</label>-->
  55 +<!-- <div class="col-sm-8">-->
  56 +<!-- <input id="locatingRule" name="locatingRule" class="form-control" type="text" th:field="*{locatingRule}">-->
  57 +<!-- </div>-->
  58 +<!-- </div>-->
  59 +<!-- <div class="form-group">-->
  60 +<!-- <label class="col-sm-3 control-label">分配规则：</label>-->
  61 +<!-- <div class="col-sm-8">-->
  62 +<!-- <input id="allocationRule" name="allocationRule" class="form-control" type="text" th:field="*{allocationRule}">-->
  63 +<!-- </div>-->
  64 +<!-- </div>-->
  65 +<!-- <div class="form-group">-->
  66 +<!-- <label class="col-sm-3 control-label">补货规则：</label>-->
  67 +<!-- <div class="col-sm-8">-->
  68 +<!-- <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text" th:field="*{replenishmentRule}">-->
  69 +<!-- </div>-->
  70 +<!-- </div>-->
  71 +<!-- <div class="form-group">-->
  72 +<!-- <label class="col-sm-3 control-label">空货位规则：</label>-->
  73 +<!-- <div class="col-sm-8">-->
  74 +<!-- <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}">-->
  75 +<!-- </div>-->
  76 +<!-- </div>-->
  77 +<!-- <div class="form-group">-->
  78 +<!-- <label class="col-sm-3 control-label">入库规则</label>-->
  79 +<!-- <div class="col-sm-8">-->
  80 +<!-- <input id="receivingFlow" name="receivingFlow" class="form-control" type="text" th:field="*{receivingFlow}">-->
  81 +<!-- </div>-->
  82 +<!-- </div>-->
  83 +<!-- <div class="form-group">-->
  84 +<!-- <label class="col-sm-3 control-label">出库流程：</label>-->
  85 +<!-- <div class="col-sm-8">-->
  86 +<!-- <input id="shippingFlow" name="shippingFlow" class="form-control" type="text" th:field="*{shippingFlow}">-->
  87 +<!-- </div>-->
  88 +<!-- </div>-->
  89 +<!-- <div class="form-group">-->
  90 +<!-- <label class="col-sm-3 control-label">属性模板：</label>-->
  91 +<!-- <div class="col-sm-8">-->
  92 +<!-- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">-->
  93 +<!-- </div>-->
  94 +<!-- </div>-->
  95 +<!-- <div class="form-group">-->
  96 +<!-- <label class="col-sm-3 control-label">记录序列号：</label>-->
  97 +<!-- <div class="col-sm-8">-->
  98 +<!-- <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text" th:field="*{trackSerialNum}">-->
  99 +<!-- </div>-->
  100 +<!-- </div>-->
  101 +<!-- <div class="form-group">-->
  102 +<!-- <label class="col-sm-3 control-label">自动生成序列号：</label>-->
  103 +<!-- <div class="col-sm-8">-->
  104 +<!-- <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text" th:field="*{autoGenSerialNum}">-->
  105 +<!-- </div>-->
  106 +<!-- </div>-->
  107 +<!-- <div class="form-group">-->
  108 +<!-- <label class="col-sm-3 control-label">自动生成序列号表达式：</label>-->
  109 +<!-- <div class="col-sm-8">-->
  110 +<!-- <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text" th:field="*{autoGenSerialNumFormat}">-->
  111 +<!-- </div>-->
  112 +<!-- </div>-->
  113 +<!-- <div class="form-group">-->
  114 +<!-- <label class="col-sm-3 control-label">序列号模板：</label>-->
  115 +<!-- <div class="col-sm-8">-->
  116 +<!-- <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text" th:field="*{snTemplateCode}">-->
  117 +<!-- </div>-->
  118 +<!-- </div>-->
  119 +<!-- <div class="form-group">-->
  120 +<!-- <label class="col-sm-3 control-label">临期预警天数：</label>-->
  121 +<!-- <div class="col-sm-8">-->
  122 +<!-- <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">-->
  123 +<!-- </div>-->
  124 +<!-- </div>-->
  125 +<!-- <div class="form-group">-->
  126 +<!-- <label class="col-sm-3 control-label">收货预警天数：</label>-->
  127 +<!-- <div class="col-sm-8">-->
  128 +<!-- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">-->
  129 +<!-- </div>-->
  130 +<!-- </div>-->
131 131  
132 132  
133   - <div class="form-group">
134   - <label class="col-sm-3 control-label">状态：</label>
135   - <div class="col-sm-8">
136   - <div class="onoffswitch">
137   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable" th:field="*{enable}">
138   - <label class="onoffswitch-label" for="enable">
139   - <span class="onoffswitch-inner"></span>
140   - <span class="onoffswitch-switch"></span>
141   - </label>
142   - </div>
143   - </div>
144   - </div>
  133 +<!-- <div class="form-group">-->
  134 +<!-- <label class="col-sm-3 control-label">状态：</label>-->
  135 +<!-- <div class="col-sm-8">-->
  136 +<!-- <div class="onoffswitch">-->
  137 +<!-- <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable" th:field="*{enable}">-->
  138 +<!-- <label class="onoffswitch-label" for="enable">-->
  139 +<!-- <span class="onoffswitch-inner"></span>-->
  140 +<!-- <span class="onoffswitch-switch"></span>-->
  141 +<!-- </label>-->
  142 +<!-- </div>-->
  143 +<!-- </div>-->
  144 +<!-- </div>-->
145 145  
146 146 <div class="form-group">
147 147 <div class="form-control-static col-sm-offset-9">
... ...
src/main/resources/templates/config/materialType/add.html
  View file @68fd1e1
... ... @@ -25,135 +25,135 @@
25 25 </select>
26 26 </div>
27 27 </div>
  28 +<!-- <div class="form-group">-->
  29 +<!-- <label class="col-sm-3 control-label">ABC分类：</label>-->
  30 +<!-- <div class="col-sm-8">-->
  31 +<!-- <input id="abcClass" name="abcClass" class="form-control" type="text">-->
  32 +<!-- </div>-->
  33 +<!-- </div>-->
28 34 <div class="form-group">
29   - <label class="col-sm-3 control-label">ABC分类：</label>
30   - <div class="col-sm-8">
31   - <input id="abcClass" name="abcClass" class="form-control" type="text">
32   - </div>
33   - </div>
34   - <div class="form-group">
35   - <label class="col-sm-3 control-label">库位行数：</label>
  35 + <label class="col-sm-3 control-label">货架：</label>
36 36 <div class="col-sm-8">
37 37 <input id="rows" name="rows" class="form-control" type="text" placeholder="英文逗号隔开；比如：1,2">
38 38 </div>
39 39 </div>
40   - <div class="form-group">
41   - <label class="col-sm-3 control-label">保质期（天）：</label>
42   - <div class="col-sm-8">
43   - <input id="daysToExpire" name="daysToExpire" class="form-control" type="number">
44   - </div>
45   - </div>
46   - <div class="form-group">
47   - <label class="col-sm-3 control-label">入库流程：</label>
48   - <div class="col-sm-8">
49   - <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('receivingFlow')}">
50   - <option value="">请选择</option>
51   - <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
52   - </select>
53   - </div>
54   - </div>
55   - <div class="form-group">
56   - <label class="col-sm-3 control-label">出库流程：</label>
57   - <div class="col-sm-8">
58   - <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('shippingFlow')}">
59   - <option value="">请选择</option>
60   - <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
61   - </select>
62   - </div>
63   - </div>
64   - <div class="form-group">
65   - <label class="col-sm-3 control-label">定位规则：</label>
66   - <div class="col-sm-8">
67   - <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locatingRule')}">
68   - <option value="">请选择</option>
69   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
70   - </select>
71   - </div>
72   - </div>
73   - <div class="form-group">
74   - <label class="col-sm-3 control-label">分配规则：</label>
75   - <div class="col-sm-8">
76   - <select id="allocationRule" name="allocationRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">
77   - <option value="">请选择</option>
78   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
79   - </select>
80   - </div>
81   - </div>
82   - <div class="form-group">
83   - <label class="col-sm-3 control-label">补货规则：</label>
84   - <div class="col-sm-8">
85   - <select id="replenishmentRule" name="replenishmentRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('replenishmentRule')}">
86   - <option value="">请选择</option>
87   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
88   - </select>
89   - </div>
90   - </div>
91   - <div class="form-group">
92   - <label class="col-sm-3 control-label">空货位规则：</label>
93   - <div class="col-sm-8">
94   - <select id="emptyLocRule" name="emptyLocRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('emptyLocRule')}">
95   - <option value="">请选择</option>
96   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
97   - </select>
98   - </div>
99   - </div>
100   - <div class="form-group">
101   - <label class="col-sm-3 control-label">拣货规则：</label>
102   - <div class="col-sm-8">
103   - <select id="pickingRule" name="pickingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('pickingRule')}">
104   - <option value="">请选择</option>
105   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
106   - </select>
107   - </div>
108   - </div>
109   - <div class="form-group">
110   - <label class="col-sm-3 control-label">属性模版：</label>
111   - <div class="col-sm-8">
112   - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
113   - </div>
114   - </div>
115   - <div class="form-group">
116   - <label class="col-sm-3 control-label">记录序列号：</label>
117   - <div class="col-sm-8">
118   - <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text">
119   - </div>
120   - </div>
121   - <div class="form-group">
122   - <label class="col-sm-3 control-label">自动生成序列号：</label>
123   - <div class="col-sm-8">
124   - <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text">
125   - </div>
126   - </div>
127   - <div class="form-group">
128   - <label class="col-sm-3 control-label">自动生成序列号表达式：</label>
129   - <div class="col-sm-8">
130   - <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text">
131   - </div>
132   - </div>
133   - <div class="form-group">
134   - <label class="col-sm-3 control-label">序列号模版：</label>
135   - <div class="col-sm-8">
136   - <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text">
137   - </div>
138   - </div>
139   - <div class="form-group">
140   - <label class="col-sm-3 control-label">临期预警天数：</label>
141   - <div class="col-sm-8">
142   - <input id="expiringDays" name="expiringDays" class="form-control" type="number">
143   - </div>
144   - </div>
145   - <div class="form-group">
146   - <label class="col-sm-3 control-label">收货预警天数：</label>
147   - <div class="col-sm-8">
148   - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number">
149   - </div>
150   - </div>
151   - <div class="form-group">
152   - <label class="col-sm-3 control-label">是否AGV区域发货：</label>
153   - <div class="col-sm-8">
154   - <input id="userDef1" name="userDef1" class="form-control" type="text">
155   - </div>
156   - </div>
  40 +<!-- <div class="form-group">-->
  41 +<!-- <label class="col-sm-3 control-label">保质期（天）：</label>-->
  42 +<!-- <div class="col-sm-8">-->
  43 +<!-- <input id="daysToExpire" name="daysToExpire" class="form-control" type="number">-->
  44 +<!-- </div>-->
  45 +<!-- </div>-->
  46 +<!-- <div class="form-group">-->
  47 +<!-- <label class="col-sm-3 control-label">入库流程：</label>-->
  48 +<!-- <div class="col-sm-8">-->
  49 +<!-- <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('receivingFlow')}">-->
  50 +<!-- <option value="">请选择</option>-->
  51 +<!-- <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>-->
  52 +<!-- </select>-->
  53 +<!-- </div>-->
  54 +<!-- </div>-->
  55 +<!-- <div class="form-group">-->
  56 +<!-- <label class="col-sm-3 control-label">出库流程：</label>-->
  57 +<!-- <div class="col-sm-8">-->
  58 +<!-- <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('shippingFlow')}">-->
  59 +<!-- <option value="">请选择</option>-->
  60 +<!-- <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>-->
  61 +<!-- </select>-->
  62 +<!-- </div>-->
  63 +<!-- </div>-->
  64 +<!-- <div class="form-group">-->
  65 +<!-- <label class="col-sm-3 control-label">定位规则：</label>-->
  66 +<!-- <div class="col-sm-8">-->
  67 +<!-- <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locatingRule')}">-->
  68 +<!-- <option value="">请选择</option>-->
  69 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  70 +<!-- </select>-->
  71 +<!-- </div>-->
  72 +<!-- </div>-->
  73 +<!-- <div class="form-group">-->
  74 +<!-- <label class="col-sm-3 control-label">分配规则：</label>-->
  75 +<!-- <div class="col-sm-8">-->
  76 +<!-- <select id="allocationRule" name="allocationRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">-->
  77 +<!-- <option value="">请选择</option>-->
  78 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  79 +<!-- </select>-->
  80 +<!-- </div>-->
  81 +<!-- </div>-->
  82 +<!-- <div class="form-group">-->
  83 +<!-- <label class="col-sm-3 control-label">补货规则：</label>-->
  84 +<!-- <div class="col-sm-8">-->
  85 +<!-- <select id="replenishmentRule" name="replenishmentRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('replenishmentRule')}">-->
  86 +<!-- <option value="">请选择</option>-->
  87 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  88 +<!-- </select>-->
  89 +<!-- </div>-->
  90 +<!-- </div>-->
  91 +<!-- <div class="form-group">-->
  92 +<!-- <label class="col-sm-3 control-label">空货位规则：</label>-->
  93 +<!-- <div class="col-sm-8">-->
  94 +<!-- <select id="emptyLocRule" name="emptyLocRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('emptyLocRule')}">-->
  95 +<!-- <option value="">请选择</option>-->
  96 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  97 +<!-- </select>-->
  98 +<!-- </div>-->
  99 +<!-- </div>-->
  100 +<!-- <div class="form-group">-->
  101 +<!-- <label class="col-sm-3 control-label">拣货规则：</label>-->
  102 +<!-- <div class="col-sm-8">-->
  103 +<!-- <select id="pickingRule" name="pickingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('pickingRule')}">-->
  104 +<!-- <option value="">请选择</option>-->
  105 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  106 +<!-- </select>-->
  107 +<!-- </div>-->
  108 +<!-- </div>-->
  109 +<!-- <div class="form-group">-->
  110 +<!-- <label class="col-sm-3 control-label">属性模版：</label>-->
  111 +<!-- <div class="col-sm-8">-->
  112 +<!-- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">-->
  113 +<!-- </div>-->
  114 +<!-- </div>-->
  115 +<!-- <div class="form-group">-->
  116 +<!-- <label class="col-sm-3 control-label">记录序列号：</label>-->
  117 +<!-- <div class="col-sm-8">-->
  118 +<!-- <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text">-->
  119 +<!-- </div>-->
  120 +<!-- </div>-->
  121 +<!-- <div class="form-group">-->
  122 +<!-- <label class="col-sm-3 control-label">自动生成序列号：</label>-->
  123 +<!-- <div class="col-sm-8">-->
  124 +<!-- <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text">-->
  125 +<!-- </div>-->
  126 +<!-- </div>-->
  127 +<!-- <div class="form-group">-->
  128 +<!-- <label class="col-sm-3 control-label">自动生成序列号表达式：</label>-->
  129 +<!-- <div class="col-sm-8">-->
  130 +<!-- <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text">-->
  131 +<!-- </div>-->
  132 +<!-- </div>-->
  133 +<!-- <div class="form-group">-->
  134 +<!-- <label class="col-sm-3 control-label">序列号模版：</label>-->
  135 +<!-- <div class="col-sm-8">-->
  136 +<!-- <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text">-->
  137 +<!-- </div>-->
  138 +<!-- </div>-->
  139 +<!-- <div class="form-group">-->
  140 +<!-- <label class="col-sm-3 control-label">临期预警天数：</label>-->
  141 +<!-- <div class="col-sm-8">-->
  142 +<!-- <input id="expiringDays" name="expiringDays" class="form-control" type="number">-->
  143 +<!-- </div>-->
  144 +<!-- </div>-->
  145 +<!-- <div class="form-group">-->
  146 +<!-- <label class="col-sm-3 control-label">收货预警天数：</label>-->
  147 +<!-- <div class="col-sm-8">-->
  148 +<!-- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number">-->
  149 +<!-- </div>-->
  150 +<!-- </div>-->
  151 +<!-- <div class="form-group">-->
  152 +<!-- <label class="col-sm-3 control-label">是否AGV区域发货：</label>-->
  153 +<!-- <div class="col-sm-8">-->
  154 +<!-- <input id="userDef1" name="userDef1" class="form-control" type="text">-->
  155 +<!-- </div>-->
  156 +<!-- </div>-->
157 157 <div class="form-group">
158 158 <label class="col-sm-3 control-label">是否有效：</label>
159 159 <div class="col-sm-8">
... ...
src/main/resources/templates/config/materialType/edit.html
  View file @68fd1e1
... ... @@ -28,140 +28,140 @@
28 28 </select>
29 29 </div>
30 30 </div>
  31 +<!-- <div class="form-group">-->
  32 +<!-- <label class="col-sm-3 control-label">ABC分类：</label>-->
  33 +<!-- <div class="col-sm-8">-->
  34 +<!-- <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}">-->
  35 +<!-- </div>-->
  36 +<!-- </div>-->
31 37 <div class="form-group">
32   - <label class="col-sm-3 control-label">ABC分类：</label>
33   - <div class="col-sm-8">
34   - <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}">
35   - </div>
36   - </div>
37   - <div class="form-group">
38   - <label class="col-sm-3 control-label">库位行数：</label>
  38 + <label class="col-sm-3 control-label">货架：</label>
39 39 <div class="col-sm-8">
40 40 <input id="rows" name="rows" class="form-control" type="text" placeholder="英文逗号隔开；比如：1,2" th:field="*{rows}">
41 41 </div>
42 42 </div>
43   - <div class="form-group">
44   - <label class="col-sm-3 control-label">保质期（天）：</label>
45   - <div class="col-sm-8">
46   - <input id="daysToExpire" name="daysToExpire" class="form-control" type="number" th:field="*{daysToExpire}">
47   - </div>
48   - </div>
49   - <div class="form-group">
50   - <label class="col-sm-3 control-label">入库流程：</label>
51   - <div class="col-sm-8">
52   - <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('receivingFlow')}" th:field="*{receivingFlow}">
53   - <option value="">请选择</option>
54   - <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
55   - </select>
56   - </div>
57   - </div>
58   - <div class="form-group">
59   - <label class="col-sm-3 control-label">出库流程：</label>
60   - <div class="col-sm-8">
61   - <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('shippingFlow')}" th:field="*{shippingFlow}">
62   - <option value="">请选择</option>
63   - <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
64   - </select>
65   - </div>
66   - </div>
67   - <div class="form-group">
68   - <label class="col-sm-3 control-label">定位规则：</label>
69   - <div class="col-sm-8">
70   - <select id="locatingRule" name="locatingRule" class="form-control"
71   - th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locatingRule')}" th:field="*{locatingRule}">
72   - <option value="">请选择</option>
73   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
74   - </select>
75   - </div>
76   - </div>
77   - <div class="form-group">
78   - <label class="col-sm-3 control-label">分配规则：</label>
79   - <div class="col-sm-8">
80   - <select id="allocationRule" name="allocationRule" class="form-control"
81   - th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}" th:field="*{allocationRule}">
82   - <option value="">请选择</option>
83   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
84   - </select>
85   - </div>
86   - </div>
87   - <div class="form-group">
88   - <label class="col-sm-3 control-label">补货规则：</label>
89   - <div class="col-sm-8">
90   - <select id="replenishmentRule" name="replenishmentRule" class="form-control"
91   - th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('replenishmentRule')}" th:field="*{replenishmentRule}">
92   - <option value="">请选择</option>
93   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
94   - </select>
95   - </div>
96   - </div>
97   - <div class="form-group">
98   - <label class="col-sm-3 control-label">空货位规则：</label>
99   - <div class="col-sm-8">
100   - <select id="emptyLocRule" name="emptyLocRule" class="form-control"
101   - th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('emptyLocRule')}" th:field="*{emptyLocRule}">
102   - <option value="">请选择</option>
103   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
104   - </select>
105   - </div>
106   - </div>
107   - <div class="form-group">
108   - <label class="col-sm-3 control-label">拣货规则：</label>
109   - <div class="col-sm-8">
110   - <select id="pickingRule" name="pickingRule" class="form-control"
111   - th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('pickingRule')}" th:field="*{pickingRule}">
112   - <option value="">请选择</option>
113   - <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>
114   - </select>
115   - </div>
116   - </div>
117   - <div class="form-group">
118   - <label class="col-sm-3 control-label">属性模版：</label>
119   - <div class="col-sm-8">
120   - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">
121   - </div>
122   - </div>
123   - <div class="form-group">
124   - <label class="col-sm-3 control-label">记录序列号：</label>
125   - <div class="col-sm-8">
126   - <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text" th:field="*{trackSerialNum}">
127   - </div>
128   - </div>
129   - <div class="form-group">
130   - <label class="col-sm-3 control-label">自动生成序列号：</label>
131   - <div class="col-sm-8">
132   - <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text" th:field="*{autoGenSerialNum}">
133   - </div>
134   - </div>
135   - <div class="form-group">
136   - <label class="col-sm-3 control-label">自动生成序列号表达式：</label>
137   - <div class="col-sm-8">
138   - <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text" th:field="*{autoGenSerialNumFormat}">
139   - </div>
140   - </div>
141   - <div class="form-group">
142   - <label class="col-sm-3 control-label">序列号模版：</label>
143   - <div class="col-sm-8">
144   - <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text" th:field="*{snTemplateCode}">
145   - </div>
146   - </div>
147   - <div class="form-group">
148   - <label class="col-sm-3 control-label">临期预警天数：</label>
149   - <div class="col-sm-8">
150   - <input id="expiringDays" name="expiringDays" class="form-control" type="number" th:field="*{expiringDays}">
151   - </div>
152   - </div>
153   - <div class="form-group">
154   - <label class="col-sm-3 control-label">收货预警天数：</label>
155   - <div class="col-sm-8">
156   - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number" th:field="*{minShelfLifeDays}">
157   - </div>
158   - </div>
159   - <div class="form-group">
160   - <label class="col-sm-3 control-label">是否AGV区域发货：</label>
161   - <div class="col-sm-8">
162   - <input id="userDef1" name="userDef1" class="form-control" type="text" th:field="*{userDef1}">
163   - </div>
164   - </div>
  43 +<!-- <div class="form-group">-->
  44 +<!-- <label class="col-sm-3 control-label">保质期（天）：</label>-->
  45 +<!-- <div class="col-sm-8">-->
  46 +<!-- <input id="daysToExpire" name="daysToExpire" class="form-control" type="number" th:field="*{daysToExpire}">-->
  47 +<!-- </div>-->
  48 +<!-- </div>-->
  49 +<!-- <div class="form-group">-->
  50 +<!-- <label class="col-sm-3 control-label">入库流程：</label>-->
  51 +<!-- <div class="col-sm-8">-->
  52 +<!-- <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('receivingFlow')}" th:field="*{receivingFlow}">-->
  53 +<!-- <option value="">请选择</option>-->
  54 +<!-- <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>-->
  55 +<!-- </select>-->
  56 +<!-- </div>-->
  57 +<!-- </div>-->
  58 +<!-- <div class="form-group">-->
  59 +<!-- <label class="col-sm-3 control-label">出库流程：</label>-->
  60 +<!-- <div class="col-sm-8">-->
  61 +<!-- <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList('shippingFlow')}" th:field="*{shippingFlow}">-->
  62 +<!-- <option value="">请选择</option>-->
  63 +<!-- <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option>-->
  64 +<!-- </select>-->
  65 +<!-- </div>-->
  66 +<!-- </div>-->
  67 +<!-- <div class="form-group">-->
  68 +<!-- <label class="col-sm-3 control-label">定位规则：</label>-->
  69 +<!-- <div class="col-sm-8">-->
  70 +<!-- <select id="locatingRule" name="locatingRule" class="form-control"-->
  71 +<!-- th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locatingRule')}" th:field="*{locatingRule}">-->
  72 +<!-- <option value="">请选择</option>-->
  73 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  74 +<!-- </select>-->
  75 +<!-- </div>-->
  76 +<!-- </div>-->
  77 +<!-- <div class="form-group">-->
  78 +<!-- <label class="col-sm-3 control-label">分配规则：</label>-->
  79 +<!-- <div class="col-sm-8">-->
  80 +<!-- <select id="allocationRule" name="allocationRule" class="form-control"-->
  81 +<!-- th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}" th:field="*{allocationRule}">-->
  82 +<!-- <option value="">请选择</option>-->
  83 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  84 +<!-- </select>-->
  85 +<!-- </div>-->
  86 +<!-- </div>-->
  87 +<!-- <div class="form-group">-->
  88 +<!-- <label class="col-sm-3 control-label">补货规则：</label>-->
  89 +<!-- <div class="col-sm-8">-->
  90 +<!-- <select id="replenishmentRule" name="replenishmentRule" class="form-control"-->
  91 +<!-- th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('replenishmentRule')}" th:field="*{replenishmentRule}">-->
  92 +<!-- <option value="">请选择</option>-->
  93 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  94 +<!-- </select>-->
  95 +<!-- </div>-->
  96 +<!-- </div>-->
  97 +<!-- <div class="form-group">-->
  98 +<!-- <label class="col-sm-3 control-label">空货位规则：</label>-->
  99 +<!-- <div class="col-sm-8">-->
  100 +<!-- <select id="emptyLocRule" name="emptyLocRule" class="form-control"-->
  101 +<!-- th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('emptyLocRule')}" th:field="*{emptyLocRule}">-->
  102 +<!-- <option value="">请选择</option>-->
  103 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  104 +<!-- </select>-->
  105 +<!-- </div>-->
  106 +<!-- </div>-->
  107 +<!-- <div class="form-group">-->
  108 +<!-- <label class="col-sm-3 control-label">拣货规则：</label>-->
  109 +<!-- <div class="col-sm-8">-->
  110 +<!-- <select id="pickingRule" name="pickingRule" class="form-control"-->
  111 +<!-- th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('pickingRule')}" th:field="*{pickingRule}">-->
  112 +<!-- <option value="">请选择</option>-->
  113 +<!-- <option th:each="flow : ${list}" th:text="${flow['description']}" th:value="${flow['code']}"></option>-->
  114 +<!-- </select>-->
  115 +<!-- </div>-->
  116 +<!-- </div>-->
  117 +<!-- <div class="form-group">-->
  118 +<!-- <label class="col-sm-3 control-label">属性模版：</label>-->
  119 +<!-- <div class="col-sm-8">-->
  120 +<!-- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">-->
  121 +<!-- </div>-->
  122 +<!-- </div>-->
  123 +<!-- <div class="form-group">-->
  124 +<!-- <label class="col-sm-3 control-label">记录序列号：</label>-->
  125 +<!-- <div class="col-sm-8">-->
  126 +<!-- <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text" th:field="*{trackSerialNum}">-->
  127 +<!-- </div>-->
  128 +<!-- </div>-->
  129 +<!-- <div class="form-group">-->
  130 +<!-- <label class="col-sm-3 control-label">自动生成序列号：</label>-->
  131 +<!-- <div class="col-sm-8">-->
  132 +<!-- <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text" th:field="*{autoGenSerialNum}">-->
  133 +<!-- </div>-->
  134 +<!-- </div>-->
  135 +<!-- <div class="form-group">-->
  136 +<!-- <label class="col-sm-3 control-label">自动生成序列号表达式：</label>-->
  137 +<!-- <div class="col-sm-8">-->
  138 +<!-- <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text" th:field="*{autoGenSerialNumFormat}">-->
  139 +<!-- </div>-->
  140 +<!-- </div>-->
  141 +<!-- <div class="form-group">-->
  142 +<!-- <label class="col-sm-3 control-label">序列号模版：</label>-->
  143 +<!-- <div class="col-sm-8">-->
  144 +<!-- <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text" th:field="*{snTemplateCode}">-->
  145 +<!-- </div>-->
  146 +<!-- </div>-->
  147 +<!-- <div class="form-group">-->
  148 +<!-- <label class="col-sm-3 control-label">临期预警天数：</label>-->
  149 +<!-- <div class="col-sm-8">-->
  150 +<!-- <input id="expiringDays" name="expiringDays" class="form-control" type="number" th:field="*{expiringDays}">-->
  151 +<!-- </div>-->
  152 +<!-- </div>-->
  153 +<!-- <div class="form-group">-->
  154 +<!-- <label class="col-sm-3 control-label">收货预警天数：</label>-->
  155 +<!-- <div class="col-sm-8">-->
  156 +<!-- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number" th:field="*{minShelfLifeDays}">-->
  157 +<!-- </div>-->
  158 +<!-- </div>-->
  159 +<!-- <div class="form-group">-->
  160 +<!-- <label class="col-sm-3 control-label">是否AGV区域发货：</label>-->
  161 +<!-- <div class="col-sm-8">-->
  162 +<!-- <input id="userDef1" name="userDef1" class="form-control" type="text" th:field="*{userDef1}">-->
  163 +<!-- </div>-->
  164 +<!-- </div>-->
165 165 <div class="form-group">
166 166 <label class="col-sm-3 control-label">是否有效：</label>
167 167 <div class="col-sm-8">
... ...
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
  View file @68fd1e1
... ... @@ -196,9 +196,9 @@
196 196 onClickRow:function(row,ele,field){
197 197 let code=$("#code").val();
198 198 $("#detailId").val(row.id);
199   - // $("#receiveNum").val(row.shipQty-row.requestQty);
  199 + $("#receiveNum").val(row.shipQty-row.requestQty);
200 200 //$("#receiveWeight").val(row.shipWeight-row.requestWeight);
201   - $("#receiveNum").val(1);
  201 + // $("#receiveNum").val(1);
202 202 $("#electricQuantity").val(row.electricQuantity);
203 203 $("#batteryPackageWeight").val(row.batteryPackageWeight);
204 204 $("#otherContent").val(row.otherContent);
... ...