Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -3,7 +3,6 @@ package com.glxp.api.controller.collect;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.service.collect.IoCollectOriginService;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -773,12 +773,12 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
 
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-                }
+//                }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-                }
+//                }
                 //计算实际数量
                 if (bussinessTypeEntity.isUse()) {
                     codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
@@ -1185,12 +1185,12 @@ public class IoCodeTempController extends BaseController {
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-                }
+//                }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-                }
+//                }
                 //计算实际数量
 
                 if (bussinessTypeEntity.isUse()) {
@@ -2147,12 +2147,12 @@ public class IoCodeTempController extends BaseController {
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-                }
+//                }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-                }
+//                }
                 //计算实际数量
                 codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getActCount(udiRelevanceResponse));
             } else if (udiRelevanceResponses.size() == 0) {

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -127,4 +127,9 @@ public class CollectOrderBizResponse {
 
     private Integer autoResCount;
     private String replaceCode;
+
+    /**
+     * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足
+     */
+    private Integer autoTagStatus;
 }

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

@@ -209,7 +209,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
      */
     public void importOrder() {
         importUdi();
-        importPrescribe();
+        importPrescribe(null);
     }
 
     public void clearOrder() {
@@ -349,19 +349,15 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     }
 
 
-    public void importPrescribe() {
+    public void importPrescribe(List<BasicSkPrescribeEntity> basicSkPrescribeEntities) {
         //下载处方
-        List<BasicSkPrescribeEntity> basicSkPrescribeEntities = basicSkPrescribeService.list();
+        if (CollUtil.isNotEmpty(basicSkPrescribeEntities))
+            basicSkPrescribeEntities = basicSkPrescribeService.list();
         List<SysWorkplaceResponse> allWorksList = new ArrayList<>();
-        List<IoCollectOrder> collectOrderList = new ArrayList<>();
         for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
-//            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr()));
-//            if (collectBustypeEntity == null)
-//                continue;
             if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) {
                 continue;
             }
-
             SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(basicSkPrescribeEntity.getAddr());
             if (sysWorkplaceDocumentEntity == null)
                 continue;
@@ -399,7 +395,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .fromType("HIS系统")
                     .fromCorp(basicSkPrescribeEntity.getSickerCode())
                     .workPlaceCode(defaultWorkplace[0])
-                    .billTime(MsDateUtil.localToDate(basicSkPrescribeEntity.getCreateTime()))
+                    .billTime(MsDateUtil.localToDate(basicSkPrescribeEntity.getPrescribeDate()))
                     .createTime(new Date())
                     .createUser(basicSkPrescribeEntity.getCreateUser())
                     .backupOrderRemark1(basicSkPrescribeEntity.getStooutNo())
@@ -411,17 +407,12 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             if (collectOrder.getWorkPlaceCode() != null) {
                 collectOrder.setTagStatus(1);
             }
-//            collectOrderList.add(collectOrder);
             save(collectOrder);
             List<BasicSkPrescribeItemEntity> basicSkPrescribeItemEntities = basicSkPrescirbeDetailService.findByPrescribeNum(basicSkPrescribeEntity.getCode());
             List<IoCollectOrderBiz> collectOrderBizs = new ArrayList<>();
             for (BasicSkPrescribeItemEntity bizEntity : basicSkPrescribeItemEntities) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getRelId() + "");
-
                 double doubleValue = Double.parseDouble(bizEntity.getMeasureCount());
-
-                // 将double转换为int，这将截断小数部分
-                int intValue = (int) doubleValue;
                 IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo())
                         .relId(bizEntity.getRelId())
                         .thrCode(bizEntity.getItemCode())
@@ -451,17 +442,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             }
 
         }
