UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

非集采单据是否拆单问题

Browse Source
busUser
anthonywj 2 years ago
parent 35ac5d4146
commit 98beb54b33
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File

22
api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java
Unescape Escape View File

@ -677,6 +677,8 @@ public class InvProductsTrService {
if (useInList.size() <= 0) { if (useInList.size() <= 0) {
return; return;
} }
boolean gpropBuySplit = Integer.parseInt(systemParamConfigService.selectValueByParamKey("gpropBuySplit")) > 0;
//采购入库生成单据 //采购入库生成单据
Map<String, List<WarehouseEntity>> filterSupMaps = new HashMap<>(); Map<String, List<WarehouseEntity>> filterSupMaps = new HashMap<>();
List<WarehouseEntity> unkonwCorpList = new ArrayList<>(); List<WarehouseEntity> unkonwCorpList = new ArrayList<>();
@ -704,15 +706,19 @@ public class InvProductsTrService {
Map<String, List<WarehouseEntity>> splitArray = new HashMap<>(); Map<String, List<WarehouseEntity>> splitArray = new HashMap<>();
//开始过滤集采非集采产品 //开始过滤集采非集采产品
for (WarehouseEntity warehouseEntity : temps) { for (WarehouseEntity warehouseEntity : temps) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId()); if (gpropBuySplit) {
if (udiRelevanceEntity.isGroupBuy()) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId());
String key = warehouseEntity.getRelId() + warehouseEntity.getBatchNo(); if (udiRelevanceEntity.isGroupBuy()) {
List<WarehouseEntity> warehouseEntities = splitArray.get(key); String key = warehouseEntity.getRelId() + warehouseEntity.getBatchNo();
if (CollUtil.isEmpty(warehouseEntities)) { List<WarehouseEntity> warehouseEntities = splitArray.get(key);
warehouseEntities = new ArrayList<>(); if (CollUtil.isEmpty(warehouseEntities)) {
splitArray.put(key, warehouseEntities); warehouseEntities = new ArrayList<>();
splitArray.put(key, warehouseEntities);
}
warehouseEntities.add(warehouseEntity);
} else {
buildArray.add(warehouseEntity);
} }
warehouseEntities.add(warehouseEntity);
} else { } else {
buildArray.add(warehouseEntity); buildArray.add(warehouseEntity);
} }

39
api-admin/src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -23,20 +23,25 @@ VALUES (20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，
-- 创建表时必须 create table if not exists 表名 -- 创建表时必须 create table if not exists 表名
create table if not exists `io_code_lost` ( create table if not exists `io_code_lost`
`id` int NOT NULL AUTO_INCREMENT, (
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码', `id` int NOT NULL AUTO_INCREMENT,
`batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码',
`produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
`expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
`serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
`supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新供应商', `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
`createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新供应商',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '扫码缺失字段信息补齐表' ROW_FORMAT = DYNAMIC; PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
AUTO_INCREMENT = 3
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COMMENT = '扫码缺失字段信息补齐表'
ROW_FORMAT = DYNAMIC;
CALL Pro_Temp_ColumnWork('basic_bustype_local', 'preInBack', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bustype_local', 'preInBack', 'tinyint', 1);
@ -46,6 +51,10 @@ CALL Pro_Temp_ColumnWork('io_order_detail', 'realCount', 'int', 1);
CALL Pro_Temp_ColumnWork('auth_user', 'lastUpdatePwdTime', 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_user', 'lastUpdatePwdTime', 'datetime ', 1);
INSERT ignore INTO `system_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`, `paramExplain`)
VALUES (20019, 0, '非集采单据是否拆单', 'gpropBuySplit', '1', 1, 0, '1:是，0：否');

Write Preview
Loading…
Cancel
Save