From 3c8343535bec2a53855956e25598e2271fc84c0d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期日, 07 七月 2024 10:28:21 +0800
Subject: [PATCH] 更新测试管理搜索功能
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 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 5b242eb..c941a80 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -52,6 +53,11 @@
@Value("${mes.inPath}")
private String inpath;
+
+ @Autowired
+ private PackQualifiedService packQualifiedService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -154,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);
@@ -167,12 +177,23 @@
.eq("barcode",wrkDetl1.getMatnr())
.eq("status",4)
);
+ if (Cools.isEmpty(testMast)){
+ testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("barcode",wrkDetl1.getMatnr())
+ .eq("status",5)
+ );
+ }
+ if (Cools.isEmpty(testMast)){
+ throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�,鏌ヨ娴嬭瘯妗ｆ澶辫触");
+ }
testMast.setStatus(5);
testMast.setModiTime(new Date());
if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode",wrkDetl1.getMatnr()).eq("status",4))){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
+ //鍏ュ簱鏍囪
+ packQualifiedService.insertPackQualified(true,new Date(),wrkDetls.get(0).getMatnr());
//2.鍏ュ簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetls.get(0).getMatnr());
@@ -375,13 +396,20 @@
}else {
throw new CoolException("寰呮祴搴撲綅鏃犵墿");
}
-
}else {
//娴嬭瘯搴撲綅杞潤缃簱浣嶅拰NG搴撲綅
if (locMast.getLocType1().equals((short)4)){
locMast.setPackStatus(4); //4:NG
+ //鍏ュ簱鏍囪
+ packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
+ //鍑哄簱鏍囪
+ packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
}else {
locMast.setPackStatus(5); //5:闈欑疆涓�
+ //鍏ュ簱鏍囪
+ packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
+ //鍑哄簱鏍囪
+ packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
}
sign=true;
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -407,18 +435,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);
}
@@ -500,6 +540,8 @@
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());
--
Gitblit v1.9.1