From f7c98db042dce0717011f9424ff92dbdc4b0efa0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 14:42:54 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderMapper.xml                    |    9 +++++++++
 src/main/java/com/zy/asrs/service/OrderService.java          |    2 ++
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |    5 +++++
 src/main/java/com/zy/asrs/mapper/OrderMapper.java            |    3 +++
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java  |    2 ++
 src/main/java/com/zy/asrs/controller/OutController.java      |   34 ----------------------------------
 6 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index d91debf..abfc36d 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -43,40 +43,6 @@
     @Autowired
     private BasDevpService basDevpService;
 
-
-//    @PostMapping("/out/pakout/preview/auth")
-//    public R pakoutPreview(@RequestBody List<Long> ids) {
-//        if (Cools.isEmpty(ids)) {
-//            return R.parse(BaseRes.PARAM);
-//        }
-//        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
-//        Set<DetlDto> detlDtos = new HashSet<>();
-//        for (OrderDetl orderDetl : orderDetls) {
-//            if (DetlDto.hasList(detlDtos, orderDetl)) {
-//                DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
-//                assert detlDto != null;
-//                detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
-//            } else {
-//                detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
-//            }
-//        }
-//        List<LocDto> locDtos = new ArrayList<>();
-//        for (DetlDto detlDto : detlDtos) {
-//            double issued = Optional.ofNullable(detlDto.getAnfme()).orElse(0.0D) ;
-//            List<LocDetl> locDetls = locDetlService.queryStock(detlDto.getMatnr(), detlDto.getBatch(), null);
-//            for (LocDetl locDetl : locDetls) {
-//                if (issued > 0) {
-//                    locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
-//                    // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-//                    issued = issued - locDetl.getAnfme();
-//                } else {
-//                    break;
-//                }
-//            }
-//        }
-//        return R.ok().add(locDtos);
-//    }
-
     @PostMapping("/out/pakout/preview/auth")
     @ManagerAuth
     public R pakoutPreview(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 1f4bdcf..2e52b23 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.OrderDetl;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,4 +13,6 @@
 @Repository
 public interface OrderMapper extends BaseMapper<Order> {
 
+    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+
 }
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index f440fd4..f30439c 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -12,4 +12,6 @@
 
     List<OrderDetl> selectWorkingDetls(Long orderId);
 
+    boolean updateSettle(Long orderId, Long settle, Long userId);
+
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 5ec4c8e..d4192a1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -33,4 +33,9 @@
         return orderDetlMapper.selectWorkingDetls(orderId);
     }
 
+    @Override
+    public boolean updateSettle(Long orderId, Long settle, Long userId) {
+        return this.baseMapper.updateSettle(orderId, settle, userId) > 0;
+    }
+
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4e41742..6c21b9f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -322,9 +322,11 @@
             if (!wrkDetlService.insert(wrkDetl)) {
                 throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�");
             }
+            // 淇敼璁㈠崟鏄庣粏
             if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
                 throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
             }
+            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
         }
         // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
         locMast = locMastService.selectById(taskDto.getLocNo());
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index f422abc..1ac517d 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -42,4 +42,13 @@
 
     </resultMap>
 
+    <update id="updateSettle">
+        update man_order
+        set settle = #{settle}
+        ,update_time = getdate()
+        ,update_by = #{userId}
+        where 1=1
+        and id = #{orderId}
+    </update>
+
 </mapper>

--
Gitblit v1.9.1