From 42180f49192aaddb9aa5db3469e4ce2c52d540a1 Mon Sep 17 00:00:00 2001 From: ytfl <ytfl@qq.com> Date: 星期三, 11 六月 2025 15:53:44 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/SiteController.java | 5 ++ src/main/java/com/zy/asrs/controller/ConsoleController.java | 4 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 48 +++++++++++++----------- src/main/webapp/views/pipeline.html | 10 ++++ src/main/resources/application.yml | 10 ++++- 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index dd56b27..21b61cb 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -33,8 +33,8 @@ import com.zy.core.properties.SlaveProperties; import com.zy.core.properties.SystemProperties; import com.zy.core.thread.BarcodeThread; -import com.zy.core.thread.MelsecCrnThread; import com.zy.core.thread.ScaleThread; +import com.zy.core.thread.SiemensCrnThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -248,7 +248,7 @@ CrnDetailVo vo = new CrnDetailVo(); for (CrnSlave crnSlave : slaveProperties.getCrn()) { if (crnSlave.getId().equals(crnNo)) { - MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); + SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); vo.setCrnNo(crnNo); vo.setWorkNo(crnProtocol.getTaskNo()); diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java index 20db19b..86c538d 100644 --- a/src/main/java/com/zy/asrs/controller/SiteController.java +++ b/src/main/java/com/zy/asrs/controller/SiteController.java @@ -169,6 +169,7 @@ public R siteDetlUpdate(@RequestParam Integer siteId, @RequestParam Short workNo, @RequestParam Short staNo, + @RequestParam Short palletSize, @RequestParam String pakMk){ for (DevpSlave devp : slaveProperties.getDevp()) { DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); @@ -187,11 +188,13 @@ if (staNo != null) { staProtocol.setStaNo(staNo); } + if (palletSize != null) { + staProtocol.setPalletSize(palletSize); + } if (pakMk != null) { staProtocol.setPakMk(pakMk.equals("Y")); } - staProtocol.setPalletSize((short) 1); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); if (result) { return R.ok(); 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 d4a523c..683625a 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -364,26 +364,30 @@ staProtocol = staProtocol.clone(); } - if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) { + if (staProtocol.isAutoing() + && staProtocol.isLoading() + && staProtocol.isInEnable() + && staProtocol.getWorkNo() > 0 + && staProtocol.isPakMk()) { News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�"); - // 鑾峰彇鏉$爜鎵弿浠俊鎭� - BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode()); - if (barcodeThread == null) { - continue; - } - String barcode = barcodeThread.getBarcode(); - if(!Cools.isEmpty(barcode)) { - News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode); - if("NG".endsWith(barcode) || "NoRead".equals(barcode)) { - continue; - } - } else { - continue; - } +// // 鑾峰彇鏉$爜鎵弿浠俊鎭� +// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode()); +// if (barcodeThread == null) { +// continue; +// } +// String barcode = barcodeThread.getBarcode(); +// if(!Cools.isEmpty(barcode)) { +// News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode); +// if("NG".endsWith(barcode) || "NoRead".equals(barcode)) { +// continue; +// } +// } else { +// continue; +// } - WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode); -// WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue()); +// WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode); + WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue()); if (wrkMast == null) { // 鏃犳嫞鏂欐暟鎹� continue; @@ -409,11 +413,11 @@ .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿 StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { - News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo()); - staProtocol.setWorkNo((short) 9989); - staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1)); - devpThread.setPakMk(staProtocol.getSiteId(), false); - MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); +// News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo()); +// staProtocol.setWorkNo((short) 9989); +// staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1)); +// devpThread.setPakMk(staProtocol.getSiteId(), false); +// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); //LED LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed()); // led 寮傚父鏄剧ず diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c9a920b..fb1f6c8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -237,9 +237,15 @@ led: ${wcs-slave.led[0].id} # 鎷f枡鍏ュ簱鍙�1 pickSta[0]: - staNo: 102 + staNo: 1058 barcode: ${wcs-slave.barcode[0].id} - backSta: 101 + backSta: 1058 + led: ${wcs-slave.led[0].id} + # 鎷f枡鍏ュ簱鍙�2 + pickSta[1]: + staNo: 1064 + barcode: ${wcs-slave.barcode[0].id} + backSta: 1064 led: ${wcs-slave.led[0].id} # 鍑哄簱鍙�1 outSta[0]: diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html index c316cbd..c182d24 100644 --- a/src/main/webapp/views/pipeline.html +++ b/src/main/webapp/views/pipeline.html @@ -148,6 +148,12 @@ </div> </div> <div class="form-item"> + <label class="form-label">鎵樼洏灏哄:</label> + <div class="form-input"> + <input id="palletSize" name="palletSize" type="number" class="layui-input" lay-verify="number" autocomplete="off"> + </div> + </div> + <div class="form-item"> <label class="form-label">鍏ュ簱鏍囪:</label> <div class="form-input"> <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off"> @@ -432,10 +438,11 @@ }); $(document).on('click ','#save', function () { - http.post(baseUrl+ "/site//detl/update", { + http.post(baseUrl+ "/site/detl/update", { siteId: $('#siteId').val(), workNo: $('#workNo').val(), staNo: $('#staNo').val(), + palletSize: $('#palletSize').val(), pakMk: $('#pakMk').val() }, function (res) { layer.msg("淇敼鎴愬姛",{icon: 1,}); @@ -445,6 +452,7 @@ $('#siteId').val(""); $('#workNo').val(""); $('#staNo').val(""); + $('#palletSize').val(""); $('#pakMk').val(""); layer.close(layerDetl); }) -- Gitblit v1.9.1