diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml index 6abd67676..ed00963ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml @@ -209,7 +209,7 @@ UPDATE MES_WORK_PLAN a SET a.PRINT_TYPE = 1 WHERE a.ID IN ( - SELECT DISTINCT c.ID FROM MES_MAC_TOOL_USE c + SELECT DISTINCT c.WP_ID FROM MES_MAC_TOOL_USE c LEFT JOIN MES_EQUIPMENT b ON c.EQUIPMENT_CARD = b.ID WHERE b.DEVICE_CODE = #{deviceCode} AND c.MTN_CODE = #{mtnCode} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index aaaf8cb4b..c8722f2b5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1629,6 +1629,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl