From f972013eb3be00b09091ddc5358b31bbc27e0d5f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 26 四月 2024 10:28:36 +0800
Subject: [PATCH] ERP物料同步,单据同步

---
 src/main/java/com/zy/asrs/service/OrderService.java               |    2 
 src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java  |   47 ++++---
 src/main/java/com/zy/asrs/service/OrderCheckService.java          |    2 
 src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java |  104 ++++++++---------
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java      |  109 ++++++++---------
 src/main/java/com/zy/asrs/controller/OpenController.java          |    7 
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java       |   58 ++++-----
 7 files changed, 164 insertions(+), 165 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3b86a9c..3ae0e59 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -95,13 +95,13 @@
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        if (Cools.isEmpty(param.getOrderNo())) {
+        if (Cools.isEmpty(param.getCCode())) {
             return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderType())) {
+        if (Cools.isEmpty(param.getType())) {
             return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderDetails())) {
+        if (Cools.isEmpty(param.getADDBody())) {
             return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
         }
         openService.pakoutOrderCreate(param);
@@ -181,4 +181,5 @@
         System.out.println(JSON.toJSONString(param1));
     }
 
+
 }
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 5b9ce6d..19021f5 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -1,39 +1,48 @@
 package com.zy.asrs.entity.param;
 
-import com.alibaba.fastjson.JSON;
-import com.core.common.DateUtils;
-import com.zy.common.model.DetlDto;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
- * Created by vincent on 2022/4/8
+ * 娴疯灏擴8鍑哄簱鍗曞悓姝ュ弬鏁�
  */
 @Data
 public class OpenOrderPakoutParam {
 
-    private String orderNo;
+    //鍏ュ簱鍗曞彿
+    private String cCode;
 
-    private String orderType;
+    //鍗曟嵁鏃ユ湡
+    private Date dDate;
 
-    private String orderTime;
+    //绫诲瀷
+    private String type;
 
-    private List<DetlDto> orderDetails;
+    //鍒跺崟浜�
+    private String cMaker;
 
+    //鍏徃
+    private String cAccount;
 
-    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));
+    //澶囨敞
+    private String cMemo;
+
+    private List<Body> ADDBody;
+
+    //private List<DetlDto> orderDetails;
+
+    @Data
+    public static class Body{
+        //瀛樿揣缂栫爜
+        private String cInvCode;
+        //鏁伴噺
+        private Double iQuantity;
+        //鎵瑰彿
+        private String cBatch;
+        //琛屽娉�
+        private String cbMemo;
     }
 
 }
diff --git a/src/main/java/com/zy/asrs/service/OrderCheckService.java b/src/main/java/com/zy/asrs/service/OrderCheckService.java
index 8e6e78d..8810633 100644
--- a/src/main/java/com/zy/asrs/service/OrderCheckService.java
+++ b/src/main/java/com/zy/asrs/service/OrderCheckService.java
@@ -17,7 +17,7 @@
 
     void checkComplete(String orderNo);
 
-    boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+ //   boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
 
 
 
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 52e0487..e2c82d4 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -15,7 +15,7 @@
 
     void checkComplete(String orderNo);
 
-    boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+//    boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
 
     void remove(Long orderId);
 
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 09473ad..a262d23 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -16,6 +16,8 @@
 import com.zy.asrs.utils.MatUtils;
 import com.zy.common.model.DetlDto;
 import com.zy.common.utils.NodeUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,6 +64,8 @@
     private LocOwnerService locOwnerService;
     @Autowired
     private ReportQueryMapper reportQueryMapper;
+    @Autowired
+    private UserService userService;
 
     @Override
     @Transactional
