器械与药品上货，完成单据修改

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -3217,5 +3217,4 @@ public class IoCodeTempController extends BaseController {
     }
 
 
-
 }

src/main/java/com/glxp/api/controller/inout/IoSplitController.java

@@ -148,7 +148,12 @@ public class IoSplitController extends BaseController {
         if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) {
             collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
             //todo 后面改
+            if(sysWorkplaceDocumentEntity.getProductType() == 1){
+
+            }else {
                 splitCodeService.preAutoTagCode(collectOrder, null);
+            }
+
             collectOrderService.updateById(collectOrder);
             return ResultVOUtils.success("后台已开始赋码，请稍后刷新查看");
         } else {

src/main/java/com/glxp/api/controller/inout/WorkPutController.java

@@ -438,13 +438,6 @@ public class WorkPutController extends BaseController {
                 } else if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
                     return ResultVOUtils.error(500, "该产品不允许以使用单元入库！");
                 }
-
-//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-//                }
-//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-//                }
                 //计算实际数量
                 if (bussinessTypeEntity.isUse()) {
                     codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
@@ -501,28 +494,6 @@ public class WorkPutController extends BaseController {
                     return ResultVOUtils.error(500, "请先录入业务详情");
                 }
             }
-
-
-//            BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
-//            if (baseResponse != null) {
-//                deleteEmptyBillNo(orderEntity);
-//            }
-//            genDetaiEntity = codeEnttity;
-//            if (baseResponse == null) {
-//                baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
-//                if (baseResponse != null)
-//                    return baseResponse;
-//            } else {
-//                if (baseResponse.getCode() == 501) {
-//                    return baseResponse;
-//                } else if (baseResponse.getCode() == 502) {
-//                    return baseResponse;
-//                }
-//                checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
-//                return baseResponse;
-//            }
-
-
             //预出库退货校验队列库存
             if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
                 IoSplitFifoCodeEntity ioSplitFifoCodeEntity = splitFifoCodeService.findByCode(codeEnttity.getCode(), orderEntity.getWorkPlaceCode());

src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java

@@ -245,11 +245,11 @@ public class IoSplitCodeEntity implements Serializable {
     private String measname;
     @TableField(exist = false)
     private String manufactory;
-//    /**
+    /**
-//     * 医保编码，组套编码
+     * 医保编码，组套编码
-//     */
+     */
-//    @TableField(value = "ybbm")
+    @TableField(value = "ybbm")
-//    private String ybbm;
+    private String ybbm;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java

@@ -219,11 +219,11 @@ public class IoSplitFifoCodeEntity implements Serializable {
      */
     @TableField(value = "workPlaceQueueCode")
     private String workPlaceQueueCode;
-//    /**
+    /**
-//     * 医保编码，组套编码
+     * 医保编码，组套编码
-//     */
+     */
-//    @TableField(value = "ybbm")
+    @TableField(value = "ybbm")
-//    private String ybbm;
+    private String ybbm;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -584,20 +584,21 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             if (CollUtil.isNotEmpty(allotCollects)) {
                 saveBatch(allotCollects);
                 collectOrderBizService.saveBatch(allotCollectBizs);
-
+//                if (IntUtil.value(collectSet.getAutoFinishOrder())) {
-                if (IntUtil.value(collectSet.getAutoFinishOrder())) for (IoCollectOrder collectOrder : allotCollects) {
+//                    for (IoCollectOrder collectOrder : allotCollects) {
-                    SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(addr);
+//                        SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(addr);
-                    if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
+//                        if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
-                        boolean b = splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
+//                            boolean b = splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
-                        if (b && sysWorkplaceDocumentEntity.getAutoHandle()) {
+//                            if (b && sysWorkplaceDocumentEntity.getAutoHandle()) {
-                            //单据是否自动完成 是 调用 完成
+//                                //单据是否自动完成 是 调用 完成
-                            AuthAdmin user = customerService.getUserBean();
+//                                AuthAdmin user = customerService.getUserBean();
-                            collectOrderRequest.setUpdateUser(user.getId());
+//                                collectOrderRequest.setUpdateUser(user.getId());
-                            collectOrderRequest.setBusType(addr);
+//                                collectOrderRequest.setBusType(addr);
-                            finishOrder(collectOrderRequest, user, true);
+//                                finishOrder(collectOrderRequest, user, true);
-                        }
+//                            }
-                    }
+//                        }
-                }
+//                    }
+//                }
             }
         }
     }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -461,17 +461,6 @@ public class IoAddInoutService {
 
         List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo", "price").eq("orderIdFk", orderEntity.getBillNo()));
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId(), codeTempEntity.getSupId());
-//        if (StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode()) && CollUtil.isNotEmpty(ioOrderDetailCodeEntities)) {
-//            boolean isSame = false;
-//            for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : ioOrderDetailCodeEntities) {
-//                if (ioOrderDetailCodeEntity.getBindRlFk().equals(udiRelevanceResponse.getId())) {
-//                    isSame = true;
-//                }
-//            }
-//            if (!isSame)
-//                throw new JsonException(507, "上货产品不符！");
-//        }
-
         if (codeTempEntity.getPrice() == null && udiRelevanceResponse.getPrice() != null) {
             codeTempService.updateById(IoCodeTempEntity.builder().id(codeTempEntity.getId()).price(udiRelevanceResponse.getPrice()).build());
         }

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -97,6 +97,16 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         return ioSplitCodeEntities;
     }
 
