From ec583e53bb8f1f79f48063c48d554fa895e321a6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 02 一月 2024 10:14:29 +0800
Subject: [PATCH] 四项库出库作业 出库相同物料不同料箱号报错bug修复 新增平库无组托上架功能

---
 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 2d3a845..d8bb4a7 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -57,7 +57,7 @@
         for (LocDetlAdjust adjust : list) {
             boolean exit = false;
             for (LocDetlAdjust copy : copyList) {
-                if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
+                if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch()) && Cools.eq(adjust.getSuppCode(),copy.getSuppCode()) && Cools.eq(adjust.getThreeCode(),copy.getThreeCode()) && Cools.eq(adjust.getDeadTime(),copy.getDeadTime())) {
                     copy.setCount(copy.getCount() + adjust.getCount());
                     exit = true;
                     break;

--
Gitblit v1.9.1