-//        if (CollUtil.isNotEmpty(collectOrderList)) {
-//            saveBatch(collectOrderList);
-//        }
-//        Map<Long, SysWorkplaceResponse> sysWorkplaceMap = new HashMap<>();
-//        for (SysWorkplaceResponse sysWorkplace : allWorksList) {
-//            sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace);
-//        }
-//        for (SysWorkplaceResponse value : sysWorkplaceMap.values()) {
-//            splitFifoCodeService.preAllotInv(value.getWorkplaceId());
-//        }
-
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -537,7 +517,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 .eq(IoCollectOrder::getId, collectOrderRequest.getId()).update();
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void finishOrder(CollectOrderRequest collectOrderRequest) {
         IoCollectOrder collectOrder = new IoCollectOrder();
         BeanUtils.copyProperties(collectOrderRequest, collectOrder);

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

@@ -34,6 +34,8 @@ public class IoCollectOriginService {
     BasicSkPrescribeService basicSkPrescribeService;
     @Resource
     BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
+    @Resource
+    IoCollectOrderService collectOrderService;
 
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
 
@@ -68,9 +70,11 @@ public class IoCollectOriginService {
                     basicSkPrescribeEntities.add(basicSkPrescribeEntity);
                     basicSkPrescribeService.saveOrUpdate(basicSkPrescribeEntity);
                 });
+                collectOrderService.importPrescribe(basicSkPrescribeEntities);
+                return ResultVOUtils.success("下载成功");
             }
         }
+        return ResultVOUtils.error("下载失败");
 
-        return ResultVOUtils.success("下载成功");
     }
 }

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

@@ -392,6 +392,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount()));
                         splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
                         splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())));
+                        splitFifoInvService.updateById(splitFifoInv);
                     }
 
                 } else {
@@ -409,6 +410,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - removeCount);
                         splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
                         splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())));
+                        splitFifoInvService.updateById(splitFifoInv);
                     }
                 }
             }
@@ -546,6 +548,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitCodeEntity.getTotalCount()));
                 splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
                 splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())));
+                splitFifoInvService.updateById(splitFifoInv);
             }
             if (count >= needCount) {
                 break;

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

@@ -54,12 +54,14 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         List<IoSplitFifoCodeEntity> splitFifoCodeEntities =
                 list(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
                         .eq(IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
-                        .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType)
+
                         .eq(IoSplitFifoCodeEntity::getRelId, relId)
                         .eq(StrUtil.isNotEmpty(batchNo), IoSplitFifoCodeEntity::getBatchNo, batchNo)
                         .orderByAsc(IoSplitFifoCodeEntity::getInBactchNo)
                 );
 
+//        暂时不穿todo
+//           .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType)
         return splitFifoCodeEntities;
     }
 
@@ -210,8 +212,24 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         IoSplitFifoInvRequest ioSplitFifoInvRequest = new IoSplitFifoInvRequest();
         ioSplitFifoInvRequest.setWorkPlaceCode(workPlaceCode);
         List<IoSplitInvResponse> ioSplitInvResponses = splitFifoInvService.filterList(ioSplitFifoInvRequest);
-        if (CollUtil.isEmpty(ioSplitInvResponses)) return false;
+        if (CollUtil.isEmpty(ioSplitInvResponses)){
-        Map<Long, List<IoSplitInvResponse>> splitInvMap = ioSplitInvResponses.stream().collect(Collectors.groupingBy(IoSplitInvResponse::getRelId));
+            collectOrderMapper.updateInvAlert(order.getId(), 2);
+
+            if (CollUtil.isNotEmpty(bizList)) {
+                for (int i = 0; i < bizList.size(); i++) {
+                    CollectOrderBizResponse collectOrderBizResponse = bizList.get(i);
+                    Integer count = 0;
+                    if (IntUtil.value(collectOrderBizResponse.getAutoResCount()) < 0) {
+                        count = 0 - IntUtil.value(collectOrderBizResponse.getAutoResCount());
+                    } else {
+                        count = collectOrderBizResponse.getCount();
+                    }
+                    collectOrderBizMapper.updateAutoResCount(collectOrderBizResponse.getId(), -count);
+                }
+            }
+            return false;
+        }
+        Map<Long, List<IoSplitInvResponse>> splitInvMap = ioSplitInvResponses.stream().filter(item -> item.getRelId() != null).collect(Collectors.groupingBy(IoSplitInvResponse::getRelId));
 
         if (CollUtil.isNotEmpty(bizList)) {
             if (lockType == 1) {