diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index f7542c2db..2c8a8e7f8 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -840,7 +840,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { ProWetMaterialPlan plan = proWetMaterialPlanMapper.selectProWetMaterialPlanByWorkId(data.getWorkorderId()); if (plan != null) { if (plan.getSyncFlag().equals("Y")) { - throw new ServiceException("工单下湿料计划已下发,不允许删除!"); + throw new RuntimeException("工单下湿料计划已下发,不允许删除!"); } } } @@ -858,7 +858,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { childOrder.setUpdateBy(SecurityContextHolder.getUserName()); childOrder.setUpdateTime(DateUtils.getNowDate()); - parentOrder.setQuantity(parentOrder.getQuantity()-data.getQuantitySplit()); +// parentOrder.setQuantity(parentOrder.getQuantity()-data.getQuantitySplit()); parentOrder.setQuantitySplit(parentOrder.getQuantitySplit()-data.getQuantitySplit()); parentOrder.setUpdateBy(SecurityContextHolder.getUserName()); parentOrder.setUpdateTime(DateUtils.getNowDate()); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml index a3689efde..8c5877d38 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml @@ -96,10 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where equipment_type_code = 'equ_type_lg' and equipment_id = #{bucketId} - + where id = (select TOP 1 wet_material_plan_id from pro_wet_material_plan_detail where workorder_id = #{workorderId} and del_flag = '0') and sync_flag = 'Y' and del_flag = '0'