From 2b0a582a5a5971249b39516ee8eaacb9b14f2f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 3 Feb 2026 10:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E9=80=BB?=
=?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MaterialInventoryMapper.xml | 40 +++++--------------
1 file changed, 10 insertions(+), 30 deletions(-)
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index 4a0019a6e..10d781f3f 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -690,6 +690,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN material_base_info b on a.material_base_info_id = b.material_base_info_id
WHERE
a.del_flag = 1 AND b.shipper_id = #{shipperId} AND a.organization_id = #{organizationId}
+ AND TRUNC(a.EXT_ATTR_4) = TRUNC(#{extAttr4})
+ AND TRUNC(a.EXT_ATTR_3) = TRUNC(#{extAttr3})
+ AND TRUNC(a.inventory_date) = TRUNC(#{inventoryDate})
+ AND TRUNC(a.EXPIRY_DATE) = TRUNC(#{expiryDate})
+ AND TRUNC(a.PRODUCTION_DATE) = TRUNC(#{productionDate})
+ AND a.EXT_ATTR_2 = #{extAttr2}
+ AND a.EXT_ATTR_1 = #{extAttr1}
+ AND a.BOX_PALLET_NO = #{boxPalletNo}
+ AND a.SHEET_REF_NO = #{sheetRefNo}
+ AND a.BATCH_REF_NO = #{batchRefNo}
AND a.material_base_info_id = #{materialBaseInfoId}
@@ -702,36 +712,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND a.storage_location_id = #{storageLocationId}
-
- AND TRUNC(a.EXT_ATTR_4) = TRUNC(#{extAttr4})
-
-
- AND TRUNC(a.EXT_ATTR_3) = TRUNC(#{extAttr3})
-
-
- AND TRUNC(a.inventory_date) = TRUNC(#{inventoryDate})
-
-
- AND TRUNC(a.EXPIRY_DATE) = TRUNC(#{expiryDate})
-
-
- AND TRUNC(a.PRODUCTION_DATE) = TRUNC(#{productionDate})
-
-
- AND a.EXT_ATTR_2 = #{extAttr2}
-
-
- AND a.EXT_ATTR_1 = #{extAttr1}
-
-
- AND a.BOX_PALLET_NO = #{boxPalletNo}
-
-
- AND a.SHEET_REF_NO = #{sheetRefNo}
-
-
- AND a.BATCH_REF_NO = #{batchRefNo}
-