diff --git a/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java b/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java index 13a75b63..9987a6e0 100644 --- a/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java +++ b/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java @@ -1,12 +1,19 @@ package com.xujie.sys.modules.part.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.xujie.sys.common.utils.PageUtils; import com.xujie.sys.common.utils.R; +import com.xujie.sys.modules.part.data.PartGroupStdOperationsData; import com.xujie.sys.modules.part.data.StandardRoutingOperationData; +import com.xujie.sys.modules.part.mapper.PartGroupStdOperationsMapper; +import com.xujie.sys.modules.part.service.PartGroupStdOperationsService; import com.xujie.sys.modules.part.service.StandardRoutingOperationService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @description: * @author: jiayang_yue @@ -21,6 +28,12 @@ public class StandardRoutingOperationController { @Autowired private StandardRoutingOperationService standardRoutingOperationService; + @Autowired + private PartGroupStdOperationsService partGroupStdOperationsService; + + @Autowired + private PartGroupStdOperationsMapper partGroupStdOperationsMapper; + @PostMapping("/searchStandardRoutingOperationList") @ResponseBody public R searchStandardRoutingOperationList(@RequestBody StandardRoutingOperationData data) { @@ -44,7 +57,16 @@ public class StandardRoutingOperationController { @PostMapping("/deleteStandardRoutingOperation") @ResponseBody + @Transactional public R deleteStandardRoutingOperation(@RequestBody StandardRoutingOperationData data) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("operation_id", data.getId()) + .eq("site", data.getSite()) + .eq("bu_no", data.getBuNo()); + List partGroupStdOperationsData = partGroupStdOperationsMapper.selectList(queryWrapper); + if (!partGroupStdOperationsData.isEmpty()) { + throw new RuntimeException("该标准工序已被商品组使用,无法删除!"); + } standardRoutingOperationService.removeById(data.getId()); return R.ok(); } diff --git a/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java b/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java index 2c1e96a1..999ff7b1 100644 --- a/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java +++ b/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java @@ -59,6 +59,10 @@ public class StandardRoutingOperationData extends QueryPage implements Serializa private String setupLaborClassNo; + private Integer setupCrewSize; + + private Integer crewSize; + @TableField(exist = false) private String setupLaborClassDesc; diff --git a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml index c5a194af..a8c31152 100644 --- a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml +++ b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml @@ -23,6 +23,8 @@ update_date, update_by, setup_labor_class_no, + setup_crew_size, + crew_size, dbo.get_labor_class_desc(site,bu_no, setup_labor_class_no) as setup_labor_class_desc from standard_routing_operation