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 f87cb2e9..468fe2f5 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 @@ -209,6 +209,7 @@ public class MesReportWork extends BaseEntity { //版本 private String version; private String sapCode; + private String remark; public String getSapCode() { return sapCode; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 09383f65..6ebf9376 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -471,6 +471,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//产线编号 + sapRFW.setRemark(workOrder.getRemark());//产线编号 logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求:" + JSONObject.toJSONString(sapRFW)); R r = remoteSapService.sapRFWOrder(sapRFW); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果:" + r.getCode() + "," + r.getData() + "," + r.getMsg()); 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 803dc359..defff4bf 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 @@ -173,6 +173,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setParentOrder("0"); List liblist0 = mesReportWorkMapper.getReportList(mesReportWork); pTabs.setLibList(liblist0); + pTabs.setRemark(liblist0.get(0).getRemark()); tabs.add(pTabs); ProOrderWorkorder sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(mesReportWork.getWorkorderCode()); @@ -185,6 +186,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setWorkorderCode(sonWorkOrder.getParentOrder()); List liblist = mesReportWorkMapper.getReportList(mesReportWork); sTabs.setLibList(liblist); + sTabs.setRemark(liblist.get(0).getRemark()); tabs.add(sTabs); sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(sonWorkOrder.getWorkorderCode()); 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 2541a16d..31a3c187 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 @@ -538,7 +538,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.work_time workTime, mrw.use_man useMan, mrw.create_time createTime, - pow.workorder_code_sap workorderCodeSap + pow.workorder_code_sap workorderCodeSap, + mrw.remark from mes_report_work mrw left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code where mrw.del_flag='0' and pow.del_flag = '0' @@ -575,6 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.product_name productName, mrw.sac1, mrw.sac2, + mrw.remark, equ.sap_code sapCode from ( select @@ -583,12 +585,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(work_time) sac1, sum(work_time*use_man) sac2, product_code, - product_name + product_name, + remark from mes_report_work where upload_status != #{uploadStatus} and prod_type = #{prodType} and workorder_code = #{workorderCode} - group by workorder_code,product_code,product_name + group by workorder_code,product_code,product_name,remark ) mrw left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code left join base_equipment equ on equ.equipment_code = ow.workorder_name @@ -865,7 +868,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" work_time = #{item.workTime}, use_man = #{item.useMan}, update_by = #{item.updateBy}, - update_time = #{item.updateTime} + update_time = #{item.updateTime}, + remark = #{item.remark} where id = #{item.id}