From af212f68a20cfd2549a37093a7850b5a99f1a2ea Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 09:39:19 +0800
Subject: [PATCH] 逻辑调整

---
 src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java |   22 
 src/main/java/com/zy/asrs/controller/OpenController.java         |   78 ++--
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java      |  143 ++++---
 src/main/java/com/zy/common/model/TaskDto.java                   |    6 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java    |  200 +++++------
 src/main/java/com/zy/common/model/DetlDto.java                   |   82 ++-
 src/main/java/com/zy/asrs/controller/MobileController.java       |    4 
 src/main/java/com/zy/asrs/controller/OutController.java          |   10 
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java      |  494 +++++++++++++-------------
 9 files changed, 517 insertions(+), 522 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 184979b..0e0e7c6 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -425,11 +425,11 @@
     @RequestMapping("/bill/query1/auth")
     @ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
     public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
-        Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp2", billNo));
+        Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
         if (temp1 == null) {
             throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
         }
-        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
+        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
         if (waitMatins == null || waitMatins.isEmpty()) {
             throw new CoolException("璇ヨ鍗曢」涓嶅瓨鍦�");
         }
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..8ebafbe 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -83,7 +83,7 @@
         if (Cools.isEmpty(param.getOrderDetails())) {
             return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
         }
-        openService.pakinOrderCreate(param);
+        //openService.pakinOrderCreate(param);
         return R.ok();
     }
 
@@ -165,43 +165,43 @@
         }
     }
 
-    public static void main(String[] args) {
-        // 1
-        System.out.println("======================================");
-        OpenOrderPakinParam param = new OpenOrderPakinParam();
-        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
-        param.setOrderType("鎵撳寘涓婄嚎鍗�");
-        param.setOrderTime(DateUtils.convert(new Date()));
-        List<DetlDto> orderDetails = new ArrayList<>();
-        param.setOrderDetails(orderDetails);
-        for (int i = 0; i < 3; i++) {
-            DetlDto detlDto = new DetlDto();
-            switch (i) {
-                case 0:
-                    detlDto.setMatnr("MDH020030530");
-                    detlDto.setBatch("500");
-                    detlDto.setAnfme(18.0);
-                    break;
-                case 1:
-                    detlDto.setMatnr("MDH020016416");
-                    detlDto.setBatch("500");
-                    detlDto.setAnfme(32.0);
-                    break;
-                case 2:
-                    detlDto.setMatnr("LSH90152025");
-                    detlDto.setAnfme(50.0);
-                    break;
-                default:
-                    break;
-            }
-            orderDetails.add(detlDto);
-        }
-        System.out.println(JSON.toJSONString(param));
-        // 2
-        System.out.println("======================================");
-        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
-        param1.setOrderNo("963001846497017856");
-        System.out.println(JSON.toJSONString(param1));
-    }
+//    public static void main(String[] args) {
+//        // 1
+//        System.out.println("======================================");
+//        OpenOrderPakinParam param = new OpenOrderPakinParam();
+//        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
+//        param.setOrderType("鎵撳寘涓婄嚎鍗�");
+//        param.setOrderTime(DateUtils.convert(new Date()));
+//        List<DetlDto> orderDetails = new ArrayList<>();
+//        param.setOrderDetails(orderDetails);
+//        for (int i = 0; i < 3; i++) {
+//            DetlDto detlDto = new DetlDto(locDto);
+//            switch (i) {
+//                case 0:
+//                    detlDto.setMatnr("MDH020030530");
+//                    detlDto.setBatch("500");
+//                    detlDto.setAnfme(18.0);
+//                    break;
+//                case 1:
+//                    detlDto.setMatnr("MDH020016416");
+//                    detlDto.setBatch("500");
+//                    detlDto.setAnfme(32.0);
+//                    break;
+//                case 2:
+//                    detlDto.setMatnr("LSH90152025");
+//                    detlDto.setAnfme(50.0);
+//                    break;
+//                default:
+//                    break;
+//            }
+//            orderDetails.add(detlDto);
+//        }
+//        System.out.println(JSON.toJSONString(param));
+//        // 2
+//        System.out.println("======================================");
+//        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
+//        param1.setOrderNo("963001846497017856");
+//        System.out.println(JSON.toJSONString(param1));
+//    }
 
 }
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 4678cea..d4b5e93 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -78,10 +78,10 @@
         }
         List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
         List<LocDto> locDtos = new ArrayList<>();
