From c6fb95d1be6057a569a3e2ba8c983c1de72c3264 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 17 三月 2022 09:19:58 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java |   88 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index 5e9d42e..89685a7 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -6,13 +6,10 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
-import zy.cloud.wms.manager.entity.LocDetl;
-import zy.cloud.wms.manager.entity.Node;
-import zy.cloud.wms.manager.entity.ReceiveDetl;
+import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.manager.entity.*;
 import zy.cloud.wms.manager.entity.dto.PutShelfDTO;
-import zy.cloud.wms.manager.service.LocDetlService;
-import zy.cloud.wms.manager.service.NodeService;
-import zy.cloud.wms.manager.service.ReceiveDetlService;
+import zy.cloud.wms.manager.service.*;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
@@ -32,6 +29,10 @@
     private LocDetlService locDetlService;
     @Autowired
     private NodeService nodeService;
+    @Autowired
+    private ReceiveLogService receiveLogService;
+    @Autowired
+    private ReceiveService receiveService;
 
     @RequestMapping(value = "/receiveDetl/{id}/auth")
     @ManagerAuth
@@ -140,7 +141,7 @@
         /**
          * 鎺х涓庢暟鎹垵濮嬪寲
          */
-        if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getBatch(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
+        if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
             return R.error("杈撳叆鏁版嵁鏈夎,璇烽噸鏂拌緭鍏�");
         }
         Date date = new Date();
@@ -192,7 +193,80 @@
         targetRece.setInQty((int) (targetRece.getInQty() + remain));
         receiveDetlService.update(targetRece,new EntityWrapper<ReceiveDetl>()
                 .eq("id",targetRece.getId()));
+
+        /**
+         * 涓婃灦瀹屾垚涔嬪悗,瀛樻斁鏁版嵁鑷充笂鏋剁粺璁¤〃 man_receive_log
+         */
+        ReceiveLog receiveLog = new ReceiveLog();
+        receiveLog.setOrderNo(putShelfDTO.getOrderNo());
+        receiveLog.setNodeId(targetLoc.getId());
+        receiveLog.setNodeName(targetLoc.getName());
+        receiveLog.setMatnr(putShelfDTO.getMatnr());
+        receiveLog.setAnfme(remain);
+        receiveLog.setBatch(putShelfDTO.getBatch());
+        receiveLog.setCreateBy(getUserId());
+        receiveLog.setUpdateBy(getUserId());
+        receiveLog.setIoType(1);
+        receiveLogService.insert(receiveLog);
         return R.ok("娣诲姞鎴愬姛");
     }
 
+    /**
+     * 鎾ら攢涓婃灦鎿嶄綔
+     */
+    @RequestMapping("/receiveDetl/renew/auth")
+    @ManagerAuth
+    @Transactional
+    public R renew(@RequestBody ReceiveDetl receiveDetl){
+        /**
+         * 鎺х
+         */
+        if (receiveDetl.getInQty() <= 0){
+            return R.error("娌℃湁涓婃灦璁板綍,鏃犳硶鎾ゅ洖");
+        }
+        Receive receive = receiveService.selectOne(new EntityWrapper<Receive>()
+                .eq("id", receiveDetl.getOrderId()));
+        if (Cools.isEmpty(receive)) {
+            return R.error("鎵句笉鍒拌鍗曟嵁,璇疯仈绯荤鐞嗗憳");
+        }
+        if (receive.getSettle() == 4){
+            return R.error("璇ュ崟鎹凡缁忓畬缁�");
+        }
+
+        /**
+         * 淇敼搴撳瓨鏁伴噺,鍚屾椂鎾ゅ洖涓婃灦瀹屾垚鍚�,灏嗘搷浣滆褰曞弽鍐欏洖涓婃灦缁熻琛� man_receive_log
+         */
+        List<ReceiveLog> receiveLogs = receiveLogService.selectList(new EntityWrapper<ReceiveLog>()
+                .eq("order_no", receiveDetl.getOrderNo())
+                .eq("matnr", receiveDetl.getMatnr())
+                .eq("batch", receiveDetl.getBatch())
+                .eq("io_type", 1));
+        if (Cools.isEmpty(receiveLogs)) {
+            return R.error("鎵句笉鍒板叆搴撹褰�");
+        }
+        for (ReceiveLog receiveLog : receiveLogs) {
+            locDetlService.delete(new EntityWrapper<LocDetl>()
+                    .eq("loc_no",receiveLog.getNodeName())
+                    .eq("matnr",receiveLog.getMatnr())
+                    .eq("batch",receiveLog.getBatch()));
+            receiveLog.setIoType(101);
+            receiveLog.setCreateBy(getUserId());
+            receiveLog.setUpdateBy(getUserId());
+            receiveLogService.insert(receiveLog);
+        }
+
+        /**
+         * 鍙嶅啓鍥炲叆搴撴。
+         */
+        receiveDetl.setInQty(0);
+        receiveDetl.setUpdateTime(new Date());
+        receiveDetl.setUpdateBy(getUserId());
+        receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
+                .eq("id",receiveDetl.getId()));
+
+
+
+        return R.ok("鎾ゅ洖鎴愬姛");
+    }
+
 }

--
Gitblit v1.9.1