diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
index 67845fb2f..afc981936 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and material_base_info_id in (SELECT
DISTINCT material_base_info_id
- FROM test_szwl_wms.material_inventory
+ FROM ngwl_test_wms.material_inventory
WHERE
allocation_quantity > 0
AND del_flag = 1)
@@ -178,6 +178,118 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+ and organization_id = #{organizationId}
+
+
+ and organization_name like concat('%', #{organizationName}, '%')
+
+
+ and top_organization_id = #{topOrganizationId}
+
+
+ and shipper_id = #{shipperId}
+
+
+ and shipper_name like concat('%', #{shipperName}, '%')
+
+
+ and material_code = #{materialCode}
+
+
+ and material_name like concat('%', #{materialName}, '%')
+
+
+ and bar_code = #{barCode}
+
+
+ and material_classify_code = #{materialClassifyCode}
+
+
+ and material_classify_name like concat('%', #{materialClassifyName}, '%')
+
+
+ and material_type = #{materialType}
+
+
+ and material_type_name like concat('%', #{materialTypeName}, '%')
+
+
+ and unit_code = #{unitCode}
+
+
+ and unit_name like concat('%', #{unitName}, '%')
+
+
+ and pack_id = #{packId}
+
+
+ and pack_code = #{packCode}
+
+
+ and pack_name like concat('%', #{packName}, '%')
+
+
+ and brand_id = #{brandId}
+
+
+ and brand_code = #{brandCode}
+
+
+ and brand_name like concat('%', #{brandName}, '%')
+
+
+ and shelf_life = #{shelfLife}
+
+
+ and weight_limit = #{weightLimit}
+
+
+ and volume_limit = #{volumeLimit}
+
+
+ and material_shape = #{materialShape}
+
+
+ and material_shape_name like concat('%', #{materialShapeName}, '%')
+
+
+ and material_size = #{materialSize}
+
+
+ and material_length = #{materialLength}
+
+
+ and material_width = #{materialWidth}
+
+
+ and material_height = #{materialHeight}
+
+
+ and nullify = #{nullify}
+
+
+ and create_by_name like concat('%', #{createByName}, '%')
+
+
+ and update_by_name like concat('%', #{updateByName}, '%')
+
+
+
+ and common = #{common}
+ and (
+ 1 = 1
+ or common = 1 )
+
+
+ and del_flag = #{delFlag}
+ and del_flag = 1
+
+
+
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
index 37aac16d1..af2a0622b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
@@ -1,5 +1,6 @@
package com.mhd.wms.application.service.materialBaseInfo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.materialBarCode.service.MaterialBarCodeDomainService;
@@ -8,12 +9,16 @@ import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO;
import com.mhd.wms.domain.materialBaseInfo.service.MaterialBaseInfoDomainService;
import com.mhd.wms.domain.materialCommon.repository.todo.MaterialCommonDO;
import com.mhd.wms.domain.materialCommon.service.MaterialCommonDomainService;
+import com.mhd.wms.domain.materialGoodsRule.entity.MaterialGoodsRule;
+import com.mhd.wms.domain.materialGoodsRule.repository.mapper.MaterialGoodsRuleMapper;
+import com.mhd.wms.domain.materialGoodsRule.repository.po.MaterialGoodsRulePO;
import com.mhd.wms.domain.materialGoodsRule.repository.todo.MaterialGoodsRuleDO;
import com.mhd.wms.domain.materialGoodsRule.service.MaterialGoodsRuleDomainService;
import com.mhd.wms.domain.materialInventoryWarning.service.MaterialInventoryWarningDomainService;
import com.mhd.wms.domain.materialWarehouseControl.repository.todo.MaterialWarehouseControlDO;
import com.mhd.wms.domain.materialWarehouseControl.service.MaterialWarehouseControlDomainService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +47,8 @@ public class MaterialBaseInfoApplicationService {
@Autowired
private MaterialBarCodeDomainService materialBarCodeDomainService;
+ @Autowired
+ private MaterialGoodsRuleMapper materialGoodsRuleMapper;
/**
* 分页查询物料基础信息列表
@@ -55,7 +62,18 @@ public class MaterialBaseInfoApplicationService {
materialBaseInfoDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
}
}
- return materialBaseInfoDomainService.queryList(materialBaseInfoDO);
+ List materialBaseInfoPOS = materialBaseInfoDomainService.queryList(materialBaseInfoDO);
+ for (MaterialBaseInfoPO materialBaseInfoPO : materialBaseInfoPOS) {
+ MaterialGoodsRule materialGoodsRules = materialGoodsRuleMapper.selectOne(new LambdaQueryWrapper()
+ .eq(MaterialGoodsRule::getMaterialBaseInfoId, materialBaseInfoPO.getMaterialBaseInfoId())
+ .eq(MaterialGoodsRule::getDelFlag, 1));
+ if (materialGoodsRules != null){
+ MaterialGoodsRulePO materialGoodsRulePO = new MaterialGoodsRulePO();
+ BeanUtils.copyProperties(materialGoodsRules,materialGoodsRulePO);
+ materialBaseInfoPO.setMaterialGoodsRule(materialGoodsRulePO);
+ }
+ }
+ return materialBaseInfoPOS;
}