From b931c44bee33ccae4d14594a6419bcf0a26b29dd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 24 一月 2024 09:39:50 +0800
Subject: [PATCH] 修复Loc_mast导出问题
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 f2f97af..d5a1f4c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -160,6 +160,10 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ //鍏ユ祴璇曞簱浣嶆椂缁欏簱浣嶆祴璇曠姸鎬佷负1寰呮祴
+ if(!Cools.isEmpty(locMast.getChannel())){
+ locMast.setPackStatus(1);//寰呮祴
+ }
if (locMast.getCrnNo()==1){
if (locMast.getLocType1()==1){
locMast.setPackStatus(1);
@@ -383,7 +387,6 @@
}else {
throw new CoolException("寰呮祴搴撲綅鏃犵墿");
}
-
}else {
//娴嬭瘯搴撲綅杞潤缃簱浣嶅拰NG搴撲綅
if (locMast.getLocType1().equals((short)4)){
@@ -423,18 +426,30 @@
}
if (locMast.getCrnNo()==1 && sign){
- //5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
+ //7.娴嬭瘯搴撲綅杞潤缃簱浣嶅嚭搴撳畬鎴愪笂鎶�
CombParam combParam = new CombParam();
combParam.setPackNo(locDetl.getMatnr());
- combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setLocNo(wrkMast.getSourceLocNo());
+ combParam.setStepSts(7);
if (locMast.getPackStatus()==4){
combParam.setPackSts(2);
}else if (locMast.getPackStatus()==5){
combParam.setPackSts(1);
+ }
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ //5.娴嬭瘯搴撲綅杞潤缃簱浣嶅叆搴撳畬鎴愪笂鎶�
+ combParam.setPackNo(locDetl.getMatnr());
+ combParam.setLocNo(wrkMast.getLocNo());
+ if (locMast.getPackStatus()==4){
+ combParam.setPackSts(2);
+ combParam.setStepSts(5);
+ }else if (locMast.getPackStatus()==5){
+ combParam.setPackSts(1);
+ combParam.setStepSts(8);
}else {
combParam.setPackSts(0);
}
- combParam.setStepSts(5);
combParam.setRequestTime(DateUtils.convert(now));
new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
--
Gitblit v1.9.1