From 03fb3f8e5bea1e4f87cc3e2d68fd521dcf663458 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期三, 06 九月 2023 09:02:44 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 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 69bd66a..da6144a 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -210,7 +210,7 @@ barcodeThread.setBarcode(""); staProtocol.setWorkNo((short)9999); staProtocol.setStaNo((short)201); - devpThread.setPakMk(staProtocol.getSiteId(), false); + devpThread.setPakMk(staProtocol.getSiteId(), true); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); log.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response); }else { @@ -218,7 +218,7 @@ barcodeThread.setBarcode(""); staProtocol.setWorkNo((short)9999); staProtocol.setStaNo((short)201); - devpThread.setPakMk(staProtocol.getSiteId(), false); + devpThread.setPakMk(staProtocol.getSiteId(), true); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response); } @@ -500,7 +500,7 @@ } else { staProtocol = staProtocol.clone(); } - if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==109) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) { + if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==1000) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) { // 鏌ヨ宸ヤ綔妗� WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId()); if (wrkMast == null) { @@ -2374,16 +2374,16 @@ }else if(devpThread.startSignal[i][0]==3){ locMast.setPackStatus(7); testMast.setModiTime(new Date()); - }else if(devpThread.startSignal[i][0]==4 && testMast.getStatus()!=4){ + }else if(devpThread.startSignal[i][0]==4 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){ locMast.setPackStatus(3); testMast.setStatus(4); testMast.setModiTime(new Date()); - testMastService.insertPackQualified(true,new Date()); - }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4){ + testMastService.insertPackQualified(true,new Date(),testMast.getBarcode()); + }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){ locMast.setPackStatus(4); testMast.setStatus(4); testMast.setModiTime(new Date()); - testMastService.insertPackQualified(false,new Date()); + testMastService.insertPackQualified(false,new Date(),testMast.getBarcode()); } // else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){ // locMast.setPackStatus(devpThread.startSignal[i][0]+3); -- Gitblit v1.9.1