From 41b60e560952a6db3a99a3972dc146c3b177cb77 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 五月 2025 18:15:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
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 c20dd4a..d3a8183 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -33,7 +33,7 @@
private OrderDetlService orderDetlService;
@Autowired
- private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Autowired
private DocTypeService docTypeService;
@@ -121,6 +121,9 @@
if (null == docType) {
return SUCCESS;
}
+ if (docType.getDocName().equals("閿�鍞彂璐�")) {
+ return SUCCESS;
+ }
Order orderSou = orderService.selectByNo(order.getOrderNo());
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
@@ -160,6 +163,40 @@
}
@Transactional
+ public ReturnT<String> checkXSFH(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ if (!docType.getDocName().equals("閿�鍞彂璐�")) {
+ return SUCCESS;
+ }
+ Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (!orderSou.getSettle().equals(2L)) {
+ return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ boolean complete = true;
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ complete = false;
+ break;
+ }
+ }
+ if (complete) {
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
+ }
+ return SUCCESS;
+ }
+
+
+ @Transactional
public ReturnT<String> startOrderReport(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
@@ -175,11 +212,10 @@
}
-
@Transactional
public ReturnT<String> reportCheck(InventoryCheckOrder checkOrder) {
List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
- for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls){
+ for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
}
return SUCCESS;
--
Gitblit v1.9.1