From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 1bdc492..7097c7a 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -22,7 +22,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import sun.security.smartcardio.SunPCSC;
import java.util.Date;
import java.util.List;
@@ -62,7 +61,7 @@
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")){
+ || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getLoadingSuper().equals("Y") || !basDevp.getInEnable().equals("Y")){
return FAIL;
}
BasDevp basDevp131 = basDevpService.selectById(131);
@@ -93,7 +92,7 @@
return FAIL;
}
- if (basDevpEnd.getLoading().equals("Y") && basDevpEnd.getEmptyMk().equals("Y")){
+ if (basDevpEnd.getLoading().equals("Y") && basDevpEnd.getLoadingSuper().equals("Y") && basDevpEnd.getEmptyMk().equals("Y")){
//鐢熸垚鏈烘鑷備换鍔�
TrussCombParam trussCombParam = new TrussCombParam(wrkDetl,staNoEnd);
try{
@@ -108,7 +107,8 @@
basDevpService.updateById(basDevp);
basDevpEnd.setReportSign(3);
basDevpService.updateById(basDevpEnd);
- wrkDetl.setOrigin(trussCombParam.getPalletizingNo2()==118? "2":"1");
+// wrkDetl.setOrigin(trussCombParam.getPalletizingNo2()==118? "2":"1");
+ wrkDetl.setOrigin("1");
wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetl.getWrkNo()));
}
return SUCCESS;
@@ -116,10 +116,10 @@
log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�"+e);
return FAIL;
}
- }else if (!basDevpEnd.getLoading().equals("Y") ){
+ }else if (!basDevpEnd.getLoading().equals("Y") && !basDevpEnd.getLoadingSuper().equals("Y")){
Thread.sleep(1000);
basDevpEnd = basDevpService.selectById(staNoEnd);
- if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 || !basDevpEnd.getLoading().equals("Y") ){
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getLoadingSuper().equals("Y")){
return FAIL;
}
WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNoEnd + 19999L));
--
Gitblit v1.9.1