From f66fd8ba90a75a2002ba7783a870035e7908d89f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 27 十二月 2024 09:21:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   83 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 74 insertions(+), 9 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 fb44ebd..b4f717d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -16,6 +16,7 @@
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.common.constant.MesConstant;
+import com.zy.common.model.DetlDto;
 import com.zy.common.model.MesPakinParam;
 import com.zy.common.model.MesPakoutParam;
 import com.zy.common.utils.HttpHandler;
@@ -25,6 +26,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,25 +47,88 @@
     @Autowired
     private DocTypeService docTypeService;
     @Transactional
+    public ReturnT<String> startOrderIssued(Order order) {
+        DocType docType = docTypeService.selectById(order.getDocType());
+        if (null == docType) {
+            return SUCCESS;
+        }
+        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
+        OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(),order);
+        // 鍗曟嵁鏄庣粏妗�
+        List<DetlDto> list = new ArrayList<>();
+        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());
+            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;
+                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+
+                OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+                assert orderDetl != null;
+                orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
+            } else {
+                list.add(dto);
+                orderDetlList.add(detail);
+            }
+        }
+        for (OrderDetl orderDetl : orderDetlList){
+            OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
+        }
+        // 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
+        if (!orderService.updateSettle(order.getId(), 2L, null)) {
+            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+        }
+        return SUCCESS;
+    }
+    @Transactional
     public ReturnT<String> startOrderInAndOutUtil(Order order) {
         DocType docType = docTypeService.selectById(order.getDocType());
         if (null == docType) {
             return SUCCESS;
         }
-        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
-        Order orderNew = new Order(order);
-        orderService.insert(orderNew);
-        for (OrderDetl orderDetl : orderDetls){
-            OrderDetl orderDetlNew = new OrderDetl(orderDetl);
-            orderDetlNew.setOrderId(orderNew.getId());
-            orderDetlService.insert(orderDetlNew);
+        Order orderSou = orderService.selectByNo(order.getOrderNo());
+        if (!orderSou.getSettle().equals(2L)){
+            return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
         }
-        // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(orderSou.getId());
+
+        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+
+        for (OrderDetl orderDetlSou : orderDetlList){
+            for (OrderDetl orderDetl : orderDetls){
+                if (orderDetl.getQty().equals(0D)){
+                    continue;
+                }
+                if (orderDetlSou.beSimilar(orderDetl)){
+                    double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+                    if (v<orderDetl.getQty() || orderDetl.getQty().equals(v)){
+                        orderDetlSou.setQty(orderDetlSou.getAnfme());
+                        orderDetl.setQty(orderDetl.getQty() - v);
+                        break;
+                    } else {
+                        orderDetlSou.setQty(orderDetlSou.getQty()+orderDetl.getQty());
+                        orderDetl.setQty(0D);
+                    }
+                }
+            }
+        }
+        for (OrderDetl orderDetlSou : orderDetlList){
+            orderDetlService.updateById(orderDetlSou);
+        }
+        // 淇敼璁㈠崟鐘舵�� 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> startOrder(Order order) {
+    public ReturnT<String> startOrderReport(Order order) {
         DocType docType = docTypeService.selectById(order.getDocType());
         if (null == docType) {
             return SUCCESS;

--
Gitblit v1.9.1