From 1204f6fcedc68ae6b9865be9df58324cd62779dc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 23 Mar 2024 10:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../service/impl/MesReportWorkConsumeServiceImpl.java | 7 ++++++- .../main/resources/mapper/mes/MesReportWorkMapper.xml | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) 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 5362f1a4..0aa76436 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 @@ -142,4 +142,6 @@ public interface MesReportWorkMapper { List getWarehouseList(MesReportWorkConsume workConsume); List getUpdateAttr1Boms(MesReportWork workorderCode); + + int updateAttr2(MesReportWork workorder); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 18a59502..e5bb05f5 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -252,9 +252,14 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList); logger.info(workorder.getWorkorderCode() + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR)); + if(bomUpdateR.getCode() == 200){ + //attr2 0->1组件完成修改 + int f = mesReportWorkMapper.updateAttr2(workorder); + logger.info("组件修改完成："+f); + } return bomUpdateR; } - return R.fail(); + return R.ok(); } @Override 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 1ef6fb75..2541a16d 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 @@ -688,7 +688,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrwc.warehouse_code warehouseCode from mes_report_work_consume mrwc left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code - where mrwc.attr1 = '1' and mrwc.del_flag = '0' + where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' and mrwc.parent_order = #{workorderCode} @@ -877,8 +877,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" upload_msg = null where workorder_code = #{workorderCode} or parent_order = #{workorderCode} + + update mes_report_work_consume + set attr2 = '1' + where parent_order = #{workorderCode} and attr1= '1' + - + update mes_report_work set del_flag = '1' where id = #{id}