From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码

---
 src/main/java/com/zy/common/service/CommonService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 140eacd..b0f21c5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -189,7 +189,7 @@
     public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto){
         LocMast targetLocMast = null;
         //鏌ヨ鐩稿悓鐗╂枡
-        List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
+        List<String> locNos = locDetlService.getSameDetlList2(findLocNoAttributeVo.getOrderNo(),findLocNoAttributeVo.getAreaId());
         for (String locNo : locNos) {
             //鑾峰彇閫氶亾缁�
             List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
@@ -226,6 +226,7 @@
                         .eq("loc_sts", "O")
                         .eq("lev1", lev)
                         .eq("loc_type1",locTypeDto.getLocType1())
+                        .eq("loc_type2",findLocNoAttributeVo.getAreaId())
                         .orderBy("bay1", true)
                         .orderBy("row1",true));
                 for (LocMast locMast : locMasts) {

--
Gitblit v1.9.1