@@ -180,20 +184,27 @@
     @Override
     @Transactional
     public void pakoutOrderCreate(OpenOrderPakoutParam param) {
-        Order order = orderService.selectByNo(param.getOrderNo());
+        Order order = orderService.selectByNo(param.getCCode());
         // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
         if (!Cools.isEmpty(order)) {
             if (order.getSettle() > 1L) {
-                throw new CoolException(param.getOrderNo() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+                throw new CoolException(param.getCCode() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
             }
             orderService.remove(order.getId());
         }
-        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+        DocType docType = docTypeService.selectOrAdd(param.getType(), Boolean.FALSE);
         Date now = new Date();
+
+        //鏌ユ壘鍋氬崟鐢ㄦ埛
+        User user = userService.selectOne(new EntityWrapper<User>().eq("username", param.getCMaker()));
+        if(Cools.isEmpty(user)){
+            throw new CoolException("鏈煡璇㈠埌璇ョ敤鎴�");
+        }
+
         // 鍗曟嵁涓绘。
         order = new Order(
                 String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
-                param.getOrderNo(),    // 璁㈠崟缂栧彿
+                param.getCCode(),    // 璁㈠崟缂栧彿
                 DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
                 docType.getDocId(),    // 鍗曟嵁绫诲瀷
                 null,    // 椤圭洰缂栧彿
@@ -202,9 +213,9 @@
                 null,    // 鍒濆绁ㄦ嵁鍙�
                 null,    // 绁ㄦ嵁鍙�
                 null,    // 瀹㈡埛缂栧彿
-                null,    // 瀹㈡埛
+                param.getCAccount(),    // 瀹㈡埛
                 null,    // 鑱旂郴鏂瑰紡
-                null,    // 鎿嶄綔浜哄憳
+                param.getCMaker(),    // 鎿嶄綔浜哄憳
                 null,    // 鍚堣閲戦
                 null,    // 浼樻儬鐜�
                 null,    // 浼樻儬閲戦
@@ -221,7 +232,7 @@
                 null,    // 鐗╂祦鍗曞彿
                 1L,    // 璁㈠崟鐘舵��
                 1,    // 鐘舵��
-                9527L,    // 娣诲姞浜哄憳
+                user.getId(),    // 娣诲姞浜哄憳
                 now,    // 娣诲姞鏃堕棿
                 9527L,    // 淇敼浜哄憳
                 now,    // 淇敼鏃堕棿
@@ -231,37 +242,24 @@
             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);
-            }
-            dto.setWeight(detail.getWeight());
-        }
-        for (DetlDto detlDto : list) {
-            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+        for (OpenOrderPakoutParam.Body body : param.getADDBody()){
+            Mat mat = matService.selectByMatnr(body.getCInvCode());
             if (Cools.isEmpty(mat)) {
-                throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+                throw new CoolException(body.getCInvCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
             }
             OrderDetl orderDetl = new OrderDetl();
             orderDetl.sync(mat);
-            orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
-            orderDetl.setAnfme(detlDto.getAnfme());
+            orderDetl.setAnfme(body.getIQuantity());
+            orderDetl.setQty(0.0D);
+            orderDetl.setWorkQty(0.0D);
+            orderDetl.setStatus(1);
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
-            orderDetl.setCreateBy(9527L);
+            orderDetl.setCreateBy(user.getId());
             orderDetl.setCreateTime(now);
-            orderDetl.setUpdateBy(9527L);
+            orderDetl.setUpdateBy(user.getId());
             orderDetl.setUpdateTime(now);
-            orderDetl.setStatus(1);
-            orderDetl.setQty(0.0D);
-            orderDetl.setWeight(detlDto.getWeight());
+            orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
index 2e7c3c1..3c68fbb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
@@ -3,24 +3,18 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 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.ExamineParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
 import com.zy.asrs.mapper.OrderCheckMapper;
 import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.mapper.OrderMapper;
 import com.zy.asrs.service.*;
-import com.zy.common.model.DetlDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -101,55 +95,55 @@
 
     }
 
-    @Override
-    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
-        try {
-            List<DetlDto> detlDtos = new ArrayList<>();
-            wrkDetls.forEach(wrkDetl -> {
-                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
-            });
-            String orderNo = "HAND" + snowflakeIdWorker.nextId();
-            if (pakin) {
-                // 鐢熸垚鍏ュ簱鍗曟嵁
-                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
-                openParam.setOrderNo(orderNo);
-                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
-                openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
-                openParam.setOrderDetails(detlDtos);
-                openService.pakinOrderCreate(openParam);
-            } else {
-                // 鐢熸垚鍑哄簱鍗曟嵁
-                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
-                openParam.setOrderNo(orderNo);
-                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
-                openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
-                openParam.setOrderDetails(detlDtos);
-                openService.pakoutOrderCreate(openParam);
-            }
-
-            OrderCheck order = this.selectByNo(orderNo);
-            if (null == order) {
-                throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
-            }
-            if (!this.updateSettle(order.getId(), 4L, null)) {
-                throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-            }
-            for (DetlDto detlDto : detlDtos) {
-                // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-                    throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
-                }
-                // 淇敼璁㈠崟浣滀笟鏁伴噺
-                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-                }
-            }
-        } catch (Exception e) {
-            log.error("saveHandlerOrder===>>", e);
-            return false;
-        }
-        return true;
-    }
+//    @Override
+//    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+//        try {
+//            List<DetlDto> detlDtos = new ArrayList<>();
+//            wrkDetls.forEach(wrkDetl -> {
+//                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+//            });
+//            String orderNo = "HAND" + snowflakeIdWorker.nextId();
+//            if (pakin) {
+//                // 鐢熸垚鍏ュ簱鍗曟嵁
+//                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+//                openParam.setOrderNo(orderNo);
+//                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+//                openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
+//                openParam.setOrderDetails(detlDtos);
+//                openService.pakinOrderCreate(openParam);
+//            } else {
+//                // 鐢熸垚鍑哄簱鍗曟嵁
+//                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
+//                openParam.setOrderNo(orderNo);
+//                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+//                openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
+//                openParam.setOrderDetails(detlDtos);
+//                openService.pakoutOrderCreate(openParam);
+//            }
+//
+//            OrderCheck order = this.selectByNo(orderNo);
+//            if (null == order) {
+//                throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
+//            }
+//            if (!this.updateSettle(order.getId(), 4L, null)) {
+//                throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+//            }
+//            for (DetlDto detlDto : detlDtos) {
+//                // 淇敼璁㈠崟鏄庣粏鏁伴噺
+//                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+//                    throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+//                }
+//                // 淇敼璁㈠崟浣滀笟鏁伴噺
+//                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+//                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("saveHandlerOrder===>>", e);
+//            return false;
+//        }
+//        return true;
+//    }
 
 
 
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 60e9268..f434b55 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,23 +1,20 @@
 package com.zy.asrs.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
