pms 选择物料 编码 名称 模糊搜索

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialController.java

@@ -9,9 +9,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialSaveReqVO;
-import cn.iocoder.yudao.module.pms.convert.iotlockstock.IotLockStockConvert;
 import cn.iocoder.yudao.module.pms.convert.iotmainworkorderbommaterial.IotWorkOrderBomMaterialConvert;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotlockstock.IotLockStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialDO;
 import cn.iocoder.yudao.module.pms.service.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialService;
 import cn.iocoder.yudao.module.system.api.saporg.SapOrgApi;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialMapper.java

@@ -56,5 +56,7 @@ public interface IotMainWorkOrderBomMaterialMapper extends BaseMapperX<IotMainWo
                                                                    @Param("parentDept") Long parentDept, @Param("materialCodes") List<String> materialCodes,
                                                                      @Param("factoryIds") Set<Long> factoryIds,
                                                                      @Param("costCenterIds") Set<Long> costCenterIds,
-                                                                     @Param("stockLocationIds") Set<Long> stockLocationIds);
+                                                                     @Param("stockLocationIds") Set<Long> stockLocationIds,
+                                                                     @Param("materialName") String materialName,
+                                                                     @Param("materialCode") String materialCode);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialServiceImpl.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.pms.service.iotmainworkorderbommaterial;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -19,7 +18,6 @@ import cn.iocoder.yudao.module.pms.service.iotcommonbommaterial.IotCommonBomMate
 import cn.iocoder.yudao.module.system.api.dept.DeptSapOrgApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptSapOrgRespDTO;
 import cn.iocoder.yudao.module.system.api.saporg.SapOrgApi;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -151,7 +149,8 @@ public class IotMainWorkOrderBomMaterialServiceImpl implements IotMainWorkOrderB
         }
         IPage<IotMainWorkOrderBomMaterialRespVO> iotMaintainMaterialDOIPage =
                 iotMainWorkOrderBomMaterialMapper.selectMaterialsBySapOrg(Page.of(pageReqVO.getPageNo(), pageReqVO.getPageSize()),
-                        pageReqVO.getDeptId(), null, materialCodes, factoryIds, costCenterIds, stockLocationIds);
+                        pageReqVO.getDeptId(), null, materialCodes, factoryIds, costCenterIds, stockLocationIds,
+                        pageReqVO.getMaterialName(), pageReqVO.getMaterialCode());
         List<IotMainWorkOrderBomMaterialRespVO> materials = iotMaintainMaterialDOIPage.getRecords();
         if (CollUtil.isNotEmpty(materials)) {
             for (IotMainWorkOrderBomMaterialRespVO material : materials) {

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotWorkOrderMaterialMapper.xml

@@ -37,6 +37,12 @@
                 #{key}
             </foreach>
         </if>
+        <if test="materialName!=null and materialName!=''">
+            AND lo.material_name LIKE concat(concat("%",#{materialName}),"%")
+        </if>
+        <if test="materialCode!=null and materialCode!=''">
+            AND lo.material_code LIKE concat(concat("%",#{materialCode}),"%")
+        </if>
 
         UNION ALL
         -- 本地库存物料
@@ -72,6 +78,12 @@
                 #{key}
             </foreach>
         </if>
+        <if test="materialName!=null and materialName!=''">
+            AND lo.material_name LIKE concat(concat("%",#{materialName}),"%")
+        </if>
+        <if test="materialCode!=null and materialCode!=''">
+            AND lo.material_code LIKE concat(concat("%",#{materialCode}),"%")
+        </if>
 
         UNION ALL
 
@@ -108,6 +120,12 @@
                 #{key}
             </foreach>
         </if>
+        <if test="materialName!=null and materialName!=''">
+            AND sap.material_name LIKE concat(concat("%",#{materialName}),"%")
+        </if>
+        <if test="materialCode!=null and materialCode!=''">
+            AND sap.material_code LIKE concat(concat("%",#{materialCode}),"%")
+        </if>
 
         UNION ALL
         -- sap库存物料
@@ -143,6 +161,12 @@
                 #{key}
             </foreach>
         </if>
+        <if test="materialName!=null and materialName!=''">
+            AND sap.material_name LIKE concat(concat("%",#{materialName}),"%")
+        </if>
+        <if test="materialCode!=null and materialCode!=''">
+            AND sap.material_code LIKE concat(concat("%",#{materialCode}),"%")
+        </if>
 
     </select>
 </mapper>