From 3f3f4ffefd53cf66d4567a74f916845350dbd9e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 03 十一月 2025 11:16:03 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++------
src/main/webapp/static/js/wrkMast/wrkMast.js | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 8e3ac1c..8c93789 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -772,18 +772,14 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || (wrkMast.getWrkSts() >= 14 && wrkMast.getWrkSts() <= 15)) {
+ if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() >= 14) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
wrkMast.setWrkSts(4L);
// 鍑哄簱
- } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() < 15) {
- wrkMast.setWrkSts(14L);
- }else if(wrkMast.getWrkSts() >= 103 && wrkMast.getWrkSts() <= 105){
- wrkMast.setWrkSts(4L);
- }else if (wrkMast.getWrkSts() >= 106 && wrkMast.getWrkSts() <=108){
+ } else if (wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
}
Date now = new Date();
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 0ae362f..13438a0 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -31,7 +31,7 @@
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'pltType', align: 'center',title: '宸ヤ綅鍙�'}
+ ,{field: 'pltType', align: 'center',title: '宸ヤ綅鍙�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
// var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
--
Gitblit v1.9.1