产品转换/完产清线点检表等逻辑修改2

op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml

@@ -171,10 +171,10 @@
 
     <select id="getProductList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
 	    select
-	      mts.id,
-		  pow.workorder_id,
-          pow.product_name,
-		  pow.product_code
+	        mts.id,
+            MAX(pow.workorder_id) AS workorder_id,
+            MAX(pow.product_name) AS product_name,
+            MAX(pow.product_code) AS product_code
         from mes_table_self mts
         left join pro_order_workorder pow on mts.line_code = pow.workorder_name
 		LEFT JOIN base_shifts_t bst ON pow.shift_id = bst.Shift_Id
@@ -194,10 +194,7 @@
         and mts.line_code = #{lineCode}
         and pow.workorder_name = #{lineCode}
 		group by
-		mts.id,
-		pow.workorder_id,
-        pow.product_name,
-		pow.product_code
+		mts.id
     </select>
 
     <select id="getDataCodeList" resultType ="com.op.mes.domain.ProOrderWorkorder" parameterType="MesInspectionReport">