Merge branch 'master' of ssh://192.168.202.52:2022/mes/mes

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<Map<String,Object>> selectRecordDnbInstantByTime (Map<String, Object> query);
 
     void updateAttr2AndRspos(MesReportWorkConsume params);

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;
 	}

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}
 	</select>
+
+	<select id="selectQcCheckResult" resultType="java.lang.String">
+		SELECT DISTINCT qc_check_task.check_result
+		FROM pro_order_workorder
+		    LEFT JOIN qc_check_task ON pro_order_workorder.workorder_code = qc_check_task.order_no
+		WHERE pro_order_workorder.workorder_code_sap = #{workorderCodeSap}
+		    AND qc_check_task.check_type = 'checkTypeCP'
+	</select>
 	<select id="getProductReason" resultType="com.op.mes.domain.vo.MesDailyReportVos">
 		SELECT
 			remark AS reason,

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml

@@ -328,7 +328,7 @@
           AND mes_report_work.machine_code = #{machineCode}
 		  AND mes_report_work.parent_order = '0'
 		ORDER BY
-			mes_report_work.end_report
+			mes_report_work.end_report, mes_report_work.batch
 
 	</select>