diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java index ee0af68..45d3435 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java @@ -5,11 +5,12 @@ import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; import com.ktg.mes.md.domain.MdWorkshop; -import com.ktg.mes.md.service.IMdWorkshopService; +import com.ktg.mes.md.service.*; import com.ktg.mes.pro.domain.ProProcess; import com.ktg.mes.pro.service.IProProcessService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -23,7 +24,6 @@ import com.ktg.common.core.controller.BaseController; import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.enums.BusinessType; import com.ktg.mes.md.domain.MdWorkstation; -import com.ktg.mes.md.service.IMdWorkstationService; import com.ktg.common.utils.poi.ExcelUtil; import com.ktg.common.core.page.TableDataInfo; @@ -40,6 +40,15 @@ public class MdWorkstationController extends BaseController @Autowired private IMdWorkstationService mdWorkstationService; + @Autowired + private IMdWorkstationMachineService mdWorkstationMachineService; + + @Autowired + private IMdWorkstationToolService mdWorkstationToolService; + + @Autowired + private IMdWorkstationWorkerService mdWorkstationWorkerService; + @Autowired private IProProcessService proProcessService; @@ -134,9 +143,16 @@ public class MdWorkstationController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:md:workstation:remove')") @Log(title = "工作站", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{workstationIds}") public AjaxResult remove(@PathVariable Long[] workstationIds) { + for (Long workstationId: workstationIds + ) { + mdWorkstationMachineService.deleteByWorkstationId(workstationId); + mdWorkstationToolService.deleteByWorkstationId(workstationId); + mdWorkstationWorkerService.deleteByWorkstationId(workstationId); + } return toAjax(mdWorkstationService.deleteMdWorkstationByWorkstationIds(workstationIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java index 9eb61bb..b099c1e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java @@ -60,4 +60,11 @@ public interface MdWorkstationMachineMapper * @return 结果 */ public int deleteMdWorkstationMachineByRecordIds(Long[] recordIds); + + /** + * 根据工作站ID删除对应的设备列表 + * @param workstationId + * @return + */ + public int deleteByWorkstationId(Long workstationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationToolMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationToolMapper.java index d12dd56..a0fa541 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationToolMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationToolMapper.java @@ -60,4 +60,11 @@ public interface MdWorkstationToolMapper * @return 结果 */ public int deleteMdWorkstationToolByRecordIds(Long[] recordIds); + + /** + * 根据工作站ID删除对应的工装夹具信息 + * @param workstationId + * @return + */ + public int deleteByWorkstationId(Long workstationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationWorkerMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationWorkerMapper.java index 9f43d9e..e009136 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationWorkerMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationWorkerMapper.java @@ -61,4 +61,11 @@ public interface MdWorkstationWorkerMapper * @return 结果 */ public int deleteMdWorkstationWorkerByRecordIds(Long[] recordIds); + + /** + * 根据工作站ID删除对应的人员信息 + * @param workstationId + * @return + */ + public int deleteByWorkstationId(Long workstationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java index 60eff4f..ffd9abf 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java @@ -60,4 +60,11 @@ public interface IMdWorkstationMachineService * @return 结果 */ public int deleteMdWorkstationMachineByRecordId(Long recordId); + + /** + * 根据工作站ID删除对应的设备列表 + * @param workstationId + * @return + */ + public int deleteByWorkstationId(Long workstationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java index 868ab0a..cd5d70d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java @@ -65,4 +65,11 @@ public interface IMdWorkstationToolService * @return 结果 */ public int deleteMdWorkstationToolByRecordId(Long recordId); + + /** + * 根据工作站ID删除对应的工装夹具信息 + * @param workstationId + * @return + */ + public int deleteByWorkstationId(Long workstationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationWorkerService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationWorkerService.java index 7a2df36..6579c6a 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationWorkerService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationWorkerService.java @@ -65,4 +65,11 @@ public interface IMdWorkstationWorkerService * @return 结果 */ public int deleteMdWorkstationWorkerByRecordId(Long recordId); + + /** + * 根据工作站ID删除对应的人员信息 + * @param workstationId + * @return + */ + public int deleteByWorkstationId(Long workstationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java index 55d157e..e6b8c63 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java @@ -108,4 +108,9 @@ public class MdWorkstationMachineServiceImpl implements IMdWorkstationMachineSer { return mdWorkstationMachineMapper.deleteMdWorkstationMachineByRecordId(recordId); } + + @Override + public int deleteByWorkstationId(Long workstationId) { + return mdWorkstationMachineMapper.deleteByWorkstationId(workstationId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java index d907dd0..f27adfd 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java @@ -18,7 +18,7 @@ import com.ktg.mes.md.service.IMdWorkstationToolService; * @date 2022-05-12 */ @Service -public class MdWorkstationToolServiceImpl implements IMdWorkstationToolService +public class MdWorkstationToolServiceImpl implements IMdWorkstationToolService { @Autowired private MdWorkstationToolMapper mdWorkstationToolMapper; @@ -106,4 +106,9 @@ public class MdWorkstationToolServiceImpl implements IMdWorkstationToolService { return mdWorkstationToolMapper.deleteMdWorkstationToolByRecordId(recordId); } + + @Override + public int deleteByWorkstationId(Long workstationId) { + return mdWorkstationToolMapper.deleteByWorkstationId(workstationId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationWorkerServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationWorkerServiceImpl.java index 491ca65..9f789f5 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationWorkerServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationWorkerServiceImpl.java @@ -106,4 +106,9 @@ public class MdWorkstationWorkerServiceImpl implements IMdWorkstationWorkerServi { return mdWorkstationWorkerMapper.deleteMdWorkstationWorkerByRecordId(recordId); } + + @Override + public int deleteByWorkstationId(Long workstationId) { + return mdWorkstationWorkerMapper.deleteByWorkstationId(workstationId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessMobController.java index c5ca587..fa0b8fd 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessMobController.java @@ -3,10 +3,13 @@ package com.ktg.mes.pro.controller; import com.ktg.common.constant.UserConstants; import com.ktg.common.core.controller.BaseController; import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.utils.StringUtils; import com.ktg.mes.pro.domain.ProProcess; import com.ktg.mes.pro.service.IProProcessService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -26,4 +29,20 @@ public class ProProcessMobController extends BaseController { List list = proProcessService.selectProProcessList(proProcess); return AjaxResult.success(list); } + + /** + * 获取工序详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:process:query')") + @GetMapping(value = "/{processId}") + public AjaxResult getInfo(@PathVariable("processId") Long processId) + { + ProProcess p = proProcessService.selectProProcessByProcessId(processId); + if(StringUtils.isNotNull(p)){ + return AjaxResult.success(p); + }else{ + return AjaxResult.error("未查询到当前工序信息"); + } + + } } diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml index 0e43a38..73eeafe 100644 --- a/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml @@ -114,4 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from md_workstation_machine where workstation_id = #{workstationId} + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml index 606c246..d13b9ad 100644 --- a/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml @@ -114,4 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from md_workstation_tool where workstation_id = #{workstationId} + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationWorkerMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationWorkerMapper.xml index 09121f5..1e666e3 100644 --- a/ktg-mes/src/main/resources/mapper/md/MdWorkstationWorkerMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationWorkerMapper.xml @@ -114,4 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from md_workstation_worker where workstation_id = #{workstationId} + \ No newline at end of file