From c00a9ef1b9a4fc3a96cad8cdb910455056e2d12c Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 28 May 2024 11:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/plan/domain/dto/CheckTaskBatchDTO.java | 43 ++++++++++++++++ .../domain/dto/MesReportWorkBatchDTO.java | 50 +++++++++++++++++++ .../plan/mapper/ProOrderWorkorderMapper.java | 6 +++ .../impl/ProOrderWorkorderServiceImpl.java | 21 ++++++-- .../mapper/plan/ProOrderWorkorderMapper.xml | 11 ++++ 5 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 op-modules/op-plan/src/main/java/com/op/plan/domain/dto/CheckTaskBatchDTO.java create mode 100644 op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesReportWorkBatchDTO.java diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/CheckTaskBatchDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/CheckTaskBatchDTO.java new file mode 100644 index 000000000..d2fa986ce --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/CheckTaskBatchDTO.java @@ -0,0 +1,43 @@ +package com.op.plan.domain.dto; + +public class CheckTaskBatchDTO { + + private String incomeBatchNo; + + private String newIncomeBatchNo; + + private String orderNo; + + public CheckTaskBatchDTO(String incomeBatchNo, String newIncomeBatchNo, String orderNo) { + this.incomeBatchNo = incomeBatchNo; + this.newIncomeBatchNo = newIncomeBatchNo; + this.orderNo = orderNo; + } + public CheckTaskBatchDTO() { + + } + + public String getIncomeBatchNo() { + return incomeBatchNo; + } + + public void setIncomeBatchNo(String incomeBatchNo) { + this.incomeBatchNo = incomeBatchNo; + } + + public String getNewIncomeBatchNo() { + return newIncomeBatchNo; + } + + public void setNewIncomeBatchNo(String newIncomeBatchNo) { + this.newIncomeBatchNo = newIncomeBatchNo; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } +} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesReportWorkBatchDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesReportWorkBatchDTO.java new file mode 100644 index 000000000..392246a52 --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesReportWorkBatchDTO.java @@ -0,0 +1,50 @@ +package com.op.plan.domain.dto; + +public class MesReportWorkBatchDTO { + private String batch; + private String newBatch; + private String parentOrder; + private String workorderCode; + + public MesReportWorkBatchDTO(String batch, String newBatch, String parentOrder, String workorderCode) { + this.batch = batch; + this.newBatch = newBatch; + this.parentOrder = parentOrder; + this.workorderCode = workorderCode; + } + + public MesReportWorkBatchDTO() { + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } + + public String getNewBatch() { + return newBatch; + } + + public void setNewBatch(String newBatch) { + this.newBatch = newBatch; + } + + public String getParentOrder() { + return parentOrder; + } + + public void setParentOrder(String parentOrder) { + this.parentOrder = parentOrder; + } + + public String getWorkorderCode() { + return workorderCode; + } + + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } +} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 4378bcde9..f4bd31643 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -1,6 +1,8 @@ package com.op.plan.mapper; import com.op.plan.domain.*; +import com.op.plan.domain.dto.CheckTaskBatchDTO; +import com.op.plan.domain.dto.MesReportWorkBatchDTO; import com.op.system.api.domain.dto.BaseBomComponentDTO; import com.op.system.api.domain.dto.MesPrepareDTO; import com.op.system.api.domain.dto.MesPrepareDetailDTO; @@ -210,5 +212,9 @@ public interface ProOrderWorkorderMapper { ProOrderWorkorderBatch getWorkOrderBatchInfo(ProOrderWorkorderBatch proOrderWorkorderBatch); List selectWorkOrderIdByBatch(@Param("workorderCode") String workorderCode); + + int updateMesReportWorkBatch(MesReportWorkBatchDTO mesReportWorkBatchDTO); + + int updateCheckTaskBatch(CheckTaskBatchDTO checkTaskBatchDTO); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 2a2d71130..e0dea3a4c 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -13,6 +13,8 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.plan.domain.*; +import com.op.plan.domain.dto.CheckTaskBatchDTO; +import com.op.plan.domain.dto.MesReportWorkBatchDTO; import com.op.plan.domain.dto.ProOrderDTO; import com.op.plan.domain.dto.SplitOrderDTO; import com.op.plan.domain.vo.CascaderDTO; @@ -1196,10 +1198,13 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return count; } @Override + @Transactional @DS("#header.poolName") public int updateWorkOrderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) { String workOrderCode = proOrderWorkorderBatch.getWorkorderCode(); String username = SecurityUtils.getUsername(); + String batchCode = proOrderWorkorderBatch.getBatchCode(); + String newBatchCode = proOrderWorkorderBatch.getNewBatchCode(); Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity(); if (newBatchQuantity == null) { return 0; @@ -1224,8 +1229,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { batch.setBatchId(IdUtils.fastSimpleUUID()); batch.setWorkorderId(workOrder.getWorkorderId()); // 获取新旧批次号 - batch.setBatchCode(proOrderWorkorderBatch.getBatchCode()); - batch.setNewBatchCode(proOrderWorkorderBatch.getNewBatchCode()); + batch.setBatchCode(batchCode); + batch.setNewBatchCode(newBatchCode); batch.setStatus("0"); batch.setUpdateBy(username); @@ -1240,8 +1245,18 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } count += proOrderWorkorderBatchMapper.updateWorkorderBatch(batch); - } + // 更新质检任务表 + CheckTaskBatchDTO checkTaskBatchDTO = new CheckTaskBatchDTO(batchCode,newBatchCode,workOrderCode); + logger.info("质检任务批次修改开始！"); + proOrderWorkorderMapper.updateCheckTaskBatch(checkTaskBatchDTO); + logger.info("质检任务批次修改结束！"); + // 更新报工表 + MesReportWorkBatchDTO mesReportWorkBatchDTO = new MesReportWorkBatchDTO(batchCode,newBatchCode,workOrderCode,workOrderCode); + logger.info("报工表批次修改开始！"); + proOrderWorkorderMapper.updateMesReportWorkBatch(mesReportWorkBatchDTO); + logger.info("报工表批次修改结束！"); + return count; } @Override diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 9c9d33e6c..d793597ac 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -858,4 +858,15 @@ #{orderId} + + update qc_check_task set income_batch_no = #{newIncomeBatchNo} + where income_batch_no = #{incomeBatchNo} and order_no = #{orderNo} + and del_flag = '0' + + + update mes_report_work set batch = #{newBatch} + where batch = #{batch} and (parent_order = #{parentOrder} or workorder_code = #{workorderCode}) + and del_flag = '0' + +