From 652422ee99ff84d5198d770d8f70766dd591e686 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 05 七月 2024 20:19:31 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java | 1 +
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java | 6 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java | 6 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java | 5 +++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java | 1 +
zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js | 12 ++++++------
6 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
index 2b4415b..7c4c6bf 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
@@ -22,6 +22,11 @@
//缁勬墭鐗╂枡
private List<CombMat> combMats;
+ /*
+ 婊℃澘
+ */
+ private String fullPlt;
+
@Data
public static class CombMat {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
index 461b5f8..1ea0fb1 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
@@ -265,6 +265,12 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ /**
+ * 婊℃澘(checkBox)
+ */
+ @ApiModelProperty(value= "婊℃澘(checkBox)")
+ private String fullPlt;
+
public WaitPakin() {}
public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
index 2cfc1f8..4b9102c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
@@ -262,6 +262,12 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ /**
+ * 婊℃澘(checkBox)
+ */
+ @ApiModelProperty(value= "婊℃澘(checkBox)")
+ private String fullPlt;
+
public WaitPakinLog() {}
public WaitPakinLog(Long id,String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
index 484fc04..4e626b3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
@@ -99,6 +99,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setFullPlt(param.getFullPlt());
if (!waitPakinService.save(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
index 6ba2ac1..0e871d1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
@@ -131,6 +131,7 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setPic(wrkMast.getPic());
+ locMast.setFullPlt(wrkMast.getFullPlt());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
index ae65adf..f64aee6 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -59,12 +59,12 @@
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
//
- // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.fullPlt === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
+ ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.fullPlt === 'Y'){html += " checked ";}
+ html += ">";
+ return html;
+ }}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
]],
--
Gitblit v1.9.1