From ef106c9a6002872892de9db355ef7cd37512dba5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 12 一月 2024 10:10:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |  236 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 133 insertions(+), 103 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7b91bcb..f4ed538 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,19 +1,25 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.InOutCountDto;
 import com.zy.asrs.entity.result.OpenOrderCompeteResult;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.TagMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.model.DetlDto;
 import com.zy.common.utils.NodeUtils;
+import com.zy.common.utils.Synchro;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +54,14 @@
     private TagService tagService;
     @Autowired
     private TagMapper tagMapper;
+    @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
+    private NodeService nodeService;
+    @Autowired
+    private ManLocDetlService manLocDetlService;
+    @Autowired
+    private MatV2Service matV2Service;
 
     @Override
     @Transactional
@@ -113,16 +127,21 @@
         }
         for (DetlDto detlDto : list) {
             Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-            if (Cools.isEmpty(mat)) {
-                throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
-            }
             OrderDetl orderDetl = new OrderDetl();
-            orderDetl.sync(mat);
+            if (Cools.isEmpty(mat)) {
+                MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+                if(Cools.isEmpty(matV2)){
+                    throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+                }
+                orderDetl.sync(matV2);
+            } else {
+                orderDetl.sync(mat);
+            }
 
             //鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
             if (detlDto.getBatch() == null) {
                 orderDetl.setBatch("");
-            }else {
+            } else {
                 orderDetl.setBatch(detlDto.getBatch());
 
             }
@@ -141,51 +160,51 @@
         }
     }
 
-    @Override
-    @Transactional
-    public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
-        List<OpenOrderCompeteResult> results = new ArrayList<>();
-        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
-            // 鎸囧畾璁㈠崟
-            Order order = orderService.selectByNo(param.getOrderNo());
-            if (null != order) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                if (order.getSettle() == 4L) {
-                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                    }
-                }
-            }
-        } else {
-            // 鎵�鏈夎鍗�
-            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-            for (Order order : orders) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
-            }
-        }
-        return results;
-    }
+//    @Override
+//    @Transactional
+//    public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
+//        List<OpenOrderCompeteResult> results = new ArrayList<>();
+//        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+//            // 鎸囧畾璁㈠崟
+//            Order order = orderService.selectByNo(param.getOrderNo());
+//            if (null != order) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                if (order.getSettle() == 4L) {
+//                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                    }
+//                }
+//            }
+//        } else {
+//            // 鎵�鏈夎鍗�
+//            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+//            for (Order order : orders) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                }
+//            }
+//        }
+//        return results;
+//    }
 
     @Override
     @Transactional
@@ -255,12 +274,17 @@
         }
         for (DetlDto detlDto : list) {
             Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-            if (Cools.isEmpty(mat)) {
-                throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
-            }
             OrderDetl orderDetl = new OrderDetl();
-            orderDetl.sync(mat);
-            orderDetl.setBatch(detlDto.getBatch());
+            if (Cools.isEmpty(mat)) {
+                MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+                if(Cools.isEmpty(matV2)){
+                    throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+                }
+                orderDetl.sync(matV2);
+            } else {
+                orderDetl.sync(mat);
+            }
+            orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
             orderDetl.setAnfme(detlDto.getAnfme());
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
@@ -276,50 +300,50 @@
         }
     }
 
-    @Override
-    public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
-        List<OpenOrderCompeteResult> results = new ArrayList<>();
-        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
-            // 鎸囧畾璁㈠崟
-            Order order = orderService.selectByNo(param.getOrderNo());
-            if (null != order) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                if (order.getSettle() == 4L) {
-                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                    }
-                }
-            }
-        } else {
-            // 鎵�鏈夎鍗�
-            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-            for (Order order : orders) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
-            }
-        }
-        return results;
-    }
+//    @Override
+//    public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
+//        List<OpenOrderCompeteResult> results = new ArrayList<>();
+//        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+//            // 鎸囧畾璁㈠崟
+//            Order order = orderService.selectByNo(param.getOrderNo());
+//            if (null != order) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                if (order.getSettle() == 4L) {
+//                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                    }
+//                }
+//            }
+//        } else {
+//            // 鎵�鏈夎鍗�
+//            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+//            for (Order order : orders) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                }
+//            }
+//        }
+//        return results;
+//    }
 
     @Override
     @Transactional
@@ -445,12 +469,12 @@
     @Override
     @Transactional
     public void syncMat(MatSyncParam param) {
-        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
             throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
         }
 
-        for(MatSyncParam.MatParam matParam : param.getMatDetails()){
-            if(Cools.isEmpty(matParam.getMatnr())){
+        for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+            if (Cools.isEmpty(matParam.getMatnr())) {
                 throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
             }
 
@@ -543,7 +567,7 @@
                 }
             } else {
                 mat.sync(param);
-                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
                     throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
                 }
             }
@@ -551,4 +575,10 @@
 
     }
 
+    @Override
+    public R getInOutDetl() {
+        List<InOutCountDto> top100 = wrkMastService.selectTop100();
+        return R.ok().add(top100);
+    }
+
 }

--
Gitblit v1.9.1