From fbd9703421e94bd9669695c6611dcc5f50e2eb5e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 26 Mar 2024 17:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9B=B4=E6=96=B0remark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/mes/domain/MesReportWork.java | 8 ++++---- .../main/java/com/op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../op/mes/service/impl/MesReportWorkServiceImpl.java | 4 +++- .../main/resources/mapper/mes/MesReportWorkMapper.xml | 9 +++++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index 468fe2f5..4d2c1129 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -179,10 +179,10 @@ public class MesReportWork extends BaseEntity { private String routeCode; private String sac1; private String sac2; - private String sac3; - private String sac4; - private String sac5; - private String sac6; + private String sac3; + private String sac4; + private String sac5; + private String sac6; private String prodType; private String createTimeStart; private String createTimeEnd; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 0aa76436..8a406f0f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -144,4 +144,6 @@ public interface MesReportWorkMapper { List getUpdateAttr1Boms(MesReportWork workorderCode); int updateAttr2(MesReportWork workorder); + + void updateReportRemark(@Param("list") List mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index defff4bf..c5f546fc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -8,7 +8,6 @@ import java.util.*; import com.alibaba.fastjson2.JSONArray; import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.constant.SecurityConstants; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.ServletUtils; @@ -260,6 +259,9 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setUpdateTime(nowTime); mesReportWork.setUpdateBy(updateBy); } + //会更新好几次//着急发布后面再说 + mesReportWorkMapper.updateReportRemark(mesReportWorks); + return mesReportWorkMapper.submitReportPS(mesReportWorks); } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 31a3c187..a4d36bcf 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -868,8 +868,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" work_time = #{item.workTime}, use_man = #{item.useMan}, update_by = #{item.updateBy}, - update_time = #{item.updateTime}, - remark = #{item.remark} + update_time = #{item.updateTime} where id = #{item.id} @@ -886,6 +885,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set attr2 = '1' where parent_order = #{workorderCode} and attr1= '1' + + + update mes_report_work set remark = #{item.remark} + where workorder_code = #{item.workorderCode} + + update mes_report_work set del_flag = '1' where id = #{id}