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 34e3f4c37..67718c844 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 @@ -250,6 +250,8 @@ public interface MesReportWorkMapper { BigDecimal selectWmsProductPut(MesReportWork mesReportWork1); + String selectQcCheckResult(MesReportWork mesReportWork); + List> selectRecordDnbInstantByTime (Map query); void updateAttr2AndRspos(MesReportWorkConsume params); 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 996469fb8..43a556111 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 @@ -161,6 +161,8 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { for (MesReportWork mesReportWork1:dtos){ BigDecimal RK= mesReportWorkMapper.selectWmsProductPut(mesReportWork1); mesReportWork1.setRKquantity(RK); + String checkResult = mesReportWorkMapper.selectQcCheckResult(mesReportWork1); + mesReportWork1.setCheckResult(checkResult); } return dtos; } 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 ebc5032ea..b97691a56 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 @@ -1806,6 +1806,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_order = #{workorderCodeSap} AND product_code = #{productCode} + +