From 50be60574f905504eb65fb247e840f51353cc947 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 17 二月 2023 16:21:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |  435 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 340 insertions(+), 95 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 d593df9..7c0de39 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,22 +1,25 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.InOutCountDto;
 import com.zy.asrs.entity.result.OpenOrderCompeteResult;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.TagMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.model.DetlDto;
 import com.zy.common.utils.NodeUtils;
+import com.zy.common.utils.Synchro;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +54,12 @@
     private TagService tagService;
     @Autowired
     private TagMapper tagMapper;
+    @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
+    private NodeService nodeService;
+    @Autowired
+    private ManLocDetlService manLocDetlService;
 
     @Override
     @Transactional
@@ -121,7 +130,14 @@
             }
             OrderDetl orderDetl = new OrderDetl();
             orderDetl.sync(mat);
-            orderDetl.setBatch(detlDto.getBatch());
+
+            //鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
+            if (detlDto.getBatch() == null) {
+                orderDetl.setBatch("");
+            } else {
+                orderDetl.setBatch(detlDto.getBatch());
+
+            }
             orderDetl.setAnfme(detlDto.getAnfme());
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
@@ -137,51 +153,51 @@
         }
     }
 
-    @Override
-    @Transactional
-    public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
-        List<OpenOrderCompeteResult> results = new ArrayList<>();
-        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
-            // 鎸囧畾璁㈠崟
-            Order order = orderService.selectByNo(param.getOrderNo());
-            if (null != order) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                if (order.getSettle() == 4L) {
-                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                    }
-                }
-            }
-        } else {
-            // 鎵�鏈夎鍗�
-            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-            for (Order order : orders) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
-            }
-        }
-        return results;
-    }
+//    @Override
+//    @Transactional
+//    public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
+//        List<OpenOrderCompeteResult> results = new ArrayList<>();
+//        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+//            // 鎸囧畾璁㈠崟
+//            Order order = orderService.selectByNo(param.getOrderNo());
+//            if (null != order) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                if (order.getSettle() == 4L) {
+//                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                    }
+//                }
+//            }
+//        } else {
+//            // 鎵�鏈夎鍗�
+//            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+//            for (Order order : orders) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                }
+//            }
+//        }
+//        return results;
+//    }
 
     @Override
     @Transactional
@@ -256,7 +272,7 @@
             }
             OrderDetl orderDetl = new OrderDetl();
             orderDetl.sync(mat);
-            orderDetl.setBatch(detlDto.getBatch());
+            orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
             orderDetl.setAnfme(detlDto.getAnfme());
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
@@ -272,50 +288,50 @@
         }
     }
 
-    @Override
-    public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
-        List<OpenOrderCompeteResult> results = new ArrayList<>();
-        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
-            // 鎸囧畾璁㈠崟
-            Order order = orderService.selectByNo(param.getOrderNo());
-            if (null != order) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                if (order.getSettle() == 4L) {
-                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                    }
-                }
-            }
-        } else {
-            // 鎵�鏈夎鍗�
-            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-            for (Order order : orders) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
-            }
-        }
-        return results;
-    }
+//    @Override
+//    public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
+//        List<OpenOrderCompeteResult> results = new ArrayList<>();
+//        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+//            // 鎸囧畾璁㈠崟
+//            Order order = orderService.selectByNo(param.getOrderNo());
+//            if (null != order) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                if (order.getSettle() == 4L) {
+//                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                    }
+//                }
+//            }
+//        } else {
+//            // 鎵�鏈夎鍗�
+//            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+//            for (Order order : orders) {
+//                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+//                results.add(result);
+//                result.setOrderNo(order.getOrderNo());
+//                result.setOrderTime(order.getOrderTime());
+//                result.setOrderType(order.getDocType$());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                for (OrderDetl orderDetl : orderDetls) {
+//                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+//                }
+//                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                }
+//            }
+//        }
+//        return results;
+//    }
 
     @Override
     @Transactional
@@ -438,4 +454,233 @@
         }
     }
 
