weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-18 22:12:22 +08:00
parent 830f0c38ee bc52d57a7f
commit b7115fe3fe
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java
+3
View File
@@ -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> settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper<SettlementCustomers>().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> settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper<SettlementCustomers>().eq(SettlementCustomers::getSettlementEntityId, settlementEntityId));
if(settlementCustomers != null && settlementCustomers.size() > 0){
mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+4 -3
View File
@@ -177,9 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="freezeQuantity != null ">
and a.freeze_quantity = #{freezeQuantity}
</if>
<if test="greaterThanFreezeQuantity != null and greaterThanFreezeQuantity != ''">
and a.freeze_quantity > 0
</if>
<if test="createByName != null and createByName != ''">
and a.create_by_name like concat('%', #{createByName}, '%')
</if>
@@ -374,6 +372,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<include refid="selectMaterialInventoryPo1"/>
<include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
<if test="queryType != null and queryType == 0">
and IFNULL(a.freeze_quantity, 0) = 0
</if>
</where>
<include refid="materialQueryListByGroup"/>
</select>