From f6a634d9d25b299378b05099ffd6980926937de1 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期五, 07 六月 2024 19:00:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4e57430..6b81850 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -109,7 +109,8 @@
@Value("${wms.url}")
private String wmsUrl;
- private WrkMastSplitTwinServiceImpl wrkMastSplitTwinService;
+ @Autowired
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
/**
* 缁勬墭
@@ -6279,18 +6280,18 @@
&& crnProtocol.getForkPos() == 0) {
sign[0] = 1;
sign[1] = 1;
- } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
- && crnProtocol.getTaskNoTwo() == 0
- && crnProtocol.getLoadedTwo() == 0
- && crnProtocol.getForkPosTwo() == 0){
- sign[0] = 1;
- sign[1] = 2;
} else if (crnProtocol.getStatusType() == CrnStatusType.SEPARATE_IDLE
&& crnProtocol.getTaskNo() == 0
&& crnProtocol.getLoaded() == 1
&& crnProtocol.getForkPos() == 0) {
sign[0] = 2;
sign[1] = 1;
+ } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
+ && crnProtocol.getTaskNoTwo() == 0
+ && crnProtocol.getLoadedTwo() == 0
+ && crnProtocol.getForkPosTwo() == 0){
+ sign[0] = 1;
+ sign[1] = 2;
} else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.SEPARATE_IDLE
&& crnProtocol.getTaskNoTwo() == 0
&& crnProtocol.getLoadedTwo() == 1
@@ -6302,11 +6303,17 @@
if (sign[0]!=0){
List<WrkMastSplitTwin> wrkMastSplitTwinList = wrkMastSplitTwinService.getWrkMastSplitTwin(crn.getId(),sign[1],null,sign[0],0);
- if (wrkMastSplitTwinList.size()!=1){
- log.error("鍫嗗灈鏈哄嚭鍏ュ簱涓嬪彂寮傚父,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={},宸ヤ綅鍙�={},宸ヤ綔绫诲瀷={}",crn.getId(),"涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ绗斿彲鎵ц浣滀笟锛岃鍒犻櫎鏃犳晥浣滀笟锛侊紒锛�",sign[1],sign[0]);
+ if (wrkMastSplitTwinList.size()>1){
+ log.error("鍫嗗灈鏈哄嚭鍏ュ簱涓嬪彂寮傚父,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={},宸ヤ綅鍙�={},宸ヤ綔绫诲瀷={}",crn.getId(),"瀛樺湪澶氱瑪鍙墽琛屼綔涓氾紝璇峰垹闄ゆ棤鏁堜綔涓氾紒锛侊紒",sign[1],sign[0]);
+ return false;
}
for (WrkMastSplitTwin wrkMastSplitTwin:wrkMastSplitTwinList){
- return sign[0] == 1? crnExecuteTakeFull(crn.getId(), wrkMastSplitTwin, sign[1]) : crnExecutePutFull(crn.getId(), wrkMastSplitTwin, sign[1]);
+ boolean re = sign[0] == 1 ? crnExecuteTakeFull(crn.getId(), wrkMastSplitTwin, sign[1]) : crnExecutePutFull(crn.getId(), wrkMastSplitTwin, sign[1]);
+ if (re){
+ wrkMastSplitTwin.setWrkSts(wrkMastSplitTwin.getWrkSts()+1);
+ wrkMastSplitTwinService.updateById(wrkMastSplitTwin);
+ }
+
}
}
}catch (Exception e){
--
Gitblit v1.9.1