-        orderDetls = orderDetls.stream()
-                .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
-                .collect(Collectors.toList());
-        Set<String> exist = new HashSet<>();
+//        orderDetls = orderDetls.stream()
+//                .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
+//                .collect(Collectors.toList());
+//        Set<String> exist = new HashSet<>();
 
         for (OrderDetl orderDetl : orderDetls) {
             double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
@@ -104,7 +104,7 @@
                         locDto.setProType(locDetl.getProType());
                         locDto.setSPgNO(locDetl.getSPgNO());
                         locDtos.add(locDto);
-                        exist.add(locDetl.getLocNo());
+                        //exist.add(locDetl.getLocNo());
                         // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
                         issued = issued - locDetl.getAnfme();
                     } else {
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 96cad9c..b78ee02 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -25,16 +25,16 @@
 
     private String lgort;
 
-    public static void main(String[] args) {
-        OpenOrderPakoutParam param = new OpenOrderPakoutParam();
-        param.setOrderNo("LXT12321321");
-        param.setOrderType("浜よ揣鍗�");
-        param.setOrderTime(DateUtils.convert(new Date()));
-        List<DetlDto> orderDetails = new ArrayList<>();
-        param.setOrderDetails(orderDetails);
-        DetlDto detlDto = new DetlDto("15099-10000", 3.0);
-        orderDetails.add(detlDto);
-        System.out.println(JSON.toJSONString(param));
-    }
+//    public static void main(String[] args) {
+//        OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+//        param.setOrderNo("LXT12321321");
+//        param.setOrderType("浜よ揣鍗�");
+//        param.setOrderTime(DateUtils.convert(new Date()));
+//        List<DetlDto> orderDetails = new ArrayList<>();
+//        param.setOrderDetails(orderDetails);
+//        DetlDto detlDto = new DetlDto("15099-10000", 3.0);
+//        orderDetails.add(detlDto);
+//        System.out.println(JSON.toJSONString(param));
+//    }
 
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b9b58ed..513ca4b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,26 +1,20 @@
 package com.zy.asrs.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.*;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
 import com.zy.asrs.entity.param.OffSaleParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
-import com.zy.common.CodeRes;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.entity.Parameter;
 import com.zy.common.model.DetlDto;
-import com.zy.common.model.MesCombParam;
 import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -111,108 +105,94 @@
         Date now = new Date();
 
         // 鏃犲崟缁勬墭
-        if (Cools.isEmpty(param.getOrderNo())) {
-
-            // 鐢熸垚鍏ュ簱閫氱煡妗�
-            List<DetlDto> detlDtos = new ArrayList<>();
-            param.getCombMats().forEach(elem -> {
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
-                if (DetlDto.has(detlDtos, detlDto)) {
-                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
-                    assert one != null;
-                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
-                } else {
-                    detlDtos.add(detlDto);
-                }
-            });
-
-
-            for (DetlDto detlDto : detlDtos) {
-                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-                if (Cools.isEmpty(mat)) {
-                    throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
-                }
-                WaitPakin waitPakin = new WaitPakin();
-                waitPakin.sync(mat);
-                waitPakin.setBatch(detlDto.getBatch());
-                waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
-                waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
-                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
-                waitPakin.setStatus("Y");    // 鐘舵��
-                waitPakin.setAppeUser(userId);
-                waitPakin.setAppeTime(now);
-                waitPakin.setModiUser(userId);
-                waitPakin.setModiTime(now);
-                if (!waitPakinService.insert(waitPakin)) {
-                    throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
-                }
-            }
-            // 鍏宠仈缁勬墭
-        } else {
-
-            Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
-            if (Cools.isEmpty(order) || order.getSettle() > 2) {
-                throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
-            }
-            // 鐢熸垚鍏ュ簱閫氱煡妗�
-            List<DetlDto> detlDtos = new ArrayList<>();
-            param.getCombMats().forEach(elem -> {
-
-                // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙
-                //OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getAnfme() );
-                OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
-                if (elem.getAnfme() > orderDetl.getEnableQty()) {
-                    throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
-                }
-                // 淇敼璁㈠崟浣滀笟鏁伴噺
-                if (!orderDetlService.increaseWorkQty(orderDetl, elem.getAnfme())) {
-                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-                }
-
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
-                if (DetlDto.has(detlDtos, detlDto)) {
-                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
-                    assert one != null;
-                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
-                } else {
-                    detlDtos.add(detlDto);
-                }
-            });
-            for (DetlDto detlDto : detlDtos) {
-                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-                if (Cools.isEmpty(mat)) {
-                    throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
-                }
-                WaitPakin waitPakin = new WaitPakin();
-                waitPakin.sync(mat);
-                waitPakin.setOrderNo(order.getOrderNo());   // 鍗曟嵁缂栧彿
-                waitPakin.setBatch(detlDto.getBatch());     // 搴忓垪鐮�
-                waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
-                waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
-                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
-                waitPakin.setStatus("Y");    // 鐘舵��
-                waitPakin.setAppeUser(userId);
-                waitPakin.setAppeTime(now);
-                waitPakin.setModiUser(userId);
-                waitPakin.setModiTime(now);
-                OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
-//                if (orderDetl == null) {
-//                    orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,detlDto.getAnfme());
+//        if (Cools.isEmpty(param.getOrderNo())) {
+//
+//            // 鐢熸垚鍏ュ簱閫氱煡妗�
+//            List<DetlDto> detlDtos = new ArrayList<>();
+//            param.getCombMats().forEach(elem -> {
+//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+//                if (DetlDto.has(detlDtos, detlDto)) {
+//                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+//                    assert one != null;
+//                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+//                } else {
+//                    detlDtos.add(detlDto);
 //                }
-                if (orderDetl!=null){
-                    waitPakin.setBatch(orderDetl.getBatch());
-                    waitPakin.setSPgNO(orderDetl.getSPgNO());
-                    waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
-                    waitPakin.setProType(orderDetl.getProType());
-                    waitPakin.setLuHao(orderDetl.getLuHao());
-                    waitPakin.setPacking(orderDetl.getPacking());
-                }
-                if (!waitPakinService.insert(waitPakin)) {
-                    throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
-                }
-            }
-            orderService.updateSettle(order.getId(), 2L, userId);
+//            });
+//
+//
+//            for (DetlDto detlDto : detlDtos) {
+//                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+//                if (Cools.isEmpty(mat)) {
+//                    throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
+//                }
+//                WaitPakin waitPakin = new WaitPakin();
+//                waitPakin.sync(mat);
+//                waitPakin.setBatch(detlDto.getBatch());
+//                waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
+//                waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
+//                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
+//                waitPakin.setStatus("Y");    // 鐘舵��
+//                waitPakin.setAppeUser(userId);
+//                waitPakin.setAppeTime(now);
+//                waitPakin.setModiUser(userId);
+//                waitPakin.setModiTime(now);
+//                if (!waitPakinService.insert(waitPakin)) {
+//                    throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
+//                }
+//            }
+//            // 鍏宠仈缁勬墭
+//        } else {
+
+        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
+        if (Cools.isEmpty(order) || order.getSettle() > 2) {
+            throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
         }
+        // 鐢熸垚鍏ュ簱閫氱煡妗�
+        List<DetlDto> detlDtos = new ArrayList<>();
+        param.getCombMats().forEach(elem -> {
+
+            // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙
+            //OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getAnfme() );
+            OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
+            if (elem.getAnfme() > orderDetl.getEnableQty()) {
+                throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+            }
+            // 淇敼璁㈠崟浣滀笟鏁伴噺
+            if (!orderDetlService.increaseWorkQty(orderDetl, elem.getAnfme())) {
+                throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+            }
+
+            Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+            if (Cools.isEmpty(mat)) {
+                throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
+            }
+            WaitPakin waitPakin = new WaitPakin();
+            waitPakin.sync(mat);
+            waitPakin.setOrderNo(order.getOrderNo());   // 鍗曟嵁缂栧彿
+            waitPakin.setBatch(orderDetl.getBatch());     // 搴忓垪鐮�
+            waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
+            waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
+            waitPakin.setAnfme(orderDetl.getAnfme());  // 鏁伴噺
+            waitPakin.setStatus("Y");    // 鐘舵��
+            waitPakin.setAppeUser(userId);
+            waitPakin.setAppeTime(now);
+            waitPakin.setModiUser(userId);
+            waitPakin.setModiTime(now);
+
+            waitPakin.setBatch(orderDetl.getBatch());
+            waitPakin.setSPgNO(orderDetl.getSPgNO());
+            waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
+            waitPakin.setProType(orderDetl.getProType());
+            waitPakin.setLuHao(orderDetl.getLuHao());
+            waitPakin.setPacking(orderDetl.getPacking());
+            if (!waitPakinService.insert(waitPakin)) {
+                throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
+            }
+        });
+
+        orderService.updateSettle(order.getId(), 2L, userId);
+        //  }
 
     }
 
@@ -520,7 +500,7 @@
 
         BasDevp sta = basDevpService.checkSiteStatus(staNo);
         //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
-        List<OrderDetl> pg_no = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no",orderNo));
+        List<OrderDetl> pg_no = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no", orderNo));
         Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", pg_no.get(0).getOrderNo()));
         if (order.getSettle() != 1 && order.getSettle() != 2) {
             throw new CoolException("璇ヨ鍗曞凡澶勭悊");
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 5d8970a..83d3856 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -52,266 +52,268 @@
     @Override
     @Transactional
     public void pakinOrderCreate(OpenOrderPakinParam param) {
-        Order order = orderService.selectByNo(param.getOrderNo());
-        if (!Cools.isEmpty(order)) {
-            throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
-        }
-        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
-        Date now = new Date();
-        // 鍗曟嵁涓绘。
-        order = new Order(
-                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
-                param.getOrderNo(),    // 璁㈠崟缂栧彿
-                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
-                docType.getDocId(),    // 鍗曟嵁绫诲瀷
-                null,    // 椤圭洰缂栧彿
-                null,    //
-                null,    // 璋冩嫧椤圭洰缂栧彿
-                null,    // 鍒濆绁ㄦ嵁鍙�
-                null,    // 绁ㄦ嵁鍙�
-                null,    // 瀹㈡埛缂栧彿
-                null,    // 瀹㈡埛
-                null,    // 鑱旂郴鏂瑰紡
-                null,    // 鎿嶄綔浜哄憳
-                null,    // 鍚堣閲戦
-                null,    // 浼樻儬鐜�
-                null,    // 浼樻儬閲戦
-                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
-                null,    // 瀹炰粯閲戦
-                null,    // 浠樻绫诲瀷
-                null,    // 涓氬姟鍛�
-                null,    // 缁撶畻澶╂暟
-                null,    // 閭垂鏀粯绫诲瀷
-                null,    // 閭垂
-                null,    // 浠樻鏃堕棿
-                null,    // 鍙戣揣鏃堕棿
-                null,    // 鐗╂祦鍚嶇О
-                null,    // 鐗╂祦鍗曞彿
-                1L,    // 璁㈠崟鐘舵��
-                1,    // 鐘舵��
-                9527L,    // 娣诲姞浜哄憳
-                now,    // 娣诲姞鏃堕棿
-                9527L,    // 淇敼浜哄憳
-                now,    // 淇敼鏃堕棿
-                null    // 澶囨敞
-        );
-        if (!orderService.insert(order)) {
-            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
-        }
-        // 鍗曟嵁鏄庣粏妗�
-        List<DetlDto> list = new ArrayList<>();
-        List<DetlDto> orderDetails = param.getOrderDetails();
-        for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
-            if (DetlDto.has(list, dto)) {
-                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
-                assert detlDto != null;
-                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
-            } else {
-                list.add(dto);
-            }
-        }
-        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());
-            orderDetl.setAnfme(detlDto.getAnfme());
-            orderDetl.setOrderId(order.getId());
-            orderDetl.setOrderNo(order.getOrderNo());
-            orderDetl.setCreateBy(9527L);
-            orderDetl.setCreateTime(now);
-            orderDetl.setUpdateBy(9527L);
-            orderDetl.setUpdateTime(now);
-            orderDetl.setStatus(1);
-            orderDetl.setQty(0.0D);
-            if (!orderDetlService.insert(orderDetl)) {
-                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
-            }
-        }
+//        Order order = orderService.selectByNo(param.getOrderNo());
+//        if (!Cools.isEmpty(order)) {
+//            throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+//        }
+//        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+//        Date now = new Date();
+//        // 鍗曟嵁涓绘。
+//        order = new Order(
+//                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
+//                param.getOrderNo(),    // 璁㈠崟缂栧彿
+//                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
+//                docType.getDocId(),    // 鍗曟嵁绫诲瀷
+//                null,    // 椤圭洰缂栧彿
+//                null,    //
+//                null,    // 璋冩嫧椤圭洰缂栧彿
+//                null,    // 鍒濆绁ㄦ嵁鍙�
+//                null,    // 绁ㄦ嵁鍙�
+//                null,    // 瀹㈡埛缂栧彿
+//                null,    // 瀹㈡埛
+//                null,    // 鑱旂郴鏂瑰紡
+//                null,    // 鎿嶄綔浜哄憳
+//                null,    // 鍚堣閲戦
+//                null,    // 浼樻儬鐜�
+//                null,    // 浼樻儬閲戦
+//                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
+//                null,    // 瀹炰粯閲戦
+//                null,    // 浠樻绫诲瀷
+//                null,    // 涓氬姟鍛�
+//                null,    // 缁撶畻澶╂暟
+//                null,    // 閭垂鏀粯绫诲瀷
+//                null,    // 閭垂
+//                null,    // 浠樻鏃堕棿
+//                null,    // 鍙戣揣鏃堕棿
+//                null,    // 鐗╂祦鍚嶇О
+//                null,    // 鐗╂祦鍗曞彿
+//                1L,    // 璁㈠崟鐘舵��
+//                1,    // 鐘舵��
+//                9527L,    // 娣诲姞浜哄憳
+//                now,    // 娣诲姞鏃堕棿
+//                9527L,    // 淇敼浜哄憳
+//                now,    // 淇敼鏃堕棿
+//                null    // 澶囨敞
+//        );
+//        if (!orderService.insert(order)) {
+//            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
+//        }
+//        // 鍗曟嵁鏄庣粏妗�
+//        List<DetlDto> list = new ArrayList<>();
+//        List<DetlDto> orderDetails = param.getOrderDetails();
+//        for (DetlDto detail : orderDetails) {
+//            DetlDto dto = new DetlDto(detail);
+//            if (DetlDto.has(list, dto)) {
+//                DetlDto detlDto = DetlDto.find(list, dto);
+//                assert detlDto != null;
+//                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+//            } else {
+//                list.add(dto);
+//            }
+//        }
+//        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());
+//            orderDetl.setAnfme(detlDto.getAnfme());
+//            orderDetl.setOrderId(order.getId());
+//            orderDetl.setOrderNo(order.getOrderNo());
+//            orderDetl.setCreateBy(9527L);
+//            orderDetl.setCreateTime(now);
+//            orderDetl.setUpdateBy(9527L);
+//            orderDetl.setUpdateTime(now);
+//            orderDetl.setStatus(1);
+//            orderDetl.setQty(0.0D);
+//            if (!orderDetlService.insert(orderDetl)) {
+//                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+//            }
+//        }
     }
 
     @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;
