From bd1a2aef7fbe13e920c473b4f5e7ff5ba942c9a8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 11:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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..3741792 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -172,6 +172,20 @@
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
+ //2.鍏ュ簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setLocNo(wrkMast.getLocNo());
+ 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();
@@ -333,6 +347,7 @@
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ 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 +358,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())
@@ -361,6 +377,22 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ if (locMast.getCrnNo()==1 && sign){
+ //5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkMast.getBarcode());
+ 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:
break;
--
Gitblit v1.9.1