Merge remote-tracking branch 'origin/master'

9 months ago · 498f1bd2d8
parent 3293b83595 2587c244f1
commit 498f1bd2d8
1 changed files with 1 additions and 0 deletions
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@ -322,6 +322,7 @@
 		WHERE
 			mes_report_work.del_flag= '0'
 		  AND mes_report_work.workorder_code = #{workorderCode}
+          AND mes_report_work.machine_code = #{machineCode}
 		  AND mes_report_work.parent_order = '0'
 		ORDER BY
 			mes_report_work.end_report