From eabfa9449d740b2fd93480ccda59682c5e7dbcfa Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 7 Mar 2024 15:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0sap?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 2 +- .../java/com/op/mes/domain/MesReportWork.java | 27 +++++++------------ .../service/impl/IWCInterfaceServiceImpl.java | 6 ++--- .../mapper/mes/MesReportWorkMapper.xml | 9 ++++--- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 37521890..ad034b78 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -52,7 +52,7 @@ import com.op.common.core.utils.poi.ExcelUtilDailyReport; * @date 2023-08-24 */ @RestController -@RequestMapping("./reportWork") +@RequestMapping("/reportWork") public class MesReportWorkController extends BaseController { @Autowired private IMesReportWorkService mesReportWorkService; 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 cab779e9..f87cb2e9 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 @@ -86,8 +86,6 @@ public class MesReportWork extends BaseEntity { @Excel(name = "物料消耗单位") private String materialNameUnit; - - /** 报工单编号 */ // @Excel(name = "报工单编号") private String reportCode; @@ -96,18 +94,12 @@ public class MesReportWork extends BaseEntity { //@Excel(name = "报工类型，报工类型：SELF上位机报工、UNI系统报工") private String reportType; - /** 规格型号 */ //@Excel(name = "规格型号") private String spec; - - - - private BigDecimal quantitySplit; - /** 合格数量 */ //@Excel(name = "合格数量") private BigDecimal quantityQualified; @@ -120,13 +112,9 @@ public class MesReportWork extends BaseEntity { //@Excel(name = "报工人员") private String userName; - - /** 报工途径：PAD、MOBILE、PC */ //@Excel(name = "报工途径：PAD、MOBILE、PC") private String feedbackChannel; - - private String feedbackTimeStr; /** 录入人员 */ @@ -137,16 +125,10 @@ public class MesReportWork extends BaseEntity { //@Excel(name = "状态") private String status; - - - - /** 线体编码 */ //@Excel(name = "线体编码") private String machineCode; - - /** 班组编码 */ //@Excel(name = "班组编码") private String teamCode; @@ -226,6 +208,15 @@ public class MesReportWork extends BaseEntity { private String voucher; //版本 private String version; + private String sapCode; + + public String getSapCode() { + return sapCode; + } + + public void setSapCode(String sapCode) { + this.sapCode = sapCode; + } public String getVoucher() { return voucher; 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 34e09174..f7465042 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 @@ -344,7 +344,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { /**(两层报工)子工单先报工，然后母工单报工**/ mesReportWork.setUploadStatus("1");//除了1报工成功的，都需要报工 mesReportWork.setProdType("prod"); - mesReportWork.setWorkorderCode(workOrders.get(1).getWorkorderCode()); + mesReportWork.setWorkorderCode(workOrders.get(0).getWorkorderCode()); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); if(sHzWorks==null){ return R.fail("未查询到子报工单"); @@ -355,7 +355,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { logger.info("==========================子工单报工结束:"+JSONObject.toJSONString(sapRson)); if(sapRson.getCode()== 200){ //一定是子单报工成功返回后，再母单报工 - mesReportWork.setWorkorderCode(workOrders.get(0).getWorkorderCode()); + mesReportWork.setWorkorderCode(workOrders.get(1).getWorkorderCode()); MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); if(pHzWork==null){ return R.fail("未查询到母报工单"); @@ -449,8 +449,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { return R.fail("mes_report_work_consume没有数据"); } sapRFW.setLt_hwList(lt_hwList); + sapRFW.setAnzma(workOrder.getSapCode());//产线编号 logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW)); - R r = remoteSapService.sapRFWOrder(sapRFW); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg()); //上传成功，更改mes_report_work状态 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 85808be7..fd8f7a95 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 @@ -572,7 +572,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.product_code productCode, mrw.product_name productName, mrw.sac1, - mrw.sac2 + mrw.sac2, + equ.sap_code sapCode from ( select workorder_code, @@ -588,7 +589,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by workorder_code,product_code,product_name,use_man ) 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