From 4937959186714b0765ddd42f716a1443318cc6ac Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期五, 16 八月 2024 11:37:00 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/webapp/static/js/orderDetlLog/orderDetlLog.js | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 1 +
src/main/webapp/static/js/common.js | 4 ++--
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 2 ++
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index adb917a..52ed886 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -27,9 +27,11 @@
Integer sourceStaNo = 204;
switch (stnNo){
case 100:
+ case 114:
sourceStaNo = 104;
break;
case 200:
+ case 214:
sourceStaNo = 204;
break;
case 300:
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1a4c926..9090ac1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -117,7 +117,7 @@
ArrayList<Integer> rows = new ArrayList<>();
switch (sourceStaNo) {
case 103://103鍏ュ簱绔�
- case 114://103鍏ュ簱绔�
+ case 113://103鍏ュ簱绔�
whsType = 1;
start = 1;
end = 14;
@@ -134,7 +134,7 @@
crnNo = 1;
break;
case 203://203鍏ュ簱绔�
- case 214://203鍏ュ簱绔�
+ case 213://203鍏ュ簱绔�
whsType = 2;
start = 8;
end = 21;
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 20e4342..885de6b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -166,6 +166,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setOrigin(waitPakin.getBatch());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index c8084a5..cc739b9 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -196,7 +196,7 @@
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鎵规澶囨敞', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
@@ -246,7 +246,7 @@
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鎵规澶囨敞', hide: false}
,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅old', hide: false}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 86b8f69..d3b8b25 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -20,7 +20,7 @@
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鎵规澶囨敞', hide: false}
,{field: 'owner$', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅old', hide: false}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
diff --git a/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js b/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
index 45e8475..7361806 100644
--- a/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
+++ b/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
@@ -39,7 +39,7 @@
,{field: 'sku', align: 'center',title: 'sku'}
,{field: 'units', align: 'center',title: '鍗曚綅閲�'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'origin', align: 'center',title: '浜у湴'}
+ ,{field: 'origin', align: 'center',title: '鎵规澶囨敞'}
,{field: 'manu', align: 'center',title: '鍘傚'}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡'}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
--
Gitblit v1.9.1