+
+    public List<IoSplitCodeEntity> findSplitCodes(String ybbm, String batchNo, Long workPlaceCode) {
+        List<IoSplitCodeEntity> ioSplitCodeEntities = splitCodeMapper.selectList(new LambdaQueryWrapper<IoSplitCodeEntity>()
+                .eq(StrUtil.isNotEmpty(batchNo), IoSplitCodeEntity::getBatchNo, batchNo)
+                .eq(workPlaceCode != null, IoSplitCodeEntity::getWorkPlaceCode, workPlaceCode)
+                .gt(IoSplitCodeEntity::getRemainCount, 0)
+                .in(IoSplitCodeEntity::getStatus, 1, 2).orderByAsc(IoSplitCodeEntity::getInBactchNo));
+        return ioSplitCodeEntities;
+    }
+
     public IoSplitCodeEntity findByCode(String code, Long workPlaceCode) {
         if (workPlaceCode == null) {
             return null;
@@ -657,6 +667,44 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         collectOrderBizService.updateBatchById(collectOrderBizs);
     }
 
+    /**
+     * 单据预赋码
+     *
+     * @param collectOrder
+     */
+    public void preQxAutoTagCode(IoCollectOrder collectOrder, String queueCode) {
+        Long putWorkPlaceCode = null;
+        //获取上货工位
+        SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
+        if (sysWorkplacePutRel != null)
+            putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
+
+        List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
+        for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
+            List<IoSplitFifoCodeEntity> splitFifoCodeEntities =
+                    splitFifoCodeService.findByCheckCode(putWorkPlaceCode,
+                            collectOrderBiz.getYbbm(), collectOrderBiz.getBatchNo(), queueCode);
+            int total = splitFifoCodeEntities.stream()
+                    .mapToInt(IoSplitFifoCodeEntity::getTotalCount)
+                    .sum();
+            collectOrderBiz.setTempWorkPlaceCount(total);
+            List<IoSplitCodeEntity> splitCodeEntities = splitCodeService.findSplitCodes(collectOrderBiz.getRelId()
+                    , collectOrderBiz.getBatchNo(), putWorkPlaceCode);
+            int splitTotal = splitCodeEntities.stream()
+                    .mapToInt(IoSplitCodeEntity::getRemainCount)
+                    .sum();
+            collectOrderBiz.setTempSplitCount(splitTotal);
+            total = total + splitTotal;
+            if (total >= IntUtil.value(collectOrderBiz.getCount())) {
+                collectOrderBiz.setAutoTagStatus(2);
+            } else if (total > 0) {
+                collectOrderBiz.setAutoTagStatus(3);
+            } else
+                collectOrderBiz.setAutoTagStatus(1);
+        }
+        collectOrderBizService.updateBatchById(collectOrderBizs);
+    }
+
 
     /**
      * 拆零单据撤回，则将拆零表剩余数量加回预出库队列

src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java

@@ -68,9 +68,6 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
                         .eq(StrUtil.isNotEmpty(queueCode), IoSplitFifoCodeEntity::getWorkPlaceQueueCode, queueCode)
                         .orderByAsc(IoSplitFifoCodeEntity::getInBactchNo)
                 );
-
-//        暂时不穿todo
-//           .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType)
         return splitFifoCodeEntities;
     }
 
@@ -111,8 +108,6 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
             }
 
         }
-//        暂时不穿todo
-//           .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType)
         return splitFifoCodeEntities;
     }
 

src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java

@@ -99,10 +99,10 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     splitCodeEntity.setWorkPlaceCode(orderEntity.getWorkPlaceCode());
                     splitCodeEntity.setWorkPlaceQueueCode(orderEntity.getWorkPlaceQueueCode());
                     splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
-//                    UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(codeEntity.getRelId() + "");
+                    UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(codeEntity.getRelId() + "");
-//                    if (udiRelevanceResponse != null) {
+                    if (udiRelevanceResponse != null) {
-//                        splitCodeEntity.setYbbm(udiRelevanceResponse.getYbbm());
+                        splitCodeEntity.setYbbm(udiRelevanceResponse.getYbbm());
-//                    }
+                    }
                     splitCodeEntity.setBusType(orderEntity.getSplitBusType());
                     index++;
                     splitCodeEntity.setInBactchNo(System.currentTimeMillis() + index + "");

src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java

@@ -68,9 +68,12 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer {
                 });
     }
 
+    @Resource
+    IoCollectSetService collectSetService;
+
     private void process() {
         List<IoCollectOrder> list = collectOrderService.list(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getTagStatus, 1));
-
+        IoCollectSet collectSet = collectSetService.getSet();
         if (CollUtil.isNotEmpty(list)) {
             for (IoCollectOrder collectOrder : list) {
                 SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrder.getBusType());
@@ -84,7 +87,7 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer {
                     collectOrderRequest.setWorkPlaceCode(sysWorkplaceBus.getWorkplaceCode());
                     collectOrderRequest.setBusType(sysWorkplaceBus.getBusTypeCode());
                     collectOrderRequest.setBillNo(collectOrder.getBillNo());
-                    if (sysWorkplaceDocumentEntity.getAutoHandle()) {
+                    if (IntUtil.value(collectSet.getAutoFinishOrder())) {
                         //单据是否自动完成 是 调用 完成
                         AuthAdmin authAdmin = new AuthAdmin();
                         authAdmin.setId(1l);
@@ -94,8 +97,8 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer {
                         } catch (Exception e) {
                             log.error("自动完成第三方处方单异常", e);
                         }
-
                     }
+
                 }
             }
         }

src/main/resources/schemas/schema_v2.4.sql

@@ -5163,8 +5163,6 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow',
 
 
 
-
-
 CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount',
                          'int NULL DEFAULT NULL COMMENT ''入库码数量''',
                          1);
@@ -5268,7 +5266,8 @@ CREATE TABLE IF NOT EXISTS `sys_workplace_region`
 ALTER TABLE rel_code_batch
     MODIFY COLUMN `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '批次号';
 
-CREATE TABLE IF NOT EXISTS  `inv_product_batch` (
+CREATE TABLE IF NOT EXISTS `inv_product_batch`
+(
     `id`          int NOT NULL AUTO_INCREMENT,
     `inBatchNo`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '内部批号',
     `orderId`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '入库单号',
@@ -5286,7 +5285,9 @@ CREATE TABLE IF NOT EXISTS  `inv_product_batch` (
     `updateTime`  datetime                                                      DEFAULT NULL COMMENT '更新时间',
     `invCode`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '仓库编码',
     PRIMARY KEY (`id`) USING BTREE
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci;
 
 
 CALL Pro_Temp_ColumnWork('auth_company', 'auditComment',
@@ -5337,3 +5338,13 @@ CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'preInBillNo',
 CALL Pro_Temp_ColumnWork('sys_workplace', 'productType',
                          'tinyint NULL DEFAULT NULL COMMENT ''业务类型 1器械业务 2药品业务''',
                          1);
+
+
+
+CALL Pro_Temp_ColumnWork('io_split_fifo_code', 'ybbm',
+                         ' varchar(50) NULL DEFAULT NULL COMMENT ''医保编码''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_split_code', 'ybbm',
+                         ' varchar(50) NULL DEFAULT NULL COMMENT ''医保编码''',
+                         1);