From 047fda05a26ce9a9786ec5f1dca0f82a95d30bed Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 六月 2023 09:56:24 +0800
Subject: [PATCH] #pda订单下架重量空优化、订单出库批量出库优化

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    6 ++++++
 src/main/java/com/zy/asrs/controller/OutController.java       |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f3072fc..b2dce00 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -61,6 +61,11 @@
         }
         List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
         List<LocDto> locDtos = new ArrayList<>();
+        for (OrderDetl o: orderDetls) {
+            if (o.getAnfme() == o.getWorkQty()){
+                return R.error("鍑哄簱鐨勬槑缁嗕腑鏈夊凡鍑哄簱鐗╂枡");
+            }
+        }
 
         Set<String> exist = new HashSet<>();
 
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 381c01f..2d922de 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -664,6 +664,12 @@
             if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
                 return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
             }
+            if(checkManLocDetl.getWeight() == null){
+                checkManLocDetl.setWeight(0.0);
+            }
+            if(jsonOrderDetl.getWeight() == null){
+                jsonOrderDetl.setWeight(0.0);
+            }
             Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
             Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
             checkManLocDetl.setAnfme(finalQty);

--
Gitblit v1.9.1