From 702549f5d846ae76cc005c56d03fd774a3caa341 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 23 四月 2026 14:23:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 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 fdce027..7558e4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -77,6 +77,8 @@
private String wmsOutPath;
@Value("${wms.reportSwitch}")
private boolean reportSwitch;
+ @Value("${wms.reportSwitchCs}")
+ private boolean reportSwitchCs;
@Value("${wms.reportSwitchAuto}")
private boolean reportSwitchAuto;
@Value("${constant-parameters.priority.distance-threshold:10000}")
@@ -815,36 +817,44 @@
wrkMast.setCrnEndTime(now);
try{
try{
- if (reportSwitch){
- RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
- ReturnT<String> result = new PostMesDataUtils().postMesDataWcs(wmsUrl, wmsOutPath, rgvTaskReportingParam);
- if (result.getCode()==200){
- wrkMast.setWrkSts(4L);
- wrkMast.setAppeTime(now);
- wrkMastService.updateById(wrkMast);
- continue;
- }else {
- log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触1");
- }
- } else {
- //娴嬭瘯鐢�
+ if (reportSwitchCs){
wrkMast.setWrkSts(4L);
wrkMast.setAppeTime(now);
wrkMastService.updateById(wrkMast);
- if (reportSwitchAuto) {
- WrkMast wrkMast1 = new WrkMast();
- int workNo = commonService.getWorkNo(0);
- wrkMast1.setWrkNo((long) workNo);
- wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs(autoZ));
- wrkMast1.setStaNo(wrkMast.getStaNoCs(autoZ));
- wrkMast1.setWrkSts(1L);
- wrkMast1.setIoType(1);
- wrkMast1.setModiTime(now);
- wrkMast1.setAppeTime(now);
- wrkMast1.setMemo("娴嬭瘯鏁版嵁");
- wrkMastService.save(wrkMast1);
- }
continue;
+ }else {
+ if (reportSwitch){
+ RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataWcs(wmsUrl, wmsOutPath, rgvTaskReportingParam);
+ if (result.getCode()==200){
+ wrkMast.setWrkSts(4L);
+ wrkMast.setAppeTime(now);
+ wrkMastService.updateById(wrkMast);
+ continue;
+ }else {
+ log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触1");
+ }
+ } else {
+ //娴嬭瘯鐢�
+ wrkMast.setWrkSts(4L);
+ wrkMast.setAppeTime(now);
+ wrkMastService.updateById(wrkMast);
+ if (reportSwitchAuto) {
+ WrkMast wrkMast1 = new WrkMast();
+ int workNo = commonService.getWorkNo(0);
+ wrkMast1.setWrkNo((long) workNo);
+ wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs(autoZ));
+ wrkMast1.setStaNo(wrkMast.getStaNoCs(autoZ));
+ wrkMast1.setWrkSts(1L);
+ wrkMast1.setIoType(1);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setMemo("娴嬭瘯鏁版嵁");
+ wrkMastService.save(wrkMast1);
+ }
+ continue;
+ }
+
}
} catch (Exception e){
log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
@@ -860,6 +870,12 @@
log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�", rgvProtocol.getRgvNo());
break;
}
+ } else if (rgvProtocol.getTaskNo1() == 0){
+ boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
+ if (!rgvComplete) {
+ log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�", rgvProtocol.getRgvNo());
+ break;
+ }
}
} catch (Exception e) {
log.error("灏忚溅澶嶄綅绾跨▼鎶ラ敊锛�" + e);
--
Gitblit v1.9.1