From d2b0cd7ae27bb7ea24549d6930a53cbb27c6e44a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 08 三月 2026 19:55:34 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |  229 ++++++++++++++++++++++----------------------------------
 1 files changed, 90 insertions(+), 139 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 2b7dac5..36e9da3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,7 +3,6 @@
 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.*;
@@ -15,7 +14,6 @@
 import com.zy.asrs.mapper.TagMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.common.model.DetlDto;
 import com.zy.common.utils.NodeUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +21,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -55,8 +52,8 @@
     private TagMapper tagMapper;
     @Autowired
     private CheckOrderDetlService checkOrderDetlService;
-    @Autowired
-    private CheckOrderService checkOrderService;
+
+
 
     @Override
     @Transactional
@@ -102,8 +99,7 @@
                 now,    // 娣诲姞鏃堕棿
                 9527L,    // 淇敼浜哄憳
                 now,    // 淇敼鏃堕棿
-                null,   // 澶囨敞
-                1
+                null    // 澶囨敞
         );
         if (!orderService.insert(order)) {
             throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
@@ -112,9 +108,9 @@
         List<DetlDto> list = new ArrayList<>();
         List<DetlDto> orderDetails = param.getOrderDetails();
         for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
-            if (DetlDto.hasLineNumber(list, dto)) {
-                DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+            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 {
@@ -128,13 +124,8 @@
             }
             OrderDetl orderDetl = new OrderDetl();
             orderDetl.sync(mat);
-            orderDetl.setLineNumber(detlDto.getLineNumber());
             orderDetl.setBatch(detlDto.getBatch());
             orderDetl.setAnfme(detlDto.getAnfme());
-            orderDetl.setBrand(detlDto.getBrand());
-            orderDetl.setStandby1(detlDto.getStandby1());
-            orderDetl.setStandby2(detlDto.getStandby2());
-            orderDetl.setStandby3(detlDto.getStandby3());
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
             orderDetl.setCreateBy(9527L);
@@ -143,7 +134,6 @@
             orderDetl.setUpdateTime(now);
             orderDetl.setStatus(1);
             orderDetl.setQty(0.0D);
-            orderDetl.setPakinPakoutStatus(1);
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
@@ -157,9 +147,6 @@
         if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
             // 鎸囧畾璁㈠崟
             Order order = orderService.selectByNo(param.getOrderNo());
-
-//            Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,param.getOrderNo());
-
             if (null != order) {
                 OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                 results.add(result);
@@ -167,27 +154,19 @@
                 result.setOrderTime(order.getOrderTime());
                 result.setOrderType(order.getDocType$());
                 List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-//                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
                 for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
-                            orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
-                            orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
+                    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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-//                    }
-                    OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                    }
                 }
             }
         } else {
             // 鎵�鏈夎鍗�
-//            List<Order> orders = orderService.selectBySettle(4L);
-            List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
-            if (orders.isEmpty()){
-                orders = new ArrayList<>();
-            }
+            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
             for (Order order : orders) {
                 OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                 results.add(result);
@@ -195,20 +174,13 @@
                 result.setOrderTime(order.getOrderTime());
                 result.setOrderType(order.getDocType$());
                 List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-//                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
-
                 for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
-                            orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
-                            orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
-                            orderDetl.getQty(), orderDetl.getThreeCode()));
+                    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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-//                }
-                OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
-
+                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                }
             }
         }
         return results;
@@ -262,8 +234,7 @@
                 now,    // 娣诲姞鏃堕棿
                 9527L,    // 淇敼浜哄憳
                 now,    // 淇敼鏃堕棿
