From 5d6c45fda93e4f80334213205ca5aec4e10436b2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 21:21:47 +0800
Subject: [PATCH] 关闭与erp的对接

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 5 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..ef443d8 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,11 @@
     private OrderDetlService orderDetlService;
 
     @Autowired
-    private   InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+    private OrderDetlPakoutService orderDetlPakoutService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
+    @Autowired
+    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
 
     @Autowired
     private DocTypeService docTypeService;
@@ -89,8 +93,7 @@
         List<OrderDetl> orderDetlList = new ArrayList<>();
 
         for (OrderDetl detail : orderDetls) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(),
-                    detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
             if (DetlDto.has(list, dto)) {
                 DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
                 assert detlDto != null;
@@ -119,6 +122,9 @@
     public ReturnT<String> startOrderInAndOutUtil(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());
@@ -160,6 +166,60 @@
     }
 
     @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) {
+            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+                throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+            }
+            List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
+            for (WrkDetl wrkDetl : wrkDetls) {
+                OrderDetl orderDetl = new OrderDetl();
+                orderDetl.sync(wrkDetl);
+                orderDetl.setQty(wrkDetl.getAnfme());
+                orderDetl.setOrderId(order.getId());
+                orderDetl.setOrderNo(order.getOrderNo());
+                orderDetl.setStatus(1);
+                orderDetl.setCreateTime(order.getCreateTime());
+                orderDetl.setCreateBy(order.getCreateBy());
+                orderDetl.setUpdateTime(order.getUpdateTime());
+                orderDetl.setUpdateBy(order.getUpdateBy());
+                if (!orderDetlService.insert(orderDetl)) {
+                    throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+                }
+            }
+
+            // 淇敼璁㈠崟鐘舵�� 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 +235,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