diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java index 556a02437..9c7375a05 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java @@ -215,4 +215,14 @@ public class ProBPOrderWorkorderController extends BaseController { public AjaxResult downWorkorder(@PathVariable String[] workorderIds) { return toAjax(proOrderWorkorderService.downProOrderWorkorderByWorkorderIds(workorderIds)); } + + /** + * 删除湿料计划 + */ + @RequiresPermissions("mes:bppro:workorder:edit") + @Log(title = "生产工单", businessType = BusinessType.DELETE) + @DeleteMapping("/deleteWetMaterial/{workorderIds}") + public AjaxResult deleteWetMaterial(@PathVariable String[] workorderIds) { + return toAjax(proOrderWorkorderService.deleteWetMaterial(workorderIds)); + } } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 0d7513d48..ea6059453 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -203,5 +203,7 @@ public interface ProOrderWorkorderMapper { ProOrderWorkorder selectSonOrder(String parentOrder); List getProductOrders(@Param("orderIds") String[] orderIds); + + int deleteWetMaterial(@Param("orderIds")String[] workorderIds); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index b547d0983..5cb09d428 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -133,4 +133,6 @@ public interface IProOrderWorkorderService { AjaxResult subChangeWorkOrderPro(SplitOrderDTO splitOrderDTO); List getOrderNotW0(String[] workorderIds); + + int deleteWetMaterial(String[] workorderIds); } 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 6ff815b1b..21d1f7451 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 @@ -1102,6 +1102,12 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return proOrderWorkorderMapper.getOrderNotW0(workorderIds); } + @Override + @DS("#header.poolName") + public int deleteWetMaterial(String[] workorderIds) { + return proOrderWorkorderMapper.deleteWetMaterial(workorderIds); + } + /** * 校验工单是否可以修改 * 如果工单已生成湿料计划则不允许修改 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 fca2c89cf..b6bb77046 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 @@ -505,7 +505,7 @@ select top 1 material_code materialCode, material_name materialName from pro_wet_material_plan_detail - where workorder_id = #{workorderId} and del_flag = '0' + where workorder_id = #{workorderId} order by create_time desc