-                null,    // 澶囨敞
-                2
+                null    // 澶囨敞
         );
         if (!orderService.insert(order)) {
             throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
@@ -272,11 +243,9 @@
         List<DetlDto> list = new ArrayList<>();
         List<DetlDto> orderDetails = param.getOrderDetails();
         for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
-                    detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
-            if (DetlDto.hasLineNumber(list, dto)) {
-                DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
-                        dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+            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 {
@@ -290,13 +259,8 @@
             }
             OrderDetl orderDetl = new OrderDetl();
             orderDetl.sync(mat);
-            orderDetl.setLineNumber(detlDto.getLineNumber());
             orderDetl.setBatch(detlDto.getBatch());
             orderDetl.setAnfme(detlDto.getAnfme());
-            orderDetl.setBrand(detlDto.getBrand());
-            orderDetl.setStandby1(detlDto.getStandby1());
-            orderDetl.setStandby2(detlDto.getStandby2());
-            orderDetl.setStandby3(detlDto.getStandby3());
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
             orderDetl.setCreateBy(9527L);
@@ -305,7 +269,6 @@
             orderDetl.setUpdateTime(now);
             orderDetl.setStatus(1);
             orderDetl.setQty(0.0D);
-            orderDetl.setPakinPakoutStatus(2);
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
@@ -318,7 +281,6 @@
         if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
             // 鎸囧畾璁㈠崟
             Order order = orderService.selectByNo(param.getOrderNo());
-//            Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
             if (null != order) {
                 OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                 results.add(result);
@@ -326,24 +288,19 @@
                 result.setOrderTime(order.getOrderTime());
                 result.setOrderType(order.getDocType$());
                 List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-//                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
                 for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
-                            orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
-                            orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
+                    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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-//                    }
-                    OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                    }
                 }
             }
         } else {
             // 鎵�鏈夎鍗�
-//            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-            List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
+            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
             for (Order order : orders) {
                 OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                 results.add(result);
@@ -351,17 +308,13 @@
                 result.setOrderTime(order.getOrderTime());
                 result.setOrderType(order.getDocType$());
                 List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-//                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
                 for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
-                            orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
-                            orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
+                    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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-//                }
-                OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                }
             }
         }
         return results;
@@ -473,7 +426,6 @@
                 tagId = tagService.getTop().getId();
             }
             mat.setTagId(tagId);
-            mat.setLocType(tagId);
             mat.setMatnr(analyse.getMatnr());
             mat.setMaktx(param.getMaterialName());
             mat.setSpecs(param.getConfigureDesc());
@@ -485,6 +437,65 @@
                 throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
             } else {
                 log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+            }
+        }
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void adjustmentOrderCreate(OpenAdjustmentOrderParam param) {
+        if(Cools.isEmpty(param.getOrderNo())){
+            String prefix = "";
+            DocType docType = docTypeService.selectById(param.getOrderNo());
+            if(!Cools.isEmpty(docType)){
+                prefix = "Adjust";
+            }
+            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+        }
+        CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", param.getOrderNo()) );
+        if (checkOrder != null) {
+            throw new CoolException("鍗曟嵁宸插瓨鍦�");
+        }
+        Date now = new Date();
+        checkOrder = new CheckOrder();
+        checkOrder.setOrderNo(param.getOrderNo());
+        checkOrder.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+        checkOrder.setOrderTime( DateUtils.convert(now));
+        checkOrder.setDocType(Long.valueOf(OrderTypeEnum.ADJUSTMENT.type));
+        checkOrder.setSettle(1L);
+        checkOrder.setCreateBy(9527L);
+        checkOrder.setCreateTime(now);
+        checkOrder.setUpdateBy(9527L);
+        checkOrder.setUpdateTime(now);
+        checkOrder.setStatus(1);
+
+        if (!checkOrderService.insert(checkOrder)) {
+            throw new CoolException("淇濆瓨璋冩暣鍗曚富鍗曞け璐�");
+        }
+        for (CheckOrderDetl checkOrderDetl1 : param.getOrderDetails()) {
+            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+                    .eq("matnr", checkOrderDetl1.getMatnr())
+                    .eq("loc_no", checkOrderDetl1.getLocNo())
+                    .eq("batch", checkOrderDetl1.getBatch())
+            );
+            if (Cools.isEmpty(locDetl)) {
+                throw new CoolException("鏈壘鍒板簱瀛樻槑缁�,璇锋鏌ュ簱瀛�");
+            }
+            CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
+            checkOrderDetl.sync(locDetl);
+            checkOrderDetl.setLocDetlId(locDetl.getId());
+            checkOrderDetl.setOrderId(checkOrder.getId());
+            checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
+            checkOrderDetl.setAnfme(checkOrderDetl1.getAnfme());
+            checkOrderDetl.setDiffQty(checkOrderDetl1.getDiffQty());
+            checkOrderDetl.setWorkQty(checkOrderDetl1.getWorkQty());
+            checkOrderDetl.setStatus(checkOrderDetl1.getStatus().equals(1)? CheckStatusEnum.ALLOW.type:CheckStatusEnum.FORBID.type);
+            checkOrderDetl.setZpallet(locDetl.getZpallet());
+            checkOrderDetl.setCreateTime(now);
+            checkOrderDetl.setUpdateTime(now);
+            if (!checkOrderDetlService.insert(checkOrderDetl)) {
+                throw new CoolException("淇濆瓨璋冩暣鍗曟槑缁嗗け璐�");
             }
         }
     }
