From 359ffffec540f2645af8071d5aff0a6cd55db160 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 29 九月 2025 11:14:04 +0800
Subject: [PATCH] 对接

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 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 f740939..4bf9fec 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -20,6 +20,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +54,9 @@
             return SUCCESS;
         }
         List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+        if (orderDetls.isEmpty()){
+            return SUCCESS;
+        }
         // 鍏ュ簱瀹屾垚涓婃姤
         if (docType.getPakin() == 1) {
             ExdInstockTarget exdInstockTarge = null;
@@ -64,20 +68,39 @@
                 exdInstockTarge.setFdate(DateUtils.convert(order.getOrderTime()));
                 exdInstockTarge.setFrob(orderDetl.getInspect());
                 exdInstockTarge.setFuserid(Integer.getInteger(orderDetl.getColor()));
+                exdInstockTarge.setWritetime(new Date());
+                exdInstockTarge.setWritor("WMS");
+                exdInstockTarge.setStatus(0);
                 exdInstockTargetService.insert(exdInstockTarge);
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
+            }
+            if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
             }
         } else if (docType.getPakout() == 1) {
             // 鍑哄簱瀹屾垚涓婃姤
             ExdOutstockTarget exdOutstockTarget = null;
             for (OrderDetl orderDetl : orderDetls) {
                 exdOutstockTarget = new ExdOutstockTarget();
-                exdOutstockTargetService.insert(exdOutstockTarget);
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                exdOutstockTarget.setFinterid(orderDetl.getDeadWarn());
+                exdOutstockTarget.setFbillno(orderDetl.getOrderNo());
+                if (order.getDocType() == 42) {
+                    exdOutstockTarget.setFtrantype(41);
+                } else if (order.getDocType() == 21) {
+                    exdOutstockTarget.setFtrantype(81);
+                } else {
+                    exdOutstockTarget.setFtrantype(order.getDocType().intValue());
                 }
+                exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+                exdOutstockTarget.setFrob(orderDetl.getInspect());
+                exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
+                exdOutstockTarget.setWritetime(new Date());
+                exdOutstockTarget.setWritor("WMS");
+                exdOutstockTarget.setStatus(0);
+                exdOutstockTargetService.insert(exdOutstockTarget);
+
+            }
+            if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
             }
         }
         return SUCCESS;

--
Gitblit v1.9.1