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

@@ -127,7 +127,6 @@ public class IoCollectOrderBackupController extends BaseController {
         }
         return ResultVOUtils.success();
     }
-
     @Resource
     private ErpBasicClient erpBasicClient;
     /**
@@ -138,7 +137,6 @@ 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();
@@ -156,7 +154,6 @@ public class IoCollectOrderBackupController extends BaseController {
 
         return baseResponse;
     }
-
     /**
      * 通过业务外键获取码明细
      *
@@ -241,6 +238,7 @@ public class IoCollectOrderBackupController extends BaseController {
     }
 
 
+
     @PostMapping("/udiwms/basic/collect/orderFinish/orderStats")
     public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) {
         List<Long> workPlaceCodes = null;
@@ -253,4 +251,6 @@ public class IoCollectOrderBackupController extends BaseController {
     }
 
 
+
+
 }

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

@@ -692,7 +692,6 @@ 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);
@@ -740,10 +739,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(), collectOrderRequest.getIsCheckFinish());
         //删除原来单据
         removeOrderByBillNo(finalCollectOrder);
-        if (IntUtil.value(collectSet.getDelayTageCode()) && sysWorkplaceDocumentEntity.getDocumentTypeCode().startsWith("YPCF")) {
+
         //校验拆零是否都已赋码
         splitCodeService.delaySplitVail(ioCollectOrderBackup);
-        }
 
         //更新数据至第三方系统
         //单据更新

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

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