From c9b270dae703ee077a4e41013d7662c5e61afd29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 23:02:15 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 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 8b40723..bb21ce1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -68,6 +68,14 @@
private Long rgvCount;
@Value("${constant-parameters.rgvDate}")
private Double rgvDate;
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.reportOutPath}")
+ private String wmsOutPath;
+ @Value("${wms.reportSwitch}")
+ private boolean reportSwitch;
+ @Value("${wms.reportSwitchAuto}")
+ private boolean reportSwitchAuto;
/*
* 楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
@@ -326,6 +334,7 @@
rgvCommand.setSourceStaNo1(wrkMast.getSourceStaNo().shortValue()); //宸ヤ綅1璧风偣
rgvCommand.setDestinationStaNo1(wrkMast.getStaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
+ rgvCommand.setRgvSome(basCircularShuttle.getRgvSome()==1 ? (short) 1 : (short) 0);
if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
//
log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
@@ -335,7 +344,9 @@
wrkMast.setWrkSts(2L);
wrkMast.setRgvNo(rgvProtocol.getRgvNo());
- wrkMast.setAppeTime(new Date());
+ Date now = new Date();
+ wrkMast.setAppeTime(now);
+ wrkMast.setCrnStrTime(now);
try {
wrkMastService.updateById(wrkMast);
break;
@@ -352,7 +363,7 @@
}
//浠诲姟瀹屾垚
- public synchronized void rgvCompleteWrkMastSta() {
+ public synchronized void rgvCompleteWrkMastSta(int[] autoZ) {
try {
for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
@@ -387,11 +398,12 @@
wrkMast.setWrkSts(3L);
Date now = new Date();
wrkMast.setAppeTime(now);
+ wrkMast.setCrnEndTime(now);
try{
try{
- if (true){
+ if (reportSwitch){
RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
- ReturnT<String> result = new PostMesDataUtils().postMesDataWcs("", "", rgvTaskReportingParam);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataWcs(wmsUrl, wmsOutPath, rgvTaskReportingParam);
if (result.getCode()==200){
wrkMast.setWrkSts(4L);
wrkMast.setAppeTime(now);
@@ -402,20 +414,22 @@
}
} else {
//娴嬭瘯鐢�
- wrkMast.setWrkSts(5L);
+ wrkMast.setWrkSts(4L);
wrkMast.setAppeTime(now);
wrkMastService.updateById(wrkMast);
- WrkMast wrkMast1 = new WrkMast();
- int workNo = commonService.getWorkNo(0);
- wrkMast1.setWrkNo((long) workNo);
- wrkMast1.setSourceStaNo(wrkMast.getStaNo());
- wrkMast1.setStaNo(wrkMast.getSourceStaNo());
- wrkMast1.setWrkSts(1L);
- wrkMast1.setIoType(1);
- wrkMast1.setModiTime(now);
- wrkMast1.setAppeTime(now);
- wrkMast1.setMemo("娴嬭瘯鏁版嵁");
- wrkMastService.insert(wrkMast1);
+ 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.insert(wrkMast1);
+ }
continue;
}
} catch (Exception e){
--
Gitblit v1.9.1