From 465475865bf545f638f21f4a85f5986a47c552ab Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 13 七月 2024 09:22:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9d96633..01ed37a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1180,14 +1180,22 @@
             throw new CoolException("鍙傛暟锛氱墿鏂欓噸閲� wright涓虹┖");
         }
 
-        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()).eq("color", param.getColor()));
+        ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
+        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()));
         if (locDetls.isEmpty()){
             locDetls = new ArrayList<LocDetl>();
         }
-        if (locDetls.isEmpty()){
+        for (LocDetl locDetl:locDetls){
+            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+            if (locMast.getLocSts().equals("F")){
+                locDetlArrayList.add(locDetl);
+                break;
+            }
+        }
+        if (locDetlArrayList.isEmpty()){
             throw new CoolException("鏈壘鍒扮鍚堟潯浠剁殑鐗╂枡鏄庣粏锛氬搧鍙�==銆媘atnr:"+param.getMatnr()+"锛涢噸閲�==銆媤right:"+param.getWeight()+"锛涢鑹�==銆媍olor:"+param.getColor());
         }
-        for (LocDetl locDetl : locDetls){
+        for (LocDetl locDetl : locDetlArrayList){
             StockOutParam stockOutParam = new StockOutParam(param,locDetl);
             workService.startupFullTakeStore(stockOutParam, userId);
             return;

--
Gitblit v1.9.1