Merge remote-tracking branch 'origin/dev_2.5_mutiscan' into dev_2.5_mutiscan

# Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

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

@@ -73,7 +73,7 @@ public class IoCollectOrderBackupController extends BaseController {
 //            }
 //            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
 //        }
-        log.error("collectOrderRequest"+collectOrderRequest);
+        log.error("collectOrderRequest" + collectOrderRequest);
         List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
         PageInfo<IoCollectOrderResponse> pageInfo = new PageInfo<>(orderResponses);
         PageSimpleResponse<IoCollectOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -127,6 +127,7 @@ public class IoCollectOrderBackupController extends BaseController {
         }
         return ResultVOUtils.success();
     }
+
     @Resource
     private ErpBasicClient erpBasicClient;
     /**
@@ -137,6 +138,7 @@ public class IoCollectOrderBackupController extends BaseController {
      */
     @Resource
     private IoCollectOrderBackupMapper ioCollectOrderBackupMapper;
+
     @PostMapping("/udiwms/basic/collect/order/orderMedicalDelete")
     public BaseResponse orderMedicalDelete(@RequestBody CollectOrderRequest collectOrderRequest) {
         PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest = new PostOrderMedicalDeleteRequest();
@@ -148,12 +150,13 @@ public class IoCollectOrderBackupController extends BaseController {
             IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
             ioCollectOrderBackup.setUploadStatus(4);
             ioCollectOrderBackupMapper.update(
-                    ioCollectOrderBackup,new QueryWrapper<IoCollectOrderBackup>().eq("billNo",collectOrderRequest.getBillNo())
+                    ioCollectOrderBackup, new QueryWrapper<IoCollectOrderBackup>().eq("billNo", collectOrderRequest.getBillNo())
             );
         }
 
         return baseResponse;
     }
+
     /**
      * 通过业务外键获取码明细
      *
@@ -223,7 +226,7 @@ public class IoCollectOrderBackupController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
-        if (StrUtil.isNotEmpty(collectOrderRequest.getBillNo())){
+        if (StrUtil.isNotEmpty(collectOrderRequest.getBillNo())) {
             collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
         }
         if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())){
@@ -240,7 +243,6 @@ public class IoCollectOrderBackupController extends BaseController {
     }
 
 
-
     @PostMapping("/udiwms/basic/collect/orderFinish/orderStats")
     public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) {
         List<Long> workPlaceCodes = null;

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

@@ -692,6 +692,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
     @Transactional(rollbackFor = Exception.class)
     public void finishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin, Boolean isAuto) {
+        IoCollectSet collectSet = collectSetService.getSet();
         IoCollectOrder collectOrder = new IoCollectOrder();
         BeanUtils.copyProperties(collectOrderRequest, collectOrder);
         collectOrder.setTagStatus(3);
@@ -739,9 +740,10 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(), collectOrderRequest.getIsCheckFinish());
         //删除原来单据
         removeOrderByBillNo(finalCollectOrder);
-
-        //校验拆零是否都已赋码
-        splitCodeService.delaySplitVail(ioCollectOrderBackup);
+        if (IntUtil.value(collectSet.getDelayTageCode()) && sysWorkplaceDocumentEntity.getDocumentTypeCode().startsWith("YPCF")) {
+            //校验拆零是否都已赋码
+            splitCodeService.delaySplitVail(ioCollectOrderBackup);
+        }
 
         //更新数据至第三方系统
         //单据更新

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

@@ -300,7 +300,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             filterUdiRelRequest.setPackLevel("1");
             //todo  后面可以 没有搜索到层级为1的
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectOneUdi(filterUdiRelRequest);
-            if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0) {
+            if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0 && IntUtil.value(collectSet.getNoCodeScan())) {
                 collectOrderBiz.setTagStatus(4);//无需扫码
                 collectOrderBizService.updateById(collectOrderBiz);
                 continue;