From e61d7a861cbb67d038cda649272952f40de99930 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 13 十一月 2025 15:11:52 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/manLocDetl/PLocDetl.js | 8 +++++---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 9 ++-------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 17e0d02..cdce839 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -375,7 +375,7 @@
ManLocDetl manLocDetl = manLocDetlService.selectItem(node.getName(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (null != manLocDetl) {
Double anfme = manLocDetl.getAnfme()+wrkDetl.getAnfme();
- if (!manLocDetlService.updateAnfme(anfme, locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!manLocDetlService.updateAnfme(anfme, manLocDetl.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("骞冲簱鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -470,12 +470,7 @@
}
assert locMast != null;
}
- if (null == locMast) {
-// exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("宸ヤ綔妗ｅ簱浣嶅彿閿欒; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- assert locMast != null;
+
switch (wrkMast.getIoType()) {
// 鍏ㄦ澘鍑哄簱
case 101:
diff --git a/src/main/webapp/static/js/manLocDetl/PLocDetl.js b/src/main/webapp/static/js/manLocDetl/PLocDetl.js
index 5636d0e..8682c53 100644
--- a/src/main/webapp/static/js/manLocDetl/PLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/PLocDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
+ ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
@@ -10,8 +10,10 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
-
+ // ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'temp3', align: 'center',title: '渚涘簲鍟�', hide: false}
+ ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false}
--
Gitblit v1.9.1