From 05e174e784d49b8c3b89e7f432ebeab21126194c Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 30 一月 2023 16:23:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java    |   22 ++++--
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |  132 ++++++++++++++++++++++++++++++++++++++++++-
 src/main/java/com/zy/asrs/service/OpenService.java          |    5 +
 3 files changed, 145 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c03764f..8f2e27c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,20 +1,17 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.JSONPObject;
 import com.core.annotations.AppAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.service.OpenService;
 import com.zy.common.model.DetlDto;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -174,12 +171,21 @@
     }
 
 
-    @RequestMapping("/manDetl/add")
+    @RequestMapping("/manDetl/in")
     public R manDetlAdd(@RequestBody JSONObject json){
-        String locNo = (String)json.get("locNo");
-        String orderNo = (String)json.get("orderNo");
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return openService.manDetlIn(json);
+    }
 
-        return R.ok();
+
+    @RequestMapping("/manDetl/out")
+    public R manDetlDelete(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return openService.manDetlOut(json);
     }
 
 
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 2b3375a..bd22c5e 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,8 +1,8 @@
 package com.zy.asrs.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.core.common.R;
 import com.zy.asrs.entity.param.*;
-import com.zy.asrs.entity.result.OpenOrderCompeteResult;
 import com.zy.asrs.entity.result.StockVo;
 
 import java.util.List;
@@ -47,4 +47,7 @@
 
     R getInOutDetl();
 
+    R manDetlIn(JSONObject json);
+
+    R manDetlOut(JSONObject json);
 }
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 d72b653..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,5 +1,7 @@
 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;
@@ -14,8 +16,10 @@
 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;
@@ -52,6 +56,10 @@
     private TagMapper tagMapper;
     @Autowired
     private WrkMastService wrkMastService;
+    @Autowired
+    private NodeService nodeService;
+    @Autowired
+    private ManLocDetlService manLocDetlService;
 
     @Override
     @Transactional
@@ -126,7 +134,7 @@
             //鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
             if (detlDto.getBatch() == null) {
                 orderDetl.setBatch("");
-            }else {
+            } else {
                 orderDetl.setBatch(detlDto.getBatch());
 
             }
@@ -449,12 +457,12 @@
     @Override
     @Transactional
     public void syncMat(MatSyncParam param) {
-        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
             throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
         }
 
-        for(MatSyncParam.MatParam matParam : param.getMatDetails()){
-            if(Cools.isEmpty(matParam.getMatnr())){
+        for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+            if (Cools.isEmpty(matParam.getMatnr())) {
                 throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
             }
 
@@ -547,7 +555,7 @@
                 }
             } else {
                 mat.sync(param);
-                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
                     throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
                 }
             }
@@ -561,4 +569,118 @@
         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