From b2dbc07e7d3c3f336a0090b7457c89c6895d5e40 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 05 一月 2026 14:50:10 +0800
Subject: [PATCH] 入库流程修改
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 7 +++++++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 5 +++++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 12 ++++++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2c9a489..db8a974 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -557,6 +557,13 @@
return R.ok().add(maps);
}
+ /**
+ * 鍗曟嵁缁勬墭
+ * @author Ryan
+ * @date 2026/1/5 14:12
+ * @param param
+ * @param userId
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public void comb(CombParam param, Long userId) {
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index ef69df3..e44b3b9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -60,6 +60,11 @@
}
}
+ /**
+ * 涓婃姤鍗曟嵁杞墽琛屽崟鎹�
+ * @author Ryan
+ * @date 2026/1/5 14:07
+ */
@Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderIssued() {
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 002d171..9d53d60 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -82,6 +82,11 @@
return SUCCESS;
}
+ /**
+ * 涓婃姤鍗曟嵁杞墽琛屽崟鎹�
+ * @author Ryan
+ * @date 2026/1/5 14:07
+ */
@Transactional
public ReturnT<String> startOrderIssued(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -89,6 +94,8 @@
return SUCCESS;
}
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ //璁剧疆涓哄崟鎹墽琛屼腑
+ order.setSettle(2L);
OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(),order);
// 鍗曟嵁鏄庣粏妗�
@@ -115,6 +122,11 @@
orderDetl.setWorkQty(0D);
OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
}
+
+ //鍗曟嵁鐢熸垚瀹屾瘯鍚庯紝鐢熸垚鍏ュ簱缁勬墭妗c�備笉闇�瑕佸啀缁勬墭
+
+
+
// 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
if (!orderService.updateSettle(order.getId(), 2L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
--
Gitblit v1.9.1