From b050b0ef27649165992c264f63042d339d86a4f3 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 03 二月 2026 16:22:10 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++-
src/main/resources/application-prod.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 1 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 bb2a5dc..c0730c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -728,7 +728,11 @@
if (offer) {
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
Date now = new Date();
- taskWrk.setStatus(TaskStatusType.OVER3.id);
+ if (taskWrk.getTargetPoint().equals(staProtocol.getSiteId().toString())){
+ taskWrk.setStatus(TaskStatusType.OVER.id);
+ } else {
+ taskWrk.setStatus(TaskStatusType.OVER3.id);
+ }
taskWrk.setWrkSts(14);
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index af45d92..0844672 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -70,6 +70,36 @@
barcode: ${wcs-slave.barcode[0].id}
backSta: 1005
barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[5]:
+ staNo: 1001
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1001
+ barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[6]:
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1006
+ barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[7]:
+ staNo: 1008
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1008
+ barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[8]:
+ staNo: 1017
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1017
+ barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[9]:
+ staNo: 1022
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1022
+ barcodeSign: false
# 鍑哄簱鍙�1
outSta[0]:
@@ -86,6 +116,21 @@
# 鍑哄簱鍙�5
outSta[4]:
staNo: 1023
+ # 鍑哄簱鍙�5
+ outSta[5]:
+ staNo: 1019
+ # 鍑哄簱鍙�5
+ outSta[6]:
+ staNo: 1018
+ # 鍑哄簱鍙�5
+ outSta[7]:
+ staNo: 1013
+ # 鍑哄簱鍙�5
+ outSta[8]:
+ staNo: 1007
+ # 鍑哄簱鍙�5
+ outSta[9]:
+ staNo: 1003
# led: ${wcs-slave.led[0].id}
# RGV绌挎杞�1
rgv[1]:
--
Gitblit v1.9.1