From 98ad8b1986704d39693ad61ba3f167013cd2fdf0 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 26 一月 2024 18:40:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index eeebaa6..1bdc492 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -57,8 +57,9 @@
@Value("${srHangJia.reportInPath}")
private String reportOutPath;
- public ReturnT<String> start(int staNo) {
+ public ReturnT<String> start(int staNo,int staNoEnd) {
try {
+ Integer staOther = getStaOther(staNoEnd);
BasDevp basDevp = basDevpService.selectById(staNo);
if (Cools.isEmpty(basDevp) || basDevp.getWrkNo()==0
|| !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getInEnable().equals("Y")){
@@ -83,19 +84,18 @@
|| Cools.isEmpty(wrkDetl.getBrand())){
return FAIL;
}
- BasDevp basDevp118 = basDevpService.selectById(118);
- if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 ){
+ BasDevp basDevpEnd = basDevpService.selectById(staNoEnd);
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 ){
return FAIL;
}
- BasDevp basDevp119 = basDevpService.selectById(119);
- if (Cools.isEmpty(basDevp119) || basDevp119.getReportSign()!=0){
+ BasDevp basDevpOther = basDevpService.selectById(staOther);
+ if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()!=0){
return FAIL;
}
- if (basDevp118.getLoading().equals("Y") && basDevp118.getEmptyMk().equals("Y")){
+ if (basDevpEnd.getLoading().equals("Y") && basDevpEnd.getEmptyMk().equals("Y")){
//鐢熸垚鏈烘鑷備换鍔�
-
- TrussCombParam trussCombParam = new TrussCombParam(wrkDetl);
+ TrussCombParam trussCombParam = new TrussCombParam(wrkDetl,staNoEnd);
try{
ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
if (success.getCode()!=200){
@@ -106,24 +106,26 @@
wrkMastService.updateById(wrkMast);
basDevp.setReportSign(3);
basDevpService.updateById(basDevp);
- basDevp118.setReportSign(3);
- basDevpService.updateById(basDevp118);
+ basDevpEnd.setReportSign(3);
+ basDevpService.updateById(basDevpEnd);
+ wrkDetl.setOrigin(trussCombParam.getPalletizingNo2()==118? "2":"1");
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetl.getWrkNo()));
}
return SUCCESS;
} catch (Exception e){
log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�"+e);
return FAIL;
}
- }else if (!basDevp118.getLoading().equals("Y") ){
+ }else if (!basDevpEnd.getLoading().equals("Y") ){
Thread.sleep(1000);
- basDevp118 = basDevpService.selectById(118);
- if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 || !basDevp118.getLoading().equals("Y") ){
+ basDevpEnd = basDevpService.selectById(staNoEnd);
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 || !basDevpEnd.getLoading().equals("Y") ){
return FAIL;
}
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",118 + 19999L));
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNoEnd + 19999L));
if (Cools.isEmpty(wrkMastSta)){
//鐢熸垚鎷嗙洏浠诲姟
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118);
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staNoEnd);
wrkMastSta1.setType(2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
wrkMastSta1.setWrkType(2); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
@@ -176,4 +178,20 @@
}
return SUCCESS;
}
+
+ public Integer getStaOther(Integer staNo){
+ switch (staNo){
+ case 118:
+ return 119;
+ case 119:
+ return 118;
+ case 120:
+ return 121;
+ case 121:
+ return 120;
+ default:
+ return 0;
+ }
+ }
+
}
--
Gitblit v1.9.1