【批量派工】关联id调整

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();
+        chanjetManager.queryMaterial();
-//        //查询库存-现存量
+        //查询库存-现存量
-//        chanjetSchedule.queryStock();
+        chanjetSchedule.queryStock();
 
 
         //测试
 //        chanjetManager.createProductionOrder(232L);
 //        sendProcedureReport2TPlus();
 //        chanjetSchedule.createStorageOut();
-        chanjetSchedule.createStorageInOrder();
+//        chanjetSchedule.createStorageInOrder();
     }
     @PermitAll
     @TenantIgnore

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)