+//        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;
+        return null;
     }
 
     @Override
     @Transactional
     public void pakoutOrderCreate(OpenOrderPakoutParam param) {
-        Order order = orderService.selectByNo(param.getOrderNo());
-        // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
-        if (!Cools.isEmpty(order)) {
-            if (order.getSettle() > 1L) {
-                throw new CoolException(param.getOrderNo() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
-            }
-            orderService.remove(order.getId());
-        }
-        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
-        Date now = new Date();
-        // 鍗曟嵁涓绘。
-        order = new Order(
-                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
-                param.getOrderNo(),    // 璁㈠崟缂栧彿
-                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
-                docType.getDocId(),    // 鍗曟嵁绫诲瀷
-                null,    // 椤圭洰缂栧彿
-                null,    //
-                null,    // 璋冩嫧椤圭洰缂栧彿
-                null,    // 鍒濆绁ㄦ嵁鍙�
-                null,    // 绁ㄦ嵁鍙�
-                null,    // 瀹㈡埛缂栧彿
-                null,    // 瀹㈡埛
-                null,    // 鑱旂郴鏂瑰紡
-                null,    // 鎿嶄綔浜哄憳
-                null,    // 鍚堣閲戦
-                null,    // 浼樻儬鐜�
-                null,    // 浼樻儬閲戦
-                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
-                null,    // 瀹炰粯閲戦
-                null,    // 浠樻绫诲瀷
-                null,    // 涓氬姟鍛�
-                null,    // 缁撶畻澶╂暟
-                null,    // 閭垂鏀粯绫诲瀷
-                null,    // 閭垂
-                null,    // 浠樻鏃堕棿
-                null,    // 鍙戣揣鏃堕棿
-                null,    // 鐗╂祦鍚嶇О
-                null,    // 鐗╂祦鍗曞彿
-                1L,    // 璁㈠崟鐘舵��
-                1,    // 鐘舵��
-                9527L,    // 娣诲姞浜哄憳
-                now,    // 娣诲姞鏃堕棿
-                9527L,    // 淇敼浜哄憳
-                now,    // 淇敼鏃堕棿
-                null    // 澶囨敞
-        );
-        if (!orderService.insert(order)) {
-            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
-        }
-        // 鍗曟嵁鏄庣粏妗�
-        List<DetlDto> list = new ArrayList<>();
-        List<DetlDto> orderDetails = param.getOrderDetails();
-        for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
-            if (DetlDto.has(list, dto)) {
-                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
-                assert detlDto != null;
-                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
-            } else {
-                list.add(dto);
-            }
-        }
-        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());
-            orderDetl.setAnfme(detlDto.getAnfme());
-            orderDetl.setOrderId(order.getId());
-            orderDetl.setOrderNo(order.getOrderNo());
-            orderDetl.setCreateBy(9527L);
-            orderDetl.setCreateTime(now);
-            orderDetl.setUpdateBy(9527L);
-            orderDetl.setUpdateTime(now);
-            orderDetl.setStatus(1);
-            orderDetl.setQty(0.0D);
-            if (!orderDetlService.insert(orderDetl)) {
-                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
-            }
-        }
+//        Order order = orderService.selectByNo(param.getOrderNo());
+//        // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
+//        if (!Cools.isEmpty(order)) {
+//            if (order.getSettle() > 1L) {
+//                throw new CoolException(param.getOrderNo() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+//            }
+//            orderService.remove(order.getId());
+//        }
+//        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+//        Date now = new Date();
+//        // 鍗曟嵁涓绘。
+//        order = new Order(
+//                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
+//                param.getOrderNo(),    // 璁㈠崟缂栧彿
+//                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
+//                docType.getDocId(),    // 鍗曟嵁绫诲瀷
+//                null,    // 椤圭洰缂栧彿
+//                null,    //
+//                null,    // 璋冩嫧椤圭洰缂栧彿
+//                null,    // 鍒濆绁ㄦ嵁鍙�
+//                null,    // 绁ㄦ嵁鍙�
+//                null,    // 瀹㈡埛缂栧彿
+//                null,    // 瀹㈡埛
+//                null,    // 鑱旂郴鏂瑰紡
+//                null,    // 鎿嶄綔浜哄憳
+//                null,    // 鍚堣閲戦
+//                null,    // 浼樻儬鐜�
+//                null,    // 浼樻儬閲戦
+//                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
+//                null,    // 瀹炰粯閲戦
+//                null,    // 浠樻绫诲瀷
+//                null,    // 涓氬姟鍛�
+//                null,    // 缁撶畻澶╂暟
+//                null,    // 閭垂鏀粯绫诲瀷
+//                null,    // 閭垂
+//                null,    // 浠樻鏃堕棿
+//                null,    // 鍙戣揣鏃堕棿
+//                null,    // 鐗╂祦鍚嶇О
+//                null,    // 鐗╂祦鍗曞彿
+//                1L,    // 璁㈠崟鐘舵��
+//                1,    // 鐘舵��
+//                9527L,    // 娣诲姞浜哄憳
+//                now,    // 娣诲姞鏃堕棿
+//                9527L,    // 淇敼浜哄憳
+//                now,    // 淇敼鏃堕棿
+//                null    // 澶囨敞
+//        );
+//        if (!orderService.insert(order)) {
+//            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
+//        }
+//        // 鍗曟嵁鏄庣粏妗�
+//        List<DetlDto> list = new ArrayList<>();
+//        List<DetlDto> orderDetails = param.getOrderDetails();
+//        for (DetlDto detail : orderDetails) {
+//            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+//            if (DetlDto.has(list, dto)) {
+//                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+//                assert detlDto != null;
+//                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+//            } else {
+//                list.add(dto);
+//            }
+//        }
+//        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());
+//            orderDetl.setAnfme(detlDto.getAnfme());
+//            orderDetl.setOrderId(order.getId());
+//            orderDetl.setOrderNo(order.getOrderNo());
+//            orderDetl.setCreateBy(9527L);
+//            orderDetl.setCreateTime(now);
+//            orderDetl.setUpdateBy(9527L);
+//            orderDetl.setUpdateTime(now);
+//            orderDetl.setStatus(1);
+//            orderDetl.setQty(0.0D);
+//            if (!orderDetlService.insert(orderDetl)) {
+//                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+//            }
+//        }
     }
 
     @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;
