From 9afe7ca53c38f2aa1010c2ac2a778012d133160f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 六月 2025 16:42:03 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   63 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 8 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 85cab5c..d3a8183 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,25 +1,20 @@
 package com.zy.asrs.task.handler;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.common.model.DetlDto;
-import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +31,9 @@
     private OrderService orderService;
     @Autowired
     private OrderDetlService orderDetlService;
+
+    @Autowired
+    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
 
     @Autowired
     private DocTypeService docTypeService;
@@ -123,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("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
@@ -162,15 +163,61 @@
     }
 
     @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) {
             return SUCCESS;
         }
         List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-        reportToThirdService.report(order, orderDetls, docType);
+        try {
+            reportToThirdService.report(order, orderDetls, docType);
+        } catch (Exception e) {
+            return FAIL;
+        }
         return SUCCESS;
     }
 
 
+    @Transactional
+    public ReturnT<String> reportCheck(InventoryCheckOrder checkOrder) {
+        List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
+        for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
+
+        }
+        return SUCCESS;
+    }
 }

--
Gitblit v1.9.1