From 1621b79516ac72b9933dd2ea950fe4e267d8a3a7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 05 十二月 2023 20:03:41 +0800
Subject: [PATCH] bug修复 1.四项库入库时找到在库库位 2.四项库订单出库时没有匹配容器码导致报错 3.四项库转历史档失败

---
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f6b5c47..12add0c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -149,8 +149,8 @@
 
     public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode) {
         EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
-        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
         wrapper.eq("loc_no", locNo);
+        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
         if (anfme <= 0) {
             return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
         } else {
@@ -165,7 +165,7 @@
         if(Cools.isEmpty(condition)){
             wrapper.andNew().eq(column,"").or().isNull(column);
         }else {
-            wrapper.eq(column,condition);
+            wrapper.andNew().eq(column,condition);
         }
     }
 

--
Gitblit v1.9.1