From c46cd4204abb7f1b759324a99faafc34b26acb83 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 9 Apr 2025 10:58:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E7=A0=81=E6=8B=86=E9=9B=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupController.java  | 16 ++++++++--------
 .../api/service/inout/IoSplitCodeService.java    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
index d005d954b..d78a14dc3 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/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,10 +226,10 @@ 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())){
+        if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())) {
             collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getYbbm());
         }
         List<CollectOrderBizResponse> collectOrderBizResponses = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest);
@@ -238,19 +241,16 @@ public class IoCollectOrderBackupController extends BaseController {
     }
 
 
-
     @PostMapping("/udiwms/basic/collect/orderFinish/orderStats")
     public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) {
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
         // 上传医保不做登录权限限制
-        log.error("collectOrderRequest"+collectOrderRequest);
+        log.error("collectOrderRequest" + collectOrderRequest);
         Page<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterorderStatsList(collectOrderRequest);
 
         return ResultVOUtils.success(orderResponses);
     }
 
 
-
-
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 078f96d95..89e84ab41 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/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) {
+            if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0 && IntUtil.value(collectSet.getNoCodeScan())) {
                 collectOrderBiz.setTagStatus(4);//无需扫码
                 collectOrderBizService.updateById(collectOrderBiz);
                 continue;

From b6d705030f0fec12290d10adbacb6c7711c06e42 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 9 Apr 2025 20:25:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E5=90=8E=E7=BD=AE?=
 =?UTF-8?q?=E8=B5=8B=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/collect/IoCollectOrderService.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 718537881..eeb8f9698 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/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);
+        }
 
         //更新数据至第三方系统
         //单据更新