From ef0e5b74b8a7a21c8902520ef408e70ad3ec9437 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期二, 31 三月 2026 11:14:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WcsDeviceStatusScheduler.java | 8 ++++----
src/main/java/com/zy/asrs/controller/OpenController.java | 2 +-
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 ++-
src/main/java/com/zy/asrs/service/OpenService.java | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4547421..b47923a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -517,7 +517,7 @@
}
for (OutTaskParam outTaskParam : validOutOrders) {
- R r = openService.outOrder(outTaskParam);
+ R r = openService.outOrder(outTaskParam,validOutOrders.size());
if (!r.get("code").equals(200)){
return r;
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index f209bef..30abac5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -185,9 +185,9 @@
private String threeCode;
/**
- * 渚涘簲鍟�
+ * 搴忓彿
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "搴忓彿")
private String supp;
/**
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 5db6893..7a1a4d8 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -79,6 +79,6 @@
/**
*
*/
- R outOrder(OutTaskParam param);
+ R outOrder(OutTaskParam param,int count);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index e0742f6..4771849 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1291,7 +1291,7 @@
}
@Override
- public R outOrder(OutTaskParam param) {
+ public R outOrder(OutTaskParam param,int count) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
if (locMast == null) {
return R.error("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
@@ -1347,6 +1347,7 @@
wrkDetl.setAppeUser(9995L);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(9995L);
+ wrkDetl.setSupp(param.getSeq()+"/"+count);
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
diff --git a/src/main/java/com/zy/asrs/task/WcsDeviceStatusScheduler.java b/src/main/java/com/zy/asrs/task/WcsDeviceStatusScheduler.java
index c16e5f0..901adb0 100644
--- a/src/main/java/com/zy/asrs/task/WcsDeviceStatusScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WcsDeviceStatusScheduler.java
@@ -20,10 +20,10 @@
@Value("${wcs.status-sync.enabled:true}")
private Boolean enabled;
-// @Scheduled(
-// initialDelayString = "${wcs.status-sync.initial-delay:10000}",
-// fixedDelayString = "${wcs.status-sync.fixed-delay:5000}"
-// )
+ @Scheduled(
+ initialDelayString = "${wcs.status-sync.initial-delay:10000}",
+ fixedDelayString = "${wcs.status-sync.fixed-delay:5000}"
+ )
private void execute() {
if (!Boolean.TRUE.equals(enabled)) {
return;
--
Gitblit v1.9.1