From fc8767d2b01d295aaa9e1a8dd2da55e4c0484130 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 16 八月 2024 16:48:31 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java |  104 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
index de41adb..edd379f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -7,7 +7,7 @@
 import com.zy.asrs.framework.common.R;
 import com.zy.asrs.framework.exception.CoolException;
 import com.zy.asrs.wms.asrs.entity.*;
-import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
+import com.zy.asrs.wms.asrs.entity.template.WaitPakinTemplate;
 import com.zy.asrs.wms.asrs.service.*;
 import com.zy.asrs.wms.common.annotation.OperationLog;
 import com.zy.asrs.wms.common.domain.BaseParam;
@@ -17,8 +17,8 @@
 import com.zy.asrs.wms.utils.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -33,10 +33,6 @@
     private OrderService orderService;
     @Autowired
     private OrderDetlService orderDetlService;
-    @Autowired
-    private LocService locService;
-    @Autowired
-    private TaskService taskService;
 
     @PreAuthorize("hasAuthority('asrs:waitPakin:list')")
     @PostMapping("/waitPakin/page")
@@ -58,47 +54,21 @@
         return R.ok().add(waitPakinService.getById(id));
     }
 
+    @PreAuthorize("hasAuthority('asrs:waitPakin:list')")
+    @GetMapping("/waitPakin/orderDetlId/{orderDetlId}")
+    public R getByOrderDetlId(@PathVariable("orderDetlId") Long orderDetlId) {
+        return R.ok().add(waitPakinService.getByOrderDetlId(orderDetlId));
+    }
+
     @PreAuthorize("hasAuthority('asrs:waitPakin:save')")
     @OperationLog("娣诲姞缁勬墭閫氱煡妗�")
     @PostMapping("/waitPakin/save")
-    @Transactional
     public R save(@RequestBody WaitPakin waitPakin) {
-        if (waitPakin.getAnfme() <= 0) {
-            return R.error("缁勬墭鏁伴噺閿欒");
-        }
-
-        List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
-        if (!locList.isEmpty()) {
-            return R.error("鎵樼洏宸插湪搴�");
-        }
-
-        List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, waitPakin.getBarcode()));
-        if (!taskList.isEmpty()) {
-            return R.error("鎵樼洏姝e湪鍏ュ簱涓�");
-        }
-
-        if (!waitPakinService.save(waitPakin)) {
-            return R.error("娣诲姞澶辫触");
-        }
-
-        OrderDetl orderDetl = orderDetlService.getById(waitPakin.getDetlId());
-        if (orderDetl == null) {
-            throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
-        }
-
-        //鑾峰彇璁㈠崟
-        Order order = orderService.getById(orderDetl.getOrderId());
-        if(order == null){
-            throw new CoolException("璁㈠崟涓嶅瓨鍦�");
-        }
-
-        //鏇存柊璁㈠崟鐘舵��
-        if (order.getOrderSettle().equals(OrderSettleType.INIT.val())) {
-            order.setOrderSettle(OrderSettleType.WAIT.val());
-            order.setUpdateTime(new Date());
-            if (!orderService.updateById(order)) {
-                throw new CoolException("璁㈠崟鏁版嵁鏇存柊澶辫触");
-            }
+        try {
+            waitPakinService.comb(waitPakin);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
         }
         return R.ok("娣诲姞鎴愬姛");
     }
@@ -158,4 +128,52 @@
         ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
     }
 
+    @PreAuthorize("hasAuthority('asrs:waitPakin:list')")
+    @PostMapping("/waitPakin/exportTemplate")
+    public void exportTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+        ArrayList<WaitPakinTemplate> list = new ArrayList<>();
+        ExcelUtil.build(ExcelUtil.create(list, WaitPakinTemplate.class), response);
+    }
+
+    @PostMapping("/waitPakin/upload")
+    public R upload(@RequestParam("file") MultipartFile file) {
+        List<WaitPakinTemplate> list = ExcelUtil.parseExcelFile(file, WaitPakinTemplate.class);
+        for (WaitPakinTemplate waitPakinTemplate : list) {
+            Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, waitPakinTemplate.getOrderNo()).eq(Order::getStatus, 1));
+            if (order == null) {
+                throw new CoolException("璁㈠崟涓嶅瓨鍦�");
+            }
+
+            LambdaQueryWrapper<OrderDetl> wrapper = new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId());
+            if (!Cools.isEmpty(waitPakinTemplate.getBatch())) {
+                wrapper.eq(OrderDetl::getBatch, waitPakinTemplate.getBatch());
+            }
+            List<OrderDetl> orderDetls = orderDetlService.list(wrapper);
+            if (orderDetls.isEmpty()) {
+                throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+            }
+
+            Long detlId = null;
+            for (OrderDetl orderDetl : orderDetls) {
+                Mat mat = orderDetl.getMat$();
+                if (mat.getMatnr().equals(waitPakinTemplate.getMatnr())) {
+                    detlId = orderDetl.getId();
+                }
+            }
+
+            if (detlId == null) {
+                throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+            }
+
+            WaitPakin waitPakin = new WaitPakin();
+            waitPakin.setOrderId(order.getId());
+            waitPakin.setOrderNo(order.getOrderNo());
+            waitPakin.setAnfme(waitPakinTemplate.getAnfme());
+            waitPakin.setBarcode(waitPakinTemplate.getBarcode());
+            waitPakin.setDetlId(detlId);
+            waitPakinService.comb(waitPakin);
+        }
+        return R.ok();
+    }
+
 }

--
Gitblit v1.9.1