定值代码修改为业务配置参数

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalancePageReqVO.java

@@ -114,4 +114,6 @@ public class BalancePageReqVO extends PageParam {
      */
     private String businessType;
 
+    private String itemType;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
+import com.win.module.infra.vo.ConfigInfoVO;
 import com.win.module.wms.controller.balance.vo.BalanceCreateReqVO;
 import com.win.module.wms.controller.balance.vo.BalanceExportReqVO;
 import com.win.module.wms.controller.balance.vo.BalancePageReqVO;
@@ -365,14 +366,12 @@ public interface BalanceMapper extends BaseMapperX<BalanceDO> {
                 .eqIfPresent(BalanceDO::getAreaType, reqVO.getAreaType())
                 .eqIfPresent(BalanceDO::getPackUnit, reqVO.getPackUnit())
                 .eqIfPresent(BalanceDO::getPackQty, reqVO.getPackQty())
-                .inSql(BalanceDO::getItemCode,"select code from basic_itembasic where type in ('FG','SEMI')")
+                .inSql(BalanceDO::getItemCode,"select code from basic_itembasic where type in ("+reqVO.getItemType()+")")
                 .orderByDesc(BalanceDO::getId));
         return page;
     }
 
-    default PageResult<BalanceDO> selectSeniorItems(CustomConditions conditions) {
+    default PageResult<BalanceDO> selectSeniorItems(CustomConditions conditions,QueryWrapper<BalanceDO> queryWrapper) {
-        QueryWrapper<BalanceDO> queryWrapper = QueryWrapperUtils.structure(conditions);
-        queryWrapper.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')");
         return selectPage(conditions, queryWrapper);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
+import com.win.module.infra.api.config.ConfigApi;
+import com.win.module.infra.vo.ConfigInfoVO;
 import com.win.module.system.api.dict.DictDataApi;
 import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.user.AdminUserApi;
@@ -78,6 +80,8 @@ public class BalanceServiceImpl implements BalanceService {
     private LocationMapper locationMapper;
     @Resource
     private BusinesstypeService businesstypeService;
+    @Resource
+    private ConfigApi configApi;
 
 
     @Override
@@ -318,12 +322,28 @@ public class BalanceServiceImpl implements BalanceService {
 
     @Override
     public PageResult<BalanceDO> getBalanceItemsPage(BalancePageReqVO pageVO) {
+        ConfigInfoVO configInfoVO = configApi.queryConfigInfoByKey("getBalanceItemsPage");
+        StringBuilder type = new StringBuilder();
+        String[] itemTypes = configInfoVO.getItemType().split(",");
+        for(int i=0;i<itemTypes.length;i++) {
+            type.append("'").append(itemTypes[i]).append("',");
+        }
+        pageVO.setItemType(type.substring(0, type.length() - 1));
         return balanceMapper.getBalanceItemsPage(pageVO);
     }
 
     @Override
     public PageResult<BalanceDO> getSeniroBalanceItemsPage(CustomConditions conditions) {
-        return balanceMapper.selectSeniorItems(conditions);
+        ConfigInfoVO configInfoVO = configApi.queryConfigInfoByKey("getBalanceItemsPage");
+        StringBuilder type = new StringBuilder();
+        String[] itemTypes = configInfoVO.getItemType().split(",");
+        for(int i=0;i<itemTypes.length;i++) {
+            type.append("'").append(itemTypes[i]).append("',");
+        }
+        String itemType = type.substring(0, type.length() - 1);
+        QueryWrapper<BalanceDO> queryWrapper = QueryWrapperUtils.structure(conditions);
+        queryWrapper.inSql("item_code","select code from basic_itembasic where type in ("+itemType+")");
+        return balanceMapper.selectSeniorItems(conditions,queryWrapper);
     }
 
     @Override