From fd77e92d2be5f1dba3c59ebcd3006049497175db Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 19 Aug 2024 13:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=B9=E9=87=8F=E6=B4=BE=E5=B7=A5?=
 =?UTF-8?q?=E3=80=91=E5=85=B3=E8=81=94id=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/controller/admin/chanjet/ChanjetController.java   | 8 ++++----
 .../biz/service/taskdispatch/TaskDispatchServiceImpl.java | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java
index d067a562..adeabf14 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java
@@ -273,16 +273,16 @@ public class ChanjetController {
     @PreAuthorize("@ss.hasPermission('biz:storage:create')")
     @Scheduled(cron = "0 0 3 * * ?")
     public void synchronizeData() throws ChanjetApiException{
-//        chanjetManager.queryMaterial();
-//        //查询库存-现存量
-//        chanjetSchedule.queryStock();
+        chanjetManager.queryMaterial();
+        //查询库存-现存量
+        chanjetSchedule.queryStock();
 
 
         //测试
 //        chanjetManager.createProductionOrder(232L);
 //        sendProcedureReport2TPlus();
 //        chanjetSchedule.createStorageOut();
-        chanjetSchedule.createStorageInOrder();
+//        chanjetSchedule.createStorageInOrder();
     }
     @PermitAll
     @TenantIgnore
diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java
index 8c2c83f8..00dbac6e 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java
@@ -556,9 +556,13 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
 //                }
                 BigDecimal ratio =finalTotalAmount.doubleValue() == 0? BigDecimal.valueOf(1): BigDecimal.valueOf(taskDispatchDetailDO.getAmount().doubleValue() /finalTotalAmount.doubleValue());
 
-                        TaskReportDO taskReportDO = new TaskReportDO();
+                // 根据ownerid查找其他联合人的明细id
+                TaskDispatchDetailDO taskDispatchDetailNewDO =
+                        taskDispatchDetailMapper.selectOne(TaskDispatchDetailDO::getDetailOwnerId,taskDispatchDetailDO.getDetailOwnerId(),TaskDispatchDetailDO::getOwner,Long.valueOf(oid.trim()));
+
+                TaskReportDO taskReportDO = new TaskReportDO();
                 taskReportDO.setDispatchId(taskDispatchDetailDO.getDispatchId())
-                        .setDispatchDetailId(taskDispatchDetailDO.getId())
+                        .setDispatchDetailId(taskDispatchDetailNewDO.getId())
                         .setProcedureId(taskDispatchDetailDO.getProcedureId())
                         .setStartTime(now)
                         .setEndTime(now)