From 5e38c75bc9c609d5e41bf817756ef8ed7a0f4851 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 21 八月 2025 15:28:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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..5c6a759 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;
@@ -59,20 +58,19 @@
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")){
+ || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getLoadingSuper().equals("Y") || !basDevp.getInEnable().equals("Y")){
return FAIL;
}
BasDevp basDevp131 = basDevpService.selectById(131);
if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y")
- || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000) || basDevp131.getReportSign()!=0){
+ || basDevp131.getWrkNo()!=0 || basDevp131.getReportSign()!=0){
return FAIL;
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no", basDevp.getWrkNo()).eq("source_sta_no",145));
- if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2){
+ if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2 || wrkMast.getSheetNo().equals("3")){
return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -85,15 +83,11 @@
return FAIL;
}
BasDevp basDevpEnd = basDevpService.selectById(staNoEnd);
- if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 ){
- return FAIL;
- }
- BasDevp basDevpOther = basDevpService.selectById(staOther);
- if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()!=0){
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") ){
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 +102,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 +111,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