From 9323f1e6cf66551371948bed0e734ec9b7a545d5 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期三, 06 九月 2023 08:59:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++----- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 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 9a2cf4b..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,12 +2374,12 @@ }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(),testMast.getBarcode()); - }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4){ + }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()); diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 1b4d471..42f4ba1 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -89,13 +89,13 @@ StaProtocol staProtocol2 = (StaProtocol)task.getData(); siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1); break; - //澶嶄綅娴嬭瘯淇″彿 - case 3: - StaProtocol staProtocol = (StaProtocol)task.getData(); - siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo()); - break; - default: - break; + //澶嶄綅娴嬭瘯淇″彿 + case 3: + StaProtocol staProtocol = (StaProtocol) task.getData(); + siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo()); + break; + default: + break; } // 蹇冭烦 // heartbeat(); @@ -210,7 +210,7 @@ //鍚姩绉诲簱鎸夐挳 OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96); //娑堥槻鎶ヨ - OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96); + OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48); if(result3.IsSuccess) { for(int i=0; i<48; i++){ startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i);//娴嬭瘯鏌滅姸鎬� -- Gitblit v1.9.1