Merge branch 'refs/heads/intex_online20250427' into intex

sql/release_202405/intex_wms_202410.sql

@@ -2023,4 +2023,6 @@ update system_dict_data set `status`='0' where dict_type='count_scope_type' and
 ALTER TABLE `record_scrap_main` ADD `duty_dept` VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT null COMMENT '责任人部门' AFTER `duty`;
 -- 去掉唯一索引，顺引收货没有单据号
 ALTER TABLE infra_outer_api_his DROP INDEX number_available;
-CREATE INDEX number ON infra_outer_api_his(number);
+CREATE INDEX number ON infra_outer_api_his(number);
+-- 配置文件添加导入对账单明细分摊物料类型
+INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `item_type`, `area_type`, `inventory_status`, `location_code`) VALUES (null, '业务取值', 2, '客户对账单物料分摊类型', 'CustomerStatementItemCodeStatus', 'A', b'1', '可以分摊的物料类型多个类型用逗号分隔', '1', '2025-04-23 17:39:08', '1', '2025-04-23 17:39:08', b'0', NULL, NULL, NULL, NULL);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerStatement/CustomerToolApportStatementDetailServiceImpl.java

@@ -398,7 +398,7 @@ public class CustomerToolApportStatementDetailServiceImpl implements CustomerToo
             list.add(en.getArticleNumber());
         }
         //根据传入的品号从对账单里查询该品号下物料总数量汇总
-        ConfigInfoVO configInfoVO = configApi.queryConfigInfoByKey("purchasePlanAuto");
+        ConfigInfoVO configInfoVO = configApi.queryConfigInfoByKey("CustomerStatementItemCodeStatus");
         Set<String> objects = new HashSet<>();
         Set<String> itemStatus = new HashSet<>();//对账单中可以分摊物料类型
         String[] split = configInfoVO.getValue().split(",");//选择分摊的物料类型