From 98d33bd648770ce2f81a25d5fb16ead6610e3774 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 17 七月 2025 10:39:43 +0800
Subject: [PATCH] #pda支持取消组托

---
 src/main/java/com/zy/asrs/entity/param/CombCancelParam.java   |   11 +++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   48 ++++++++++++++++++++++++
 src/main/java/com/zy/asrs/controller/MobileController.java    |    7 +++
 src/main/java/com/zy/asrs/service/MobileService.java          |    5 ++
 4 files changed, 71 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7f84853..e5bd07f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -337,6 +337,13 @@
         return R.ok().add(map);
     }
 
+    @RequestMapping("/comb/cancel")
+    @ManagerAuth(memo = "鍙栨秷缁勬墭")
+    public R combCancel(@RequestBody CombCancelParam param) {
+        mobileService.combCancel(param, getUserId());
+        return R.ok("鍙栨秷缁勬墭鎴愬姛");
+    }
+
     @RequestMapping("/comb/auth")
     @ManagerAuth(memo = "缁勬墭")
     public R comb(@RequestBody CombParam combParam) {
diff --git a/src/main/java/com/zy/asrs/entity/param/CombCancelParam.java b/src/main/java/com/zy/asrs/entity/param/CombCancelParam.java
new file mode 100644
index 0000000..8582519
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/CombCancelParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class CombCancelParam {
+
+    // 鎵樼洏鏉$爜
+    private String barcode;
+
+}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index de9c55d..06756eb 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -47,6 +47,11 @@
     void comb(CombParam param, Long userId);
 
     /**
+     * 鍙栨秷缁勬墭
+     */
+    void combCancel(CombCancelParam param, Long userId);
+
+    /**
      * 涓婃灦
      */
     void onSale(CombParam param);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index ed6c164..5918f7c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -27,6 +27,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -715,6 +716,53 @@
 
     }
 
+    @Override
+    public void combCancel(CombCancelParam param, Long userId) {
+        if (Cools.isEmpty(param.getBarcode())) {
+            throw new CoolException(BaseRes.PARAM);
+        }
+
+        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().
+                eq("zpallet", param.getBarcode()));
+        if (waitPakins.isEmpty()) {
+            throw new CoolException("鎵樼洏鏈粍鎵�");
+        }
+
+        for (WaitPakin waitPakin : waitPakins) {
+            if (!Cools.isEmpty(waitPakin.getOrderNo())) {
+                Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, waitPakin.getOrderNo());
+                if (Cools.isEmpty(order)) {
+                    throw new CoolException("鍗曟嵁缂栧彿涓嶅瓨鍦�");
+                }
+
+                if (order.getSettle() > 2) {
+                    throw new CoolException("鍗曟嵁缂栧彿宸蹭綔涓氬畬鎴�");
+                }
+
+                // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙
+                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), waitPakin.getMatnr(), waitPakin.getBatch(), waitPakin.getBrand(), waitPakin.getStandby1(), waitPakin.getStandby2(), waitPakin.getStandby3(),
+                        waitPakin.getBoxType1(), waitPakin.getBoxType2(), waitPakin.getBoxType3());
+                if (orderDetl == null) {
+                    continue;
+                }
+
+                Double workQty = orderDetl.getWorkQty();
+                BigDecimal workQtyDecimal = new BigDecimal(workQty);
+                workQtyDecimal = workQtyDecimal.subtract(BigDecimal.valueOf(waitPakin.getAnfme()));
+
+                double newWorkQty = workQtyDecimal.doubleValue();
+                if (newWorkQty <= 0) {
+                    newWorkQty = 0D;
+                }
+                orderDetl.setWorkQty(newWorkQty);
+                orderDetlService.updateById(orderDetl);
+            }
+        }
+
+        waitPakinService.delete(new EntityWrapper<WaitPakin>()
+                .eq("zpallet", param.getBarcode()));
+    }
+
     // 鍟嗗搧涓婃灦
     @Override
     public void onSale(CombParam param) {

--
Gitblit v1.9.1