From c18d4a907c0fd3fc3a23e37a8ee25a459f77f537 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 12 Dec 2024 17:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupController.java          | 2 +-
 .../api/service/collect/IoCollectOrderBackupService.java | 9 +++++++--
 2 files changed, 8 insertions(+), 3 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 b59535981..e604d6167 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
@@ -131,7 +131,7 @@ public class IoCollectOrderBackupController extends BaseController {
         if (collectOrderBizRequest.getId() == null) {
             return ResultVOUtils.error(500, "业务外键不能为空");
         }
-        List<IoCollectOrderCodeMan> list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId() );
+        List<IoCollectOrderCodeMan> list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId());
         return ResultVOUtils.success(list);
     }
 
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index 1a7428edd..23594096c 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -185,9 +185,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
             orderEntity.setAction(bussinessTypeEntity.getAction());
             orderEntity.setCreateTime(new Date());
-            orderEntity.setInvCode(collectOrder.getShipper() + "");
+            if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) {
+                orderEntity.setInvCode(collectOrder.getShipper() + "");
+                orderEntity.setFromCorp(collectOrder.getFromCorp());
+            } else {
+                orderEntity.setInvCode(collectOrder.getFromCorp() + "");
+                orderEntity.setFromCorp(collectOrder.getShipper());
+            }
             orderEntity.setDeptCode("");
-            orderEntity.setFromCorp(collectOrder.getFromCorp());
             orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
             orderEntity.setExportStatus(0);
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS);