diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index 9b1cacfeb..14b0b29c9 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletResponse; import com.op.common.core.exception.ServiceException; import com.op.plan.domain.ProOrder; import com.op.plan.domain.dto.SplitOrderDTO; +import com.op.plan.service.IProWetMaterialPlanDetailService; +import com.op.plan.service.IProWetMaterialPlanService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -38,6 +40,8 @@ import com.op.common.core.web.page.TableDataInfo; public class ProOrderWorkorderController extends BaseController { @Autowired private IProOrderWorkorderService proOrderWorkorderService; + @Autowired + private IProWetMaterialPlanDetailService proWetMaterialPlanDetailService; /** * 校验工单是否可以修改 @@ -154,6 +158,10 @@ public class ProOrderWorkorderController extends BaseController { for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorders) { String status = proOrderWorkorder.getStatus(); strings.add(status); + // 判断是否含有湿料计划 boolean值(存在为true,不存在为false) + if (proWetMaterialPlanDetailService.selectProWetMaterialPlanDetailByWorkId(proOrderWorkorder.getWorkorderId())) { + throw new ServiceException("工单已创建湿料计划,不能删除!"); + } } String[] orderWorkerIds= strings.toArray(new String[0]); for (String orderWorkerId : orderWorkerIds) { diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java index 602bbd166..5adf8965e 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java @@ -13,4 +13,11 @@ public interface IProWetMaterialPlanDetailService { * @return */ List selectProWetMaterialPlanDetailList(ProWetMaterialPlan proWetMaterialPlan); + + /** + * 通过工单id查询湿料计划信息 + * @param workorderId + * @return + */ + boolean selectProWetMaterialPlanDetailByWorkId(String workorderId); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java index 4a3675d23..745ef0bdc 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java @@ -25,4 +25,19 @@ public class ProWetMaterialPlanDetailServiceImpl implements IProWetMaterialPlanD public List selectProWetMaterialPlanDetailList(ProWetMaterialPlan proWetMaterialPlan) { return proWetMaterialPlanDetailMapper.selectWetPlanList(proWetMaterialPlan); } + + /** + * 通过工单id查询湿料计划信息 + * @param workorderId + * @return + */ + @Override + @DS("#header.poolName") + public boolean selectProWetMaterialPlanDetailByWorkId(String workorderId) { + ProWetMaterialPlanDetail detail = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailByWorkId(workorderId); + if (detail != null){ + return true; + } + return false; + } } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 1127b13dc..4c94464aa 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -110,7 +110,7 @@ where workorder_id not in ( select workorder_id - from pro_wet_material_plan_detail) and CONVERT(date, product_date) = #{productDate} + from pro_wet_material_plan_detail) and CONVERT(date, product_date) = #{productDate} and prod_type = 'white'