From f84970a5c23804bc80c121837e9f8d3064aa7bb7 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Thu, 12 May 2022 00:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MdWorkstationController.java | 24 +++++++++++++++++++ .../pro/controller/ProProcessController.java | 16 ++++++------- 2 files changed, 32 insertions(+), 8 deletions(-) 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 d28eb95..ee0af68 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 @@ -4,6 +4,10 @@ import java.util.List; 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.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.web.bind.annotation.GetMapping; @@ -36,6 +40,12 @@ public class MdWorkstationController extends BaseController @Autowired private IMdWorkstationService mdWorkstationService; + @Autowired + private IProProcessService proProcessService; + + @Autowired + private IMdWorkshopService mdWorkshopService; + /** * 查询工作站列表 */ @@ -85,6 +95,13 @@ public class MdWorkstationController extends BaseController if(UserConstants.NOT_UNIQUE.equals(mdWorkstationService.checkWorkStationNameUnique(mdWorkstation))){ return AjaxResult.error("工作站名称已存在!"); } + ProProcess process = proProcessService.selectProProcessByProcessId(mdWorkstation.getProcessId()); + mdWorkstation.setProcessCode(process.getProcessCode()); + mdWorkstation.setProcessName(process.getProcessName()); + + MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId()); + mdWorkstation.setWorkshopCode(workshop.getWorkshopCode()); + mdWorkstation.setWorkshopName(workshop.getWorkshopName()); return toAjax(mdWorkstationService.insertMdWorkstation(mdWorkstation)); } @@ -102,6 +119,13 @@ public class MdWorkstationController extends BaseController if(UserConstants.NOT_UNIQUE.equals(mdWorkstationService.checkWorkStationNameUnique(mdWorkstation))){ return AjaxResult.error("工作站名称已存在!"); } + ProProcess process = proProcessService.selectProProcessByProcessId(mdWorkstation.getProcessId()); + mdWorkstation.setProcessCode(process.getProcessCode()); + mdWorkstation.setProcessName(process.getProcessName()); + + MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId()); + mdWorkstation.setWorkshopCode(workshop.getWorkshopCode()); + mdWorkstation.setWorkshopName(workshop.getWorkshopName()); return toAjax(mdWorkstationService.updateMdWorkstation(mdWorkstation)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java index 94a1abf..b2c67b2 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessController.java @@ -31,7 +31,7 @@ import com.ktg.common.core.page.TableDataInfo; * @date 2022-05-11 */ @RestController -@RequestMapping("/pro/process") +@RequestMapping("/mes/pro/process") public class ProProcessController extends BaseController { @Autowired @@ -40,7 +40,7 @@ public class ProProcessController extends BaseController /** * 查询生产工序列表 */ - @PreAuthorize("@ss.hasPermi('pro:process:list')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:list')") @GetMapping("/list") public TableDataInfo list(ProProcess proProcess) { @@ -53,7 +53,7 @@ public class ProProcessController extends BaseController * 查询所有可用工序的清单 * @return */ - @PreAuthorize("@ss.hasPermi('pro:process:list')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:list')") @GetMapping("/listAll") public AjaxResult listAll(){ ProProcess process = new ProProcess(); @@ -65,7 +65,7 @@ public class ProProcessController extends BaseController /** * 导出生产工序列表 */ - @PreAuthorize("@ss.hasPermi('pro:process:export')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:export')") @Log(title = "生产工序", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ProProcess proProcess) @@ -78,7 +78,7 @@ public class ProProcessController extends BaseController /** * 获取生产工序详细信息 */ - @PreAuthorize("@ss.hasPermi('pro:process:query')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:query')") @GetMapping(value = "/{processId}") public AjaxResult getInfo(@PathVariable("processId") Long processId) { @@ -88,7 +88,7 @@ public class ProProcessController extends BaseController /** * 新增生产工序 */ - @PreAuthorize("@ss.hasPermi('pro:process:add')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:add')") @Log(title = "生产工序", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ProProcess proProcess) @@ -105,7 +105,7 @@ public class ProProcessController extends BaseController /** * 修改生产工序 */ - @PreAuthorize("@ss.hasPermi('pro:process:edit')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:edit')") @Log(title = "生产工序", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ProProcess proProcess) @@ -122,7 +122,7 @@ public class ProProcessController extends BaseController /** * 删除生产工序 */ - @PreAuthorize("@ss.hasPermi('pro:process:remove')") + @PreAuthorize("@ss.hasPermi('mes:pro:process:remove')") @Log(title = "生产工序", businessType = BusinessType.DELETE) @DeleteMapping("/{processIds}") public AjaxResult remove(@PathVariable Long[] processIds)