From 33cc8de8a39b88d619cce6e80f13564a85e5dce0 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 13:00:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
index c32a211..4cac85d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -73,13 +73,13 @@
             if (tempLocList.size() > 0) {
                 for (Integer j = 0; j < tempLocList.size(); j ++) {
                     locNum = locNum.add(new BigDecimal(tempLocList.get(j).getAnfme()));
-                    /* 璁$畻闇�瑕佺殑鏁伴噺锛岀鍚堟暟閲忓悗缁撴潫寰幆 */
-                    if (needNum.compareTo(locNum) == 1) {
+//                    /* 璁$畻闇�瑕佺殑鏁伴噺锛岀鍚堟暟閲忓悗缁撴潫寰幆 */
+//                    if (needNum.compareTo(locNum) == 1) {
                         locList.add(tempLocList.get(j));
-                    } else {
-                        locList.add(tempLocList.get(j));
-                        break;
-                    }
+//                    } else {
+//                        locList.add(tempLocList.get(j));
+//                        break;
+//                    }
                 }
             }
         }
@@ -166,7 +166,8 @@
         // 鑾峰彇搴撲綅鏄庣粏
         List<LocDetlDto> locDetlDtos = new ArrayList<>();
         for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
-            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())
+                && paramLocDetl.getCount() > 0) {
                 LocDetl sqlParam = new LocDetl();
                 sqlParam.setLocNo(paramLocDetl.getLocNo());
                 sqlParam.setMatnr(paramLocDetl.getMatnr());
@@ -209,6 +210,10 @@
 //            }
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(dto.getLocNo());
+            //濡傛灉鎵樼洏鏉$爜涓虹┖锛屽氨涓嶈兘杩涜鎷f枡锛屾棤娉曞啀鍏ュ簱
+            if(ioType==103 && null!=locMast && Cools.isEmpty(locMast.getBarcode())){
+                throw new CoolException("搴撲綅娌℃湁鎵樼洏鐮侊紝鏃犳硶鎷f枡浣滀笟===>>" + locMast.getLocNo());
+            }
             // 鑾峰彇璺緞
             Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                     .eq("type_no", ioType)

--
Gitblit v1.9.1