+    @Override
+    @Transactional
+    public void syncMat(MatSyncParam param) {
+        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
+            throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+        }
+
+        for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+            if (Cools.isEmpty(matParam.getMatnr())) {
+                throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+            }
+
+            Date now = new Date();
+            Mat mat = matService.selectByMatnr(matParam.getMatnr());
+            if (mat == null) {
+                mat = new Mat();
+                // 鍒嗙被
+                Long tagId;
+                // 涓�绾у垎绫�
+                if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+                    Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
+                    if (priTag == null) {
+                        Tag top = tagService.getTop();
+                        NodeUtils nodeUtils = new NodeUtils();
+                        nodeUtils.executePath(top.getId());
+                        priTag = new Tag(
+                                null,    // 缂栧彿
+                                matParam.getGroupCode(),    // 鍚嶇О
+                                top.getId(),    // 鐖剁骇
+                                top.getName(),    // 鐖剁骇鍚嶇О
+                                nodeUtils.path.toString(),    // 鍏宠仈璺緞
+                                nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+                                0,    // 绫诲瀷
+                                null,    // 璐熻矗浜�
+                                null,    // 鍥剧墖
+                                null,    // 绠�瑕佹弿杩�
+                                null,    // 鏁伴噺
+                                2,    // 绛夌骇
+                                null,    // 鎺掑簭
+                                1,    // 鐘舵��
+                                now,    // 娣诲姞鏃堕棿
+                                null,    // 娣诲姞浜哄憳
+                                now,    // 淇敼鏃堕棿
+                                null,    // 淇敼浜哄憳
+                                null    // 澶囨敞
+                        );
+                        if (tagMapper.insert(priTag) == 0) {
+                            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        }
+                    }
+                    // 浜岀骇鍒嗙被
+                    Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+                    if (secTag == null) {
+                        NodeUtils nodeUtils = new NodeUtils();
+                        nodeUtils.executePath(priTag.getId());
+                        secTag = new Tag(
+                                null,    // 缂栧彿
+                                matParam.getGroupName(),    // 鍚嶇О
+                                priTag.getId(),    // 鐖剁骇
+                                priTag.getName(),    // 鐖剁骇鍚嶇О
+                                nodeUtils.path.toString(),    // 鍏宠仈璺緞
+                                nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+                                0,    // 绫诲瀷
+                                null,    // 璐熻矗浜�
+                                null,    // 鍥剧墖
+                                null,    // 绠�瑕佹弿杩�
+                                null,    // 鏁伴噺
+                                3,    // 绛夌骇
+                                null,    // 鎺掑簭
+                                1,    // 鐘舵��
+                                now,    // 娣诲姞鏃堕棿
+                                null,    // 娣诲姞浜哄憳
+                                now,    // 淇敼鏃堕棿
+                                null,    // 淇敼浜哄憳
+                                null    // 澶囨敞
+                        );
+                        if (tagMapper.insert(secTag) == 0) {
+                            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        }
+                    }
+                    tagId = secTag.getId();
+                } else {
+                    tagId = tagService.getTop().getId();
+                }
+                mat.sync(matParam);
+//            mat.setMatnr(para);
+//            mat.setMaktx(param.getMaktx());
+//            mat.setSpecs(param.getSpecs());
+//            mat.setModel(param.getModel());
+
+                mat.setTagId(tagId);
+                mat.setStatus(1);
+                mat.setCreateTime(now);
+                mat.setUpdateTime(now);
+                if (!matService.insert(mat)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                } else {
+                    log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+                }
+            } else {
+                mat.sync(param);
+                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
+                    throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public R getInOutDetl() {
+        List<InOutCountDto> top100 = wrkMastService.selectTop100();
+        return R.ok().add(top100);
+    }
+
+    @Transactional
+    @Override
+    public R manDetlIn(JSONObject json) {
+        Date date = new Date();
+        String jsonLocNo = (String) json.get("locNo");
+        Node node = nodeService.selectOne(new EntityWrapper<Node>()
+                .eq("name", jsonLocNo));
+
+        String jsonOrderNo = (String) json.get("orderNo");
+        Order order = orderService.selectOne(new EntityWrapper<Order>()
+                .eq("order_no", jsonOrderNo));
+        if (Cools.isEmpty(node, order)) {
+            return R.error("鍙傛暟涓虹┖");
+        }
+
+        JSONArray combMats = json.getJSONArray("combMats");
+        for (int i = 0; i < combMats.size(); i++) {
+            OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
+            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+                    .eq("order_no", jsonOrderNo));
+            if (Cools.isEmpty(orderDetl)) {
+                return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+            }
+            if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getQty()) < 0) {
+                return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
+            }
+            ManLocDetl checkManLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+                    .eq("loc_no", jsonLocNo)
+                    .eq("matnr", orderDetl.getMatnr()));
+            if (checkManLocDetl == null) {
+                ManLocDetl manLocDetl = new ManLocDetl();
+                Synchro.Copy(orderDetl, manLocDetl);
+                manLocDetl.setLocNo(node.getName());
+                manLocDetl.setNodeId(node.getId());
+                manLocDetl.setMatnr(orderDetl.getMatnr());
+                manLocDetl.setMaktx(orderDetl.getMaktx());
+                manLocDetl.setAnfme(orderDetl.getAnfme());
+                manLocDetl.setModiTime(date);
+                manLocDetl.setCreateTime(date);
+                manLocDetlService.insert(manLocDetl);
+            } else {
+                checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + orderDetl.getAnfme());
+                checkManLocDetl.setModiTime(date);
+                manLocDetlService.update(checkManLocDetl, new EntityWrapper<ManLocDetl>()
+                        .eq("loc_no", jsonLocNo)
+                        .eq("matnr", orderDetl.getMatnr()));
+            }
+
+            orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+            orderDetl.setUpdateTime(date);
+            orderDetlService.updateById(orderDetl);
+
+        }
+        orderService.checkComplete(order.getOrderNo());
+
+
+        return R.ok("涓婃灦瀹屾垚");
+    }
+
+    @Transactional
+    @Override
+    public R manDetlOut(JSONObject json) {
+        Date date = new Date();
+        String jsonLocNo = (String) json.get("locNo");
+        Node node = nodeService.selectOne(new EntityWrapper<Node>()
+                .eq("name", jsonLocNo));
+        String jsonOrderNo = (String) json.get("orderNo");
+        Order order = orderService.selectOne(new EntityWrapper<Order>()
+                .eq("order_no", jsonOrderNo));
+        if (Cools.isEmpty(node, order)) {
+            return R.error("鍙傛暟涓虹┖");
+        }
+
+        JSONArray combMats = json.getJSONArray("combMats");
+        for (int i = 0; i < combMats.size(); i++) {
+            OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
+            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+                    .eq("order_no", jsonOrderNo));
+            if (Cools.isEmpty(orderDetl)) {
+                return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+            }
+            if (jsonOrderDetl.getAnfme() > (orderDetl.getAnfme() - orderDetl.getQty())) {
+                return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍙嚭鏁伴噺");
+            }
+            ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+                    .eq("loc_no", jsonLocNo)
+                    .eq("matnr", orderDetl.getMatnr()));
+            if (manLocDetl == null) {
+                return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
+            }
+            if (jsonOrderDetl.getAnfme() > manLocDetl.getAnfme()) {
+                return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
+            }
+            Double finalQty = manLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
+            if (finalQty <= 0){
+                manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
+                        .eq("loc_no", jsonLocNo)
+                        .eq("matnr", orderDetl.getMatnr()));
+            }else {
+                manLocDetl.setAnfme(finalQty);
+                manLocDetl.setModiTime(date);
+                manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
+                        .eq("loc_no", jsonLocNo)
+                        .eq("matnr", orderDetl.getMatnr()));
+            }
+            orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+            orderDetl.setUpdateTime(date);
+            orderDetlService.updateById(orderDetl);
+
+            orderService.checkComplete(order.getOrderNo());
+        }
+        return R.ok("涓嬫灦瀹屾垚");
+    }
+
 }

--
Gitblit v1.9.1