From 3c38ed3606ecbaac693baff568f8f66e635abc8d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 01 六月 2023 13:12:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 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 b9f626e..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,17 +161,33 @@
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("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
+ //2.鍏ュ簱瀹屾垚涓婃姤
+ 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);
+ }else{
+ combParam.setPackSts(1);
+ combParam.setStepSts(5);
+ }
+
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -332,7 +348,10 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+
+ boolean sign =false;
if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
locMast.setPackStatus(packStatus);
}else if (locMast.getLocType1().equals((short)1) && sourceLoc.getLocType1().equals((short)3)){
@@ -343,6 +362,7 @@
}else {
locMast.setPackStatus(5); //5:闈欑疆涓�
}
+ sign=true;
if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
@@ -360,6 +380,23 @@
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+
+ if (locMast.getCrnNo()==1 && sign){
+ //5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locDetl.getMatnr());
+ combParam.setLocNo(wrkMast.getLocNo());
+ if (locMast.getPackStatus()==4){
+ combParam.setPackSts(2);
+ }else if (locMast.getPackStatus()==5){
+ combParam.setPackSts(1);
+ }else {
+ combParam.setPackSts(0);
+ }
+ combParam.setStepSts(5);
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
break;
default:
@@ -439,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