From ebb56a4c6052481e17c0b58de1b39286417fbad9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 04 十一月 2023 11:16:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 49 ++++---------------------------------------------
1 files changed, 4 insertions(+), 45 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 a81df0c..8d7fccf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -569,53 +569,12 @@
// if(crnThread.isBackHpFlag()){
// continue;
// }
+
// 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
// 搴撲綅绉昏浆
this.stnToStn(crn, crnProtocol);
- }else {
- continue;
- }
-
- try{
- Thread.sleep(1000);
- }catch (Exception e){
- continue;
- }
- crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
- basCrnp = basCrnpService.selectById(crn.getId());
- if (basCrnp == null) {
- log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
- continue;
- }
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
- && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
- // 搴撲綅绉昏浆
- this.locToLoc(crn, crnProtocol);
- }else {
- continue;
- }
-
- try{
- Thread.sleep(1000);
- }catch (Exception e){
- continue;
- }
- crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
- basCrnp = basCrnpService.selectById(crn.getId());
- if (basCrnp == null) {
- log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
- continue;
- }
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
- && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
if (basCrnp.getInEnable().equals("Y")) {
@@ -638,6 +597,7 @@
}
}
// 搴撲綅绉昏浆
+ this.locToLoc(crn, crnProtocol);
// this.crnRebackHp(crnProtocol, crnThread);
}
@@ -2440,10 +2400,9 @@
locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
}
wrkMastMapper.delete(new EntityWrapper<WrkMast>()
- .eq("wrk_sts",11)
- .eq("source_loc_no",locMast.getLocNo()));
+ .eq("wrk_no",wrkMast.getWrkNo()));
locMast.setLocSts("F");
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",wrkMast.getBarcode()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
.eq("channel",i+1))){
log.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
--
Gitblit v1.9.1