From a987057b46e47de67188b7a6df3a7e2b776453bb Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 13 Dec 2024 09:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoCollectOrderCodeManController.java      |  2 +-
 .../collect/IoCollectOrderBackupService.java  | 12 ++++-----
 .../collect/IoCollectOrderService.java        | 27 ++++++++++---------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
index e13ec569f..10c749095 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
@@ -341,7 +341,7 @@ public class IoCollectOrderCodeManController extends BaseController {
 
 
     @PostMapping("/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode")
-    public BaseResponse checkCollectOrderManCode(@RequestBody CollectOrderCodeManRequest request){
+    public BaseResponse checkCollectOrderManCode(@RequestBody CollectOrderCodeManRequest request) {
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<BaseResponse> future = executor.submit(() -> collectOrderCodeManService.CheckCode(request));
         BaseResponse response = null;
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 c34098820..cbc39fdfd 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -192,13 +192,13 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) {
                 orderEntity.setInvCode(collectOrder.getShipper() + "");
                 orderEntity.setFromCorp(collectOrder.getFromCorp());
-                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(collectOrder.getShipper() + "");
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode() + "");
                 if (invWarehouseEntity != null)
                     orderEntity.setDeptCode(invWarehouseEntity.getParentId());
             } else {
                 orderEntity.setInvCode(collectOrder.getFromCorp() + "");
                 orderEntity.setFromCorp(collectOrder.getShipper());
-                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(collectOrder.getShipper() + "");
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode() + "");
                 if (invWarehouseEntity != null)
                     orderEntity.setDeptCode(invWarehouseEntity.getParentId());
             }
@@ -231,10 +231,10 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                 Map<Long, List<IoCodeTempEntity>> groupedMap = lossCodesList.stream()
                         .collect(Collectors.groupingBy(IoCodeTempEntity::getRelId));
                 groupedMap.forEach((key, value) -> {
-                    companyProductRelevanceService.insertOrReadId(key, collectOrder.getFromCorp());
+                    companyProductRelevanceService.insertOrReadId(key, collectOrder.getShipper());
                 });
                 for (IoCodeTempEntity codeTempEntity : lossCodesList) {
-                    codeTempEntity.setSupId(collectOrder.getFromCorp());
+                    codeTempEntity.setSupId(collectOrder.getShipper());
                 }
             }
             orderService.insertOrder(orderEntity);
@@ -267,9 +267,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             }
         }
 
-        if (sysWorkplaceDocumentEntity != null){
+        if (sysWorkplaceDocumentEntity != null) {
             Integer uploadYb = sysWorkplaceDocumentEntity.getUploadYb();
-            if (uploadYb == 1){
+            if (uploadYb == 1) {
                 uploadThrid(collectOrder);
             }
         }
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 db0b72927..6e98406f5 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -872,21 +872,24 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         ioCollectOrderBackup.setCheckCodeStatus(0);
         ioCollectOrderBackup.setCheckCodeConfirm(0);
         ioCollectOrderBackupService.save(ioCollectOrderBackup);
-
         //todo 备份码表
-
-
         IoCollectOrder finalCollectOrder = collectOrder;
         ThreadUtil.execAsync(() -> {
-            //插入到码表
-            collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
-            //删除原来单据
-            removeOrderByBillNo(finalCollectOrder);
-            //更新数据至第三方系统
-            //单据更新
-            ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);
-//            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
-        });
+                    //插入到码表
+                    collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
+                    //删除原来单据
+                    removeOrderByBillNo(finalCollectOrder);
+                    //更新数据至第三方系统
+                    //单据更新
+//                    ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);
+                    IoCollectSet ioCollectSet = collectSetService.getSet();
+                    Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
+
+                    if (autoUploadOrder) {
+                        ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), null);
+                    }
+                }
+        );
     }
 
     public void busGenOrder(CollectOrderRequest collectOrderRequest) {