Merge remote-tracking branch 'origin/master'

op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml

@@ -111,15 +111,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from pro_order_workorder where workorder_code = #{workorderCode}
 	</select>
     <select id="getLGInfo" resultType="com.op.system.api.domain.dto.WCSDTO">
-		SELECT pw.workorder_id workorderId,
+		SELECT distinct
 			   pw.bucket_code bucketCode,
 			   pw.material_code materialCode,
-			   pw.material_name materialName,
+			   pw.material_name materialName
-			   pw.shift_id shiftId,
-			   pow.workorder_code workorderCode
 		from
 			pro_wet_material_plan_detail pw
-				left join pro_order_workorder pow on pw.workorder_id = pow.workorder_id
 		where CONVERT(varchar(10),plan_time, 120) = #{reqTime}
 	</select>
 	<select id="getSapWorkOrder" resultType="java.lang.String">