From 288e45a990a5abf4ab50f820ed4e870e8314468e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:14:10 +0800
Subject: [PATCH] 完善
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 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 425a04e..06f2801 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -14,6 +14,8 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -58,6 +60,8 @@
private PackQualifiedService packQualifiedService;
@Autowired
private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private ConfigService configService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -504,37 +508,14 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}else{
- //鍑哄簱鏍囪
- packQualifiedService.insertPackQualified(false,new Date(),wrkDetls101.get(0).getMatnr());
- //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 鍑哄簱
- //NG鍑哄簱淇敼娴嬭瘯妗ｇ殑鐘舵�佷负5.宸茬Щ搴�
- TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("user_id",wrkMast.getBarcode())
- .eq("barcode",wrkDetls101.get(0).getMatnr()));
- combParam.setPackSts(2);//NG
- combParam.setStepSts(8);//NG鍑哄簱瀹屾垚
- testMast.setStatus(5);
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
- .eq("user_id",wrkMast.getBarcode())
- .eq("barcode",wrkDetls101.get(0).getMatnr()))){
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼娴嬭瘯琛ㄧ姸鎬佷负5澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }else if(wrkMast.getStaNo()==103){//鐩爣绔�103鍑哄簱
- combParam.setPackSts(1);//OK
- combParam.setStepSts(6);//闈欑疆搴撳嚭搴撳畬鎴�
+ Config config=configService.selectOne(new EntityWrapper<Config>().eq("code","OutTask"));
+ if(config.getValue().equals("Y")){
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(30L);//绛夊緟涓婃姤
+ }else{
+ wrkMast.setWrkSts(15L);
}
- combParam.setRequestTime(DateUtils.convert(now));
-// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+
}
}
break;
@@ -551,14 +532,16 @@
// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }else{
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(15L);
}
}
break;
default:
break;
}
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
+
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
// exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
--
Gitblit v1.9.1