From be554d9e52799a0ee14c98b0959d07ab3847c8e6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 十月 2025 15:24:27 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/asrs/controller/OrderController.java |   94 +++++++++++++++++++++++-----------------------
 1 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8092ade..27468b6 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -177,58 +177,58 @@
         return R.ok("璁㈠崟娣诲姞鎴愬姛");
     }
 
-//    @RequestMapping(value = "/order/form/modify/auth")
-//    @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
-//    @Transactional
-//    public R formModify(@RequestBody OrderDomainParam param){
-//        Order order = orderService.selectById(param.getOrderId());
-//        if (order == null || order.getStatus() == 0) {
-//            return R.error("璁㈠崟涓嶅瓨鍦�");
-//        }
-//        Date now = new Date();
-//        Long userId = getUserId();
-//        // 淇敼涓绘。
-//        if (!param.getDocType().equals(order.getDocType())) {
-//            order.setDocType(param.getDocType());
-//            order.setUpdateBy(userId);
-//            order.setUpdateTime(now);
-//            if (!orderService.updateById(order)) {
-//                throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
-//            }
-//        }
-//        // 淇敼鏄庣粏妗�
-////        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-//        // 1.娓呯┖鏄庣粏妗�
-//        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
-//            throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
-//        }
-//        // 2.閲嶇粍鏁版嵁
-//        List<DetlDto> list = new ArrayList<>();
-//        for (OrderDetl orderDetl : param.getOrderDetlList()) {
-//            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
-//            if (DetlDto.has(list, dto)) {
+    @RequestMapping(value = "/order/form/modify/auth")
+    @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+    @Transactional
+    public R formModify(@RequestBody OrderDomainParam param){
+        Order order = orderService.selectById(param.getOrderId());
+        if (order == null || order.getStatus() == 0) {
+            return R.error("璁㈠崟涓嶅瓨鍦�");
+        }
+        Date now = new Date();
+        Long userId = getUserId();
+        // 淇敼涓绘。
+        if (!param.getDocType().equals(order.getDocType())) {
+            order.setDocType(param.getDocType());
+            order.setUpdateBy(userId);
+            order.setUpdateTime(now);
+            if (!orderService.updateById(order)) {
+                throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+            }
+        }
+        // 淇敼鏄庣粏妗�
+//        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+        // 1.娓呯┖鏄庣粏妗�
+        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+            throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+        }
+        // 2.閲嶇粍鏁版嵁
+        List<DetlDto> list = new ArrayList<>();
+        for (OrderDetl orderDetl : param.getOrderDetlList()) {
+            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+            if (DetlDto.has(list, dto)) {
 //                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
 //                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
 //                if (!orderDetlService.updateById(item)) {
 //                    throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
 //                }
-//            } else {
-//                list.add(dto);
-//                orderDetl.setOrderId(order.getId());
-//                orderDetl.setOrderNo(order.getOrderNo());
-//                orderDetl.setCreateBy(getUserId());
-//                orderDetl.setCreateTime(now);
-//                orderDetl.setUpdateBy(getUserId());
-//                orderDetl.setUpdateTime(now);
-//                orderDetl.setStatus(1);
-//                orderDetl.setQty(0.0D);
-//                if (!orderDetlService.insert(orderDetl)) {
-//                    throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
-//                }
-//            }
-//        }
-//        return R.ok("璁㈠崟淇敼鎴愬姛");
-//    }
+            } else {
+                list.add(dto);
+                orderDetl.setOrderId(order.getId());
+                orderDetl.setOrderNo(order.getOrderNo());
+                orderDetl.setCreateBy(getUserId());
+                orderDetl.setCreateTime(now);
+                orderDetl.setUpdateBy(getUserId());
+                orderDetl.setUpdateTime(now);
+                orderDetl.setStatus(1);
+                orderDetl.setQty(0.0D);
+                if (!orderDetlService.insert(orderDetl)) {
+                    throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+                }
+            }
+        }
+        return R.ok("璁㈠崟淇敼鎴愬姛");
+    }
 
 //    @PostMapping(value = "/order/wrk/trace/auth")
 //    @ManagerAuth

--
Gitblit v1.9.1