From a3e7e923289c8909c3ee1b393ecadf501091ffcc Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期五, 12 八月 2022 08:18:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 10 +++++-----
src/main/webapp/static/js/common.js | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d50a892..d9152ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -67,9 +67,9 @@
try {
ReturnT<String> result = null;
if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
- result = postMesData(wrkMast,inpath);
+ result = postMesData(wrkMast,inpath,1);
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
- result = postMesData(wrkMast,outPath);
+ result = postMesData(wrkMast,outPath,2);
}
if(null != result && !result.isSuccess()){
return result;
@@ -100,7 +100,7 @@
return SUCCESS;
}
- private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath){
+ private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath,int a){
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if(wrkDetl != null){
CombParam combParam = new CombParam();
@@ -126,9 +126,9 @@
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
- log.error("fail", e);
+ /*log.error("fail", e);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
+ return FAIL.setMsg(e.getMessage());*/
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 310129f..d63ca12 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -224,7 +224,7 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
@@ -243,10 +243,10 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
--
Gitblit v1.9.1