+//        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;
+        return null;
     }
 
     @Override
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 462238e..7b453a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -82,77 +82,78 @@
     @Transactional
     public String startupFullPutStore(FullStoreParam param, Long userId) {
         // 鍙傛暟闈炵┖鍒ゆ柇
-        if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
-            throw new CoolException(BaseRes.PARAM);
-        }
-        Date now = new Date();
-        // 婧愮珯鐐圭姸鎬佹娴�
-        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
-        // 妫�绱㈠簱浣�
-        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
-        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs.get(0), batchs.get(0), null, locTypeDto);
-        // 鐢熸垚宸ヤ綔鍙�
-        int workNo = dto.getWorkNo();
-        // 鐢熸垚宸ヤ綔妗�
-        WrkMast wrkMast = new WrkMast();
-        wrkMast.setWrkNo(workNo);
-        wrkMast.setIoTime(now);
-        wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
-        wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
-        wrkMast.setIoPri(13D); // 浼樺厛绾э細13
-        wrkMast.setCrnNo(dto.getCrnNo());
-        wrkMast.setSourceStaNo(dto.getSourceStaNo());
-        wrkMast.setStaNo(dto.getStaNo());
-        wrkMast.setLocNo(dto.getLocNo());
-        wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
-        wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-        wrkMast.setPicking("N"); // 鎷f枡
-        wrkMast.setExitMk("N"); // 閫�鍑�
-        wrkMast.setEmptyMk("N"); // 绌烘澘
-        wrkMast.setLinkMis("N");
-        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
-        wrkMast.setAppeUser(userId);
-        wrkMast.setAppeTime(now);
-        wrkMast.setModiUser(userId);
-        wrkMast.setModiTime(now);
-        if (!wrkMastService.insert(wrkMast)) {
-            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
-        }
-        // 鐢熸垚宸ヤ綔妗f槑缁�
-        List<DetlDto> detlDtos = new ArrayList<>();
-        param.getList().forEach(elem -> {
-            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
-            if (DetlDto.has(detlDtos, detlDto)) {
-                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
-                assert detlDto1 != null;
-                detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
-            } else {
-                detlDtos.add(detlDto);
-            }
-        });
-        wrkDetlService.createWorkDetail(workNo, detlDtos, param.getBarcode(), userId, now);
-        // 鏇存柊婧愮珯鐐逛俊鎭�
-        sourceStaNo.setWrkNo(workNo);
-        sourceStaNo.setModiUser(userId);
-        sourceStaNo.setModiTime(now);
-        if (!basDevpService.updateById(sourceStaNo)) {
-            throw new CoolException("鏇存柊婧愮珯澶辫触");
-        }
-        // 鏇存柊鐩爣搴撲綅鐘舵��
-        LocMast locMast = locMastService.selectById(dto.getLocNo());
-        if (locMast.getLocSts().equals("O")) {
-            locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
-            locMast.setModiUser(userId);
-            locMast.setModiTime(now);
-            if (!locMastService.updateById(locMast)) {
-                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-            }
-        } else {
-            throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
-        }
-        return dto.getLocNo();
+//        if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
+//            throw new CoolException(BaseRes.PARAM);
+//        }
+//        Date now = new Date();
+//        // 婧愮珯鐐圭姸鎬佹娴�
+//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
+//        // 妫�绱㈠簱浣�
+//        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+//        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
+//        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
+//        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs.get(0), batchs.get(0), null, locTypeDto);
+//        // 鐢熸垚宸ヤ綔鍙�
+//        int workNo = dto.getWorkNo();
+//        // 鐢熸垚宸ヤ綔妗�
+//        WrkMast wrkMast = new WrkMast();
+//        wrkMast.setWrkNo(workNo);
+//        wrkMast.setIoTime(now);
+//        wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+//        wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+//        wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+//        wrkMast.setCrnNo(dto.getCrnNo());
+//        wrkMast.setSourceStaNo(dto.getSourceStaNo());
+//        wrkMast.setStaNo(dto.getStaNo());
+//        wrkMast.setLocNo(dto.getLocNo());
+//        wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+//        wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+//        wrkMast.setPicking("N"); // 鎷f枡
+//        wrkMast.setExitMk("N"); // 閫�鍑�
+//        wrkMast.setEmptyMk("N"); // 绌烘澘
+//        wrkMast.setLinkMis("N");
+//        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+//        wrkMast.setAppeUser(userId);
+//        wrkMast.setAppeTime(now);
+//        wrkMast.setModiUser(userId);
+//        wrkMast.setModiTime(now);
+//        if (!wrkMastService.insert(wrkMast)) {
+//            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+//        }
+//        // 鐢熸垚宸ヤ綔妗f槑缁�
+//        List<DetlDto> detlDtos = new ArrayList<>();
+//        param.getList().forEach(elem -> {
+//            DetlDto detlDto = new DetlDto(elem);
+//            if (DetlDto.has(detlDtos, detlDto)) {
+//                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+//                assert detlDto1 != null;
+//                detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
+//            } else {
+//                detlDtos.add(detlDto);
+//            }
+//        });
+//        wrkDetlService.createWorkDetail(workNo, detlDtos, param.getBarcode(), userId, now);
+//        // 鏇存柊婧愮珯鐐逛俊鎭�
+//        sourceStaNo.setWrkNo(workNo);
+//        sourceStaNo.setModiUser(userId);
+//        sourceStaNo.setModiTime(now);
+//        if (!basDevpService.updateById(sourceStaNo)) {
+//            throw new CoolException("鏇存柊婧愮珯澶辫触");
+//        }
+//        // 鏇存柊鐩爣搴撲綅鐘舵��
+//        LocMast locMast = locMastService.selectById(dto.getLocNo());
+//        if (locMast.getLocSts().equals("O")) {
+//            locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+//            locMast.setModiUser(userId);
+//            locMast.setModiTime(now);
+//            if (!locMastService.updateById(locMast)) {
+//                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+//            }
+//        } else {
+//            throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+//        }
+//        return dto.getLocNo();
+        return null;
     }
 
     @Override
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..f416898 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -2,6 +2,8 @@
 
 import com.core.common.Cools;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.utils.MatCompareUtils;
 import lombok.Data;
 
 import java.util.List;
