From 1cf989fe2bca64098e3bcfa073ab30a4cd09f077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 18 Mar 2026 21:22:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bms2=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettlementCustomersApplicationService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java index 4b84de622..544c25154 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -288,6 +289,7 @@ public class SettlementCustomersApplicationService { saveEntity.setMainRole(1); saveEntity.setCustomerTypeCode("customer"); //从货主同步过来的 默认客户 saveEntity.setNcCode(userShipperPo.getCustomerNcCode()); + saveEntity.setCreateTime(new Date()); // Set the create time to the current date and time Long settlementEntityId = saveEntity.getSettlementEntityId(); List settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper().eq(SettlementCustomers::getSettlementEntityId, settlementEntityId)); if(settlementCustomers != null && settlementCustomers.size() > 0){ @@ -319,6 +321,7 @@ public class SettlementCustomersApplicationService { saveEntity.setSettlementMethodCode("monthly_settle"); saveEntity.setMainRole(1); saveEntity.setCustomerTypeCode("customer"); + saveEntity.setCreateTime(new Date()); // Set the create time to the current date and time Long settlementEntityId = saveEntity.getSettlementEntityId(); List settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper().eq(SettlementCustomers::getSettlementEntityId, settlementEntityId)); if(settlementCustomers != null && settlementCustomers.size() > 0){ From 399ca51d6405c70403611aef12932ac651823a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 18 Mar 2026 21:45:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?PDA=E5=AE=B9=E5=99=A8=E7=A7=BB=E4=BD=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/materialInventory/MaterialInventoryMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 7c08de2ad..def9d146e 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -180,6 +180,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.freeze_quantity > 0 + + and IFNULL(a.freeze_quantity, 0) = 0 + + and a.create_by_name like concat('%', #{createByName}, '%') From eb01e42af6c726997585a03f1789bb5376e6f946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 18 Mar 2026 21:52:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?PDA=E5=AE=B9=E5=99=A8=E7=A7=BB=E4=BD=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/materialInventory/MaterialInventoryMapper.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index def9d146e..1c872ecdd 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -177,9 +177,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.freeze_quantity = #{freezeQuantity} - - and a.freeze_quantity > 0 - and IFNULL(a.freeze_quantity, 0) = 0 From bc52d57a7fab6bf6dca886bcf5d0b4b8de633558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 18 Mar 2026 22:01:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=93=E5=AD=98BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/materialInventory/MaterialInventoryMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 1c872ecdd..80d3a9cf1 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -177,9 +177,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.freeze_quantity = #{freezeQuantity} - - and IFNULL(a.freeze_quantity, 0) = 0 - and a.create_by_name like concat('%', #{createByName}, '%') @@ -375,6 +372,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and IFNULL(a.freeze_quantity, 0) = 0 +