@@ -573,14 +584,13 @@
                 } else {
                     tagId = tagService.getTop().getId();
                 }
-                mat.sync(matParam);
+                mat.sync(param);
 //            mat.setMatnr(param.getMatnr());
 //            mat.setMaktx(param.getMaktx());
 //            mat.setSpecs(param.getSpecs());
 //            mat.setModel(param.getModel());
 
                 mat.setTagId(tagId);
-                mat.setLocType(tagId);
                 mat.setStatus(1);
                 mat.setCreateTime(now);
                 mat.setUpdateTime(now);
@@ -590,69 +600,10 @@
                     log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
                 }
             } else {
-                mat.sync(matParam);
+                mat.sync(param);
                 if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
                     throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
                 }
-            }
-        }
-
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void adjustmentOrderCreate(OpenAdjustmentOrderParam param) {
-        if(Cools.isEmpty(param.getOrderNo())){
-            String prefix = "";
-            DocType docType = docTypeService.selectById(param.getOrderNo());
-            if(!Cools.isEmpty(docType)){
-                prefix = "Adjust";
-            }
-            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
-        }
-        CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", param.getOrderNo()) );
-        if (checkOrder != null) {
-            throw new CoolException("鍗曟嵁宸插瓨鍦�");
-        }
-        Date now = new Date();
-        checkOrder = new CheckOrder();
-        checkOrder.setOrderNo(param.getOrderNo());
-        checkOrder.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
-        checkOrder.setOrderTime( DateUtils.convert(now));
-        checkOrder.setDocType(Long.valueOf(OrderTypeEnum.ADJUSTMENT.type));
-        checkOrder.setSettle(1L);
-        checkOrder.setCreateBy(9527L);
-        checkOrder.setCreateTime(now);
-        checkOrder.setUpdateBy(9527L);
-        checkOrder.setUpdateTime(now);
-        checkOrder.setStatus(1);
-
-        if (!checkOrderService.insert(checkOrder)) {
-            throw new CoolException("淇濆瓨璋冩暣鍗曚富鍗曞け璐�");
-        }
-        for (CheckOrderDetl checkOrderDetl1 : param.getOrderDetails()) {
-            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
-                    .eq("matnr", checkOrderDetl1.getMatnr())
-                    .eq("loc_no", checkOrderDetl1.getLocNo())
-                    .eq("batch", checkOrderDetl1.getBatch())
-            );
-            if (Cools.isEmpty(locDetl)) {
-                throw new CoolException("鏈壘鍒板簱瀛樻槑缁�,璇锋鏌ュ簱瀛�");
-            }
-            CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
-            checkOrderDetl.sync(locDetl);
-            checkOrderDetl.setLocDetlId(locDetl.getId());
-            checkOrderDetl.setOrderId(checkOrder.getId());
-            checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
-            checkOrderDetl.setAnfme(checkOrderDetl1.getAnfme());
-            checkOrderDetl.setDiffQty(checkOrderDetl1.getDiffQty());
-            checkOrderDetl.setWorkQty(checkOrderDetl1.getWorkQty());
-            checkOrderDetl.setStatus(checkOrderDetl1.getStatus().equals(1)?CheckStatusEnum.ALLOW.type:CheckStatusEnum.FORBID.type);
-            checkOrderDetl.setZpallet(locDetl.getZpallet());
-            checkOrderDetl.setCreateTime(now);
-            checkOrderDetl.setUpdateTime(now);
-            if (!checkOrderDetlService.insert(checkOrderDetl)) {
-                throw new CoolException("淇濆瓨璋冩暣鍗曟槑缁嗗け璐�");
             }
         }
 

--
Gitblit v1.9.1