From 6ccece0bb2aa5b1a22d9ef49a68f7bf6e7335f2c Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 5 Jul 2024 09:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BE=E5=B7=A5=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E3=80=91=E6=B4=BE=E5=B7=A5=E4=BF=9D=E5=AD=98=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E6=AF=94=E4=BE=8B=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?ratioSettings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskDispatchDetailOwnerDO.java | 5 ++++ .../taskdispatch/TaskDispatchServiceImpl.java | 27 +++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailOwnerDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailOwnerDO.java index 12ac2548..dcf3bc7d 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailOwnerDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailOwnerDO.java @@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch; import com.baomidou.mybatisplus.annotation.*; import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; +import com.chanko.yunxi.mes.module.biz.controller.admin.taskdispatchdetailratio.vo.TaskDispatchDetailRatioPageReqVO; +import com.chanko.yunxi.mes.module.biz.controller.admin.taskdispatchdetailratio.vo.TaskDispatchDetailRatioSaveReqVO; import io.swagger.v3.oas.models.security.SecurityScheme; import lombok.*; @@ -140,4 +142,7 @@ public class TaskDispatchDetailOwnerDO extends BaseDO { @TableField(exist = false) private Integer overTask; + + @TableField(exist = false) + private List ratioSettings; } 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 95767d24..4cf48d83 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 @@ -15,11 +15,13 @@ import com.chanko.yunxi.mes.module.biz.controller.admin.taskdispatch.vo.*; import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.systemparameters.SystemParametersDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDetailOwnerDO; +import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatchdetailratio.TaskDispatchDetailRatioDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.workshop.WorkshopDO; import com.chanko.yunxi.mes.module.biz.dal.mysql.systemparameters.SystemParametersMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchDetailMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchDetailOwnerMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchMapper; +import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatchdetailratio.TaskDispatchDetailRatioMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.taskreport.TaskReportMapper; import com.chanko.yunxi.mes.module.biz.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDO; @@ -89,6 +91,9 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Resource private OperateLogFrameworkService operateLogFrameworkService; + @Resource + private TaskDispatchDetailRatioMapper taskDispatchDetailRatioMapper; + @Resource private HttpServletRequest request; @@ -441,8 +446,26 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { List updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList()); List insertList = list.stream().filter(o -> o.getId() == null).collect(Collectors.toList()); - if(!updateList.isEmpty()) taskDispatchDetailOwnerMapper.updateBatch(updateList); - if(!insertList.isEmpty()) taskDispatchDetailOwnerMapper.insertBatch(insertList); +// if(!insertList.isEmpty()) taskDispatchDetailOwnerMapper.insertBatch(insertList); +// if(!updateList.isEmpty()) taskDispatchDetailOwnerMapper.updateBatch(updateList); + insertList.forEach(vo ->{ + taskDispatchDetailOwnerMapper.insert(vo); + vo.getRatioSettings().forEach(ro->{ + ro.setDetailOwnerId(vo.getId()); + taskDispatchDetailRatioMapper.insert(BeanUtils.toBean(ro, TaskDispatchDetailRatioDO.class)); + }); + }); + updateList.forEach(vo ->{ + taskDispatchDetailOwnerMapper.updateById(vo); + vo.getRatioSettings().forEach(ro->{ + ro.setDetailOwnerId(vo.getId()); + if(ro.getId()!=null && ro.getId()>0){ + taskDispatchDetailRatioMapper.updateById(BeanUtils.toBean(ro, TaskDispatchDetailRatioDO.class)); + }else{ + taskDispatchDetailRatioMapper.insert(BeanUtils.toBean(ro, TaskDispatchDetailRatioDO.class)); + } + }); + }); // 获取派工单全部明细 List detailOwnerList = taskDispatchDetailOwnerMapper.selectListByDispatchId(dispatchId);