-import com.core.common.DateUtils;
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderListDTO;
 import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.mapper.OrderMapper;
 import com.zy.asrs.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.common.model.DetlDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -87,55 +84,55 @@
 
     }
 
-    @Override
-    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
-        try {
-            List<DetlDto> detlDtos = new ArrayList<>();
-            wrkDetls.forEach(wrkDetl -> {
-                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
-            });
-            String orderNo = "HAND" + snowflakeIdWorker.nextId();
-            if (pakin) {
-                // 鐢熸垚鍏ュ簱鍗曟嵁
-                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
-                openParam.setOrderNo(orderNo);
-                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
-                openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
-                openParam.setOrderDetails(detlDtos);
-                openService.pakinOrderCreate(openParam);
-            } else {
-                // 鐢熸垚鍑哄簱鍗曟嵁
-                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
-                openParam.setOrderNo(orderNo);
-                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
-                openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
-                openParam.setOrderDetails(detlDtos);
-                openService.pakoutOrderCreate(openParam);
-            }
-
-            Order order = this.selectByNo(orderNo);
-            if (null == order) {
-                throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
-            }
-            if (!this.updateSettle(order.getId(), 4L, null)) {
-                throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-            }
-            for (DetlDto detlDto : detlDtos) {
-                // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-                    throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
-                }
-                // 淇敼璁㈠崟浣滀笟鏁伴噺
-                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-                }
-            }
-        } catch (Exception e) {
-            log.error("saveHandlerOrder===>>", e);
-            return false;
-        }
-        return true;
-    }
+//    @Override
+//    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+//        try {
+//            List<DetlDto> detlDtos = new ArrayList<>();
+//            wrkDetls.forEach(wrkDetl -> {
+//                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+//            });
+//            String orderNo = "HAND" + snowflakeIdWorker.nextId();
+//            if (pakin) {
+//                // 鐢熸垚鍏ュ簱鍗曟嵁
+//                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+//                openParam.setOrderNo(orderNo);
+//                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+//                openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
+//                openParam.setOrderDetails(detlDtos);
+//                openService.pakinOrderCreate(openParam);
+//            } else {
+//                // 鐢熸垚鍑哄簱鍗曟嵁
+//                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
+//                openParam.setOrderNo(orderNo);
+//                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+//                openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
+//                openParam.setOrderDetails(detlDtos);
+//                openService.pakoutOrderCreate(openParam);
+//            }
+//
+//            Order order = this.selectByNo(orderNo);
+//            if (null == order) {
+//                throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
+//            }
+//            if (!this.updateSettle(order.getId(), 4L, null)) {
+//                throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+//            }
+//            for (DetlDto detlDto : detlDtos) {
+//                // 淇敼璁㈠崟鏄庣粏鏁伴噺
+//                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+//                    throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+//                }
+//                // 淇敼璁㈠崟浣滀笟鏁伴噺
+//                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+//                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("saveHandlerOrder===>>", e);
+//            return false;
+//        }
+//        return true;
+//    }
 
     @Override
     public void remove(Long orderId) {

--
Gitblit v1.9.1