@@ -21,64 +23,74 @@
 
     private Double anfme;
 
-    public DetlDto() {
+    private String sPgNO;
+
+    private String outOrderNo;
+
+    private String luHao;
+
+    private String packing;
+
+    private String proType;
+
+
+    public DetlDto(LocDto locDto) {
+        this.matnr = locDto.getMatnr();
+        this.batch = locDto.getBatch();
+        this.sPgNO = locDto.getSPgNO();
+        this.outOrderNo = locDto.getOutOrderNo();
+        this.luHao = locDto.getLuHao();
+        this.packing = locDto.getPacking();
+        this.proType = locDto.getProType();
+        this.orderNo = locDto.getOrderNo();
+        this.anfme = locDto.getAnfme();
+
     }
 
-    public DetlDto(String matnr, Double anfme) {
-        this.matnr = matnr;
-        this.anfme = anfme;
-    }
 
-    public DetlDto(String matnr, String batch) {
-        this.matnr = matnr;
-        this.batch = batch;
-    }
 
-    public DetlDto(String matnr, String batch, Double anfme) {
-        this.matnr = matnr;
-        this.batch = batch;
-        this.anfme = anfme;
-    }
-
-    public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
-        this.orderNo = orderNo;
-        this.matnr = matnr;
-        this.batch = batch;
-        this.anfme = anfme;
-    }
 
     public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
         for (DetlDto dto : detlDtos) {
-            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
-                if (dto.getMatnr().equals(orderDetl.getMatnr())) {
-                    return true;
-                }
-            } else {
-                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
-                    if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
-                        return true;
-                    }
-                }
+            boolean compare = MatCompareUtils.compare(dto, orderDetl);
+            if (compare) {
+                return true;
             }
