非集采单据是否拆单问题

api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java

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

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -23,7 +23,8 @@ VALUES (20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，
 
 -- 创建表时必须  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码',
     `batchNo`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
@@ -36,7 +37,11 @@ create table if not exists `io_code_lost`  (
     `remark`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
     `nameCode`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '扫码缺失字段信息补齐表' ROW_FORMAT = DYNAMIC;
+) 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);
 
@@ -46,6 +51,10 @@ CALL Pro_Temp_ColumnWork('io_order_detail', 'realCount', 'int', 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：否');
+