From 5c50696e9514c45960e08e84ce8c7ccec52a60e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 31 五月 2023 09:28:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 508937f..30cbf19 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -161,14 +161,15 @@
locMast.setPackStatus(0);
}
}else {
+ WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
locMast.setPackStatus(5);
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("barcode",locMast.getBarcode())
+ .eq("barcode",wrkDetl1.getMatnr())
.eq("status",4)
);
testMast.setStatus(5);
testMast.setModiTime(new Date());
- if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode",locMast.getBarcode()).eq("status",4))){
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode",wrkDetl1.getMatnr()).eq("status",4))){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
@@ -176,6 +177,7 @@
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetls.get(0).getMatnr());
combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setBarcode(wrkMast.getBarcode());
if (locMast.getCrnNo()==1){
combParam.setPackSts(0);
combParam.setStepSts(2);
@@ -474,6 +476,25 @@
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }else{
+ //2.鍑哄簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetls101.get(0).getMatnr());
+ combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setBarcode(wrkMast.getBarcode());
+ //鐩爣绔�206鍑哄簱
+ if(wrkMast.getStaNo()==206){
+ combParam.setPackSts(1);//OK
+ combParam.setStepSts(7);//娴嬭瘯搴撳嚭搴撳畬鎴�
+ }else if(wrkMast.getStaNo()==204){//NG 鍑哄簱
+ combParam.setPackSts(2);//NG
+ combParam.setStepSts(8);//NG鍑哄簱瀹屾垚
+ }else if(wrkMast.getStaNo()==103){//鐩爣绔�103鍑哄簱
+ combParam.setPackSts(1);//OK
+ combParam.setStepSts(6);//闈欑疆搴撳嚭搴撳畬鎴�
+ }
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
}
break;
--
Gitblit v1.9.1