From 510e90328547a8a0d03fa508a46070d1d8c780c2 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期四, 02 四月 2026 10:57:32 +0800
Subject: [PATCH] 完善出库时上传托盘码的逻辑以及用过的出库单重置
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index d4e7a67..1fcb5f6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -976,17 +976,19 @@
OrderPakout order = orderPakoutService.selectByNo(mesCallOutApply.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
+ if (order.getSettle() > 1L && order.getSettle() < 6L) {
throw new CoolException(mesCallOutApply.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- orderPakoutService.remove(order.getId());
+ else if (order.getSettle() == 6L) {
+ orderPakoutService.remove(order.getId());
+ }
}
// 鐢熸垚璁㈠崟
Date now = new Date();
OrderPakout orderPakout = new OrderPakout();
orderPakout.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- orderPakout.setOrderNo(mesCallOutApply.getOrderNo());
+ orderPakout.setOrderNo(mesCallOutApply.getTaskno());
orderPakout.setOrderTime(DateUtils.convert(now));
orderPakout.setDocType(docType.getDocId());
orderPakout.setSettle(settle);
--
Gitblit v1.9.1