From e7d2c6b460f6a7fc049cc5e48ea246b2f4e93f56 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 9 Sep 2024 14:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     | 14 +++++++-
 .../api/service/collect/DownloadFactory.java  | 32 ++++++++++---------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 4e5966ccf..8f3555e5c 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -11,6 +11,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
+import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
@@ -24,6 +25,7 @@ import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
+import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import com.glxp.api.service.collect.*;
 import com.glxp.api.util.IntUtil;
 import org.springframework.beans.BeanUtils;
@@ -243,6 +245,9 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    SysWorkplaceDocumentService sysWorkplaceDocumentService;
+
     /**
      * 单据挂起
      *
@@ -259,7 +264,14 @@ public class IoCollectOrderController extends BaseController {
             boolean isAllTag = collectOrderBizResponses.stream()
                     .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
             if (!isAllTag) {
-                return ResultVOUtils.error(502, "该业务单据未全部赋码，是否强制完成单据？");
+
+                SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrderRequest.getBusType());
+                if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderFinishVerify()) == 1) {
+                    return ResultVOUtils.error(502, "该业务单据未全部赋码，是否强制完成单据？");
+                } else {
+                    return ResultVOUtils.error(503, "该业务单据未全部赋码，无法完成单据？");
+                }
+
             }
         }
         collectOrderRequest.setUpdateUser(getUserId());
diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java
index 6f7934ed0..a8666a4fc 100644
--- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java
+++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java
@@ -29,21 +29,23 @@ public class DownloadFactory {
      */
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
         String busType = collectOrderRequest.getBusType();
-        if (busType == null) {
-            return ResultVOUtils.error("下载失败，未配置业务类型");
-        }
-        if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
-            return ypcf002Download.downloadOrder(collectOrderRequest);
-        } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) {
-            return thrOrderDownload.downloadOrder(collectOrderRequest);
-        } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) {
-            return thrOrderDownload.downloadOrder(collectOrderRequest);
-        } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) {
-            return thrOrderDownload.downloadOrder(collectOrderRequest);
-        } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) {
-            return thrOrderDownload.downloadOrder(collectOrderRequest);
-        }
-        return ResultVOUtils.error("下载失败，未配置业务类型");
+//        if (busType == null) {
+//            return ResultVOUtils.error("下载失败，未配置业务类型");
+//        }
+//        if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
+//            return ypcf002Download.downloadOrder(collectOrderRequest);
+//        } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) {
+//            return thrOrderDownload.downloadOrder(collectOrderRequest);
+//        } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) {
+//            return thrOrderDownload.downloadOrder(collectOrderRequest);
+//        } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) {
+//            return thrOrderDownload.downloadOrder(collectOrderRequest);
+//        } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) {
+//            return thrOrderDownload.downloadOrder(collectOrderRequest);
+//        }
+
+        return thrOrderDownload.downloadOrder(collectOrderRequest);
+//        return ResultVOUtils.error("下载失败，未配置业务类型");
     }
 
 }