+//            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
+//                if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+//                    return true;
+//                }
+//            } else {
+//                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
+//                    if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+//                        return true;
+//                    }
+//                }
+//            }
         }
         return false;
     }
 
     public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
         for (DetlDto dto : detlDtos) {
-            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+            boolean compare = MatCompareUtils.compare(dto, detlDto);
+            if (compare) {
                 return true;
             }
+//            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+//                return true;
+//            }
         }
         return false;
     }
 
-    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
-        if (Cools.isEmpty(matnr)) {
+    public static DetlDto find(List<DetlDto> detlDtos, LocDto locDto) {
+        if (Cools.isEmpty(locDto)) {
             return null;
         }
         for (DetlDto detlDto : detlDtos) {
-            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
+            boolean compare = MatCompareUtils.compare(detlDto, locDto);
+            if (compare) {
                 return detlDto;
             }
         }
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 4ba8064..286ab79 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -71,13 +71,13 @@
         // 姹囨�讳笉鑰冭檻搴忓垪鐮�
         List<DetlDto> detlDtos = new ArrayList<>();
         for (LocDto locDto : this.getLocDtos()) {
-            DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
+            DetlDto dto = new DetlDto(locDto);
             if (DetlDto.has(detlDtos, dto)) {
-                DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch());
+                DetlDto detlDto = DetlDto.find(detlDtos, locDto);
                 assert detlDto != null;
                 detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
             } else {
-                detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme()));
+                detlDtos.add(new DetlDto(locDto));
             }
         }
 

--
Gitblit v1.9.1