diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProcessInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProcessInfoController.java index 2eaf2685..b97686d5 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProcessInfoController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProcessInfoController.java @@ -47,6 +47,16 @@ public class MesBaseProcessInfoController extends BaseController return getDataTable(list); } + /** + * 查询工序下拉框列表 + */ + @GetMapping("/findProcessList") + public AjaxResult findProcessList(MesBaseProcessInfo mesBaseProcessInfo) + { + List list = mesBaseProcessInfoService.selectMesBaseProcessInfoList(mesBaseProcessInfo); + return success(list); + } + /** * 导出工序信息列表 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteController.java new file mode 100644 index 00000000..e72d00a8 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteController.java @@ -0,0 +1,115 @@ +package com.hw.mes.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.mes.domain.MesBaseRoute; +import com.hw.mes.service.IMesBaseRouteService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 工艺路线Controller + * + * @author Yinq + * @date 2024-01-25 + */ +@RestController +@RequestMapping("/baseRoute") +public class MesBaseRouteController extends BaseController +{ + @Autowired + private IMesBaseRouteService mesBaseRouteService; + + /** + * 查询工艺路线列表 + */ + @RequiresPermissions("mes:baseRoute:list") + @GetMapping("/list") + public TableDataInfo list(MesBaseRoute mesBaseRoute) + { + startPage(); + List list = mesBaseRouteService.selectMesBaseRouteList(mesBaseRoute); + return getDataTable(list); + } + + /** + * 查询工艺路线下拉框列表 + */ + @GetMapping("/findRouteList") + public AjaxResult findRouteList(MesBaseRoute mesBaseRoute) + { + List list = mesBaseRouteService.selectMesBaseRouteList(mesBaseRoute); + return success(list); + } + + /** + * 导出工艺路线列表 + */ + @RequiresPermissions("mes:baseRoute:export") + @Log(title = "工艺路线", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBaseRoute mesBaseRoute) + { + List list = mesBaseRouteService.selectMesBaseRouteList(mesBaseRoute); + ExcelUtil util = new ExcelUtil(MesBaseRoute.class); + util.exportExcel(response, list, "工艺路线数据"); + } + + /** + * 获取工艺路线详细信息 + */ + @RequiresPermissions("mes:baseRoute:query") + @GetMapping(value = "/{routeId}") + public AjaxResult getInfo(@PathVariable("routeId") Long routeId) + { + return success(mesBaseRouteService.selectMesBaseRouteByRouteId(routeId)); + } + + /** + * 新增工艺路线 + */ + @RequiresPermissions("mes:baseRoute:add") + @Log(title = "工艺路线", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBaseRoute mesBaseRoute) + { + return toAjax(mesBaseRouteService.insertMesBaseRoute(mesBaseRoute)); + } + + /** + * 修改工艺路线 + */ + @RequiresPermissions("mes:baseRoute:edit") + @Log(title = "工艺路线", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBaseRoute mesBaseRoute) + { + return toAjax(mesBaseRouteService.updateMesBaseRoute(mesBaseRoute)); + } + + /** + * 删除工艺路线 + */ + @RequiresPermissions("mes:baseRoute:remove") + @Log(title = "工艺路线", businessType = BusinessType.DELETE) + @DeleteMapping("/{routeIds}") + public AjaxResult remove(@PathVariable Long[] routeIds) + { + return toAjax(mesBaseRouteService.deleteMesBaseRouteByRouteIds(routeIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteProcessController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteProcessController.java new file mode 100644 index 00000000..30a32981 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseRouteProcessController.java @@ -0,0 +1,105 @@ +package com.hw.mes.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.mes.domain.MesBaseRouteProcess; +import com.hw.mes.service.IMesBaseRouteProcessService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 工艺路线组成信息Controller + * + * @author Yinq + * @date 2024-01-25 + */ +@RestController +@RequestMapping("/baseRouteProcess") +public class MesBaseRouteProcessController extends BaseController +{ + @Autowired + private IMesBaseRouteProcessService mesBaseRouteProcessService; + + /** + * 查询工艺路线组成信息列表 + */ + @RequiresPermissions("mes:baseRouteProcess:list") + @GetMapping("/list") + public TableDataInfo list(MesBaseRouteProcess mesBaseRouteProcess) + { + startPage(); + List list = mesBaseRouteProcessService.selectMesBaseRouteProcessList(mesBaseRouteProcess); + return getDataTable(list); + } + + /** + * 导出工艺路线组成信息列表 + */ + @RequiresPermissions("mes:baseRouteProcess:export") + @Log(title = "工艺路线组成信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBaseRouteProcess mesBaseRouteProcess) + { + List list = mesBaseRouteProcessService.selectMesBaseRouteProcessList(mesBaseRouteProcess); + ExcelUtil util = new ExcelUtil(MesBaseRouteProcess.class); + util.exportExcel(response, list, "工艺路线组成信息数据"); + } + + /** + * 获取工艺路线组成信息详细信息 + */ + @RequiresPermissions("mes:baseRouteProcess:query") + @GetMapping(value = "/{routeProcessId}") + public AjaxResult getInfo(@PathVariable("routeProcessId") Long routeProcessId) + { + return success(mesBaseRouteProcessService.selectMesBaseRouteProcessByRouteProcessId(routeProcessId)); + } + + /** + * 新增工艺路线组成信息 + */ + @RequiresPermissions("mes:baseRouteProcess:add") + @Log(title = "工艺路线组成信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBaseRouteProcess mesBaseRouteProcess) + { + return toAjax(mesBaseRouteProcessService.insertMesBaseRouteProcess(mesBaseRouteProcess)); + } + + /** + * 修改工艺路线组成信息 + */ + @RequiresPermissions("mes:baseRouteProcess:edit") + @Log(title = "工艺路线组成信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBaseRouteProcess mesBaseRouteProcess) + { + return toAjax(mesBaseRouteProcessService.updateMesBaseRouteProcess(mesBaseRouteProcess)); + } + + /** + * 删除工艺路线组成信息 + */ + @RequiresPermissions("mes:baseRouteProcess:remove") + @Log(title = "工艺路线组成信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{routeProcessIds}") + public AjaxResult remove(@PathVariable Long[] routeProcessIds) + { + return toAjax(mesBaseRouteProcessService.deleteMesBaseRouteProcessByRouteProcessIds(routeProcessIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseRoute.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseRoute.java new file mode 100644 index 00000000..76349e87 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseRoute.java @@ -0,0 +1,102 @@ +package com.hw.mes.domain; + +import java.util.List; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 工艺路线对象 mes_base_route + * + * @author Yinq + * @date 2024-01-25 + */ +public class MesBaseRoute extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 工艺路线ID + */ + private Long routeId; + + /** + * 工艺路线名称 + */ + @Excel(name = "工艺路线名称") + private String routeName; + + /** + * 工艺路线说明 + */ + @Excel(name = "工艺路线说明") + private String routeDesc; + + /** + * 激活标识 + */ + @Excel(name = "激活标识") + private String activeFlag; + + /** + * 工艺路线组成信息信息 + */ + private List mesBaseRouteProcessList; + + public void setRouteId(Long routeId) { + this.routeId = routeId; + } + + public Long getRouteId() { + return routeId; + } + + public void setRouteName(String routeName) { + this.routeName = routeName; + } + + public String getRouteName() { + return routeName; + } + + public void setRouteDesc(String routeDesc) { + this.routeDesc = routeDesc; + } + + public String getRouteDesc() { + return routeDesc; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + + public List getMesBaseRouteProcessList() { + return mesBaseRouteProcessList; + } + + public void setMesBaseRouteProcessList(List mesBaseRouteProcessList) { + this.mesBaseRouteProcessList = mesBaseRouteProcessList; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("routeId", getRouteId()) + .append("routeName", getRouteName()) + .append("routeDesc", getRouteDesc()) + .append("activeFlag", getActiveFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("mesBaseRouteProcessList", getMesBaseRouteProcessList()) + .toString(); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseRouteProcess.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseRouteProcess.java new file mode 100644 index 00000000..6fa724f1 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseRouteProcess.java @@ -0,0 +1,86 @@ +package com.hw.mes.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 工艺路线组成信息对象 mes_base_route_process + * + * @author Yinq + * @date 2024-01-25 + */ +public class MesBaseRouteProcess extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 工艺路线组成ID + */ + private Long routeProcessId; + + /** + * 工艺路线ID + */ + @Excel(name = "工艺路线ID") + private Long routeId; + + /** + * 工序ID + */ + @Excel(name = "工序ID") + private Long processId; + + /** + * 工艺路线顺序 + */ + @Excel(name = "工艺路线顺序") + private Long processOrder; + + public void setRouteProcessId(Long routeProcessId) { + this.routeProcessId = routeProcessId; + } + + public Long getRouteProcessId() { + return routeProcessId; + } + + public void setRouteId(Long routeId) { + this.routeId = routeId; + } + + public Long getRouteId() { + return routeId; + } + + public void setProcessId(Long processId) { + this.processId = processId; + } + + public Long getProcessId() { + return processId; + } + + public void setProcessOrder(Long processOrder) { + this.processOrder = processOrder; + } + + public Long getProcessOrder() { + return processOrder; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("routeProcessId", getRouteProcessId()) + .append("routeId", getRouteId()) + .append("processId", getProcessId()) + .append("processOrder", getProcessOrder()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseRouteMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseRouteMapper.java new file mode 100644 index 00000000..8f6e5a74 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseRouteMapper.java @@ -0,0 +1,87 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBaseRoute; +import com.hw.mes.domain.MesBaseRouteProcess; + +/** + * 工艺路线Mapper接口 + * + * @author Yinq + * @date 2024-01-25 + */ +public interface MesBaseRouteMapper +{ + /** + * 查询工艺路线 + * + * @param routeId 工艺路线主键 + * @return 工艺路线 + */ + public MesBaseRoute selectMesBaseRouteByRouteId(Long routeId); + + /** + * 查询工艺路线列表 + * + * @param mesBaseRoute 工艺路线 + * @return 工艺路线集合 + */ + public List selectMesBaseRouteList(MesBaseRoute mesBaseRoute); + + /** + * 新增工艺路线 + * + * @param mesBaseRoute 工艺路线 + * @return 结果 + */ + public int insertMesBaseRoute(MesBaseRoute mesBaseRoute); + + /** + * 修改工艺路线 + * + * @param mesBaseRoute 工艺路线 + * @return 结果 + */ + public int updateMesBaseRoute(MesBaseRoute mesBaseRoute); + + /** + * 删除工艺路线 + * + * @param routeId 工艺路线主键 + * @return 结果 + */ + public int deleteMesBaseRouteByRouteId(Long routeId); + + /** + * 批量删除工艺路线 + * + * @param routeIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseRouteByRouteIds(Long[] routeIds); + + /** + * 批量删除工艺路线组成信息 + * + * @param routeIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseRouteProcessByRouteIds(Long[] routeIds); + + /** + * 批量新增工艺路线组成信息 + * + * @param mesBaseRouteProcessList 工艺路线组成信息列表 + * @return 结果 + */ + public int batchMesBaseRouteProcess(List mesBaseRouteProcessList); + + + /** + * 通过工艺路线主键删除工艺路线组成信息信息 + * + * @param routeId 工艺路线ID + * @return 结果 + */ + public int deleteMesBaseRouteProcessByRouteId(Long routeId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseRouteProcessMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseRouteProcessMapper.java new file mode 100644 index 00000000..0087f739 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseRouteProcessMapper.java @@ -0,0 +1,61 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBaseRouteProcess; + +/** + * 工艺路线组成信息Mapper接口 + * + * @author Yinq + * @date 2024-01-25 + */ +public interface MesBaseRouteProcessMapper +{ + /** + * 查询工艺路线组成信息 + * + * @param routeProcessId 工艺路线组成信息主键 + * @return 工艺路线组成信息 + */ + public MesBaseRouteProcess selectMesBaseRouteProcessByRouteProcessId(Long routeProcessId); + + /** + * 查询工艺路线组成信息列表 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 工艺路线组成信息集合 + */ + public List selectMesBaseRouteProcessList(MesBaseRouteProcess mesBaseRouteProcess); + + /** + * 新增工艺路线组成信息 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 结果 + */ + public int insertMesBaseRouteProcess(MesBaseRouteProcess mesBaseRouteProcess); + + /** + * 修改工艺路线组成信息 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 结果 + */ + public int updateMesBaseRouteProcess(MesBaseRouteProcess mesBaseRouteProcess); + + /** + * 删除工艺路线组成信息 + * + * @param routeProcessId 工艺路线组成信息主键 + * @return 结果 + */ + public int deleteMesBaseRouteProcessByRouteProcessId(Long routeProcessId); + + /** + * 批量删除工艺路线组成信息 + * + * @param routeProcessIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseRouteProcessByRouteProcessIds(Long[] routeProcessIds); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseRouteProcessService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseRouteProcessService.java new file mode 100644 index 00000000..d8702172 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseRouteProcessService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBaseRouteProcess; + +/** + * 工艺路线组成信息Service接口 + * + * @author Yinq + * @date 2024-01-25 + */ +public interface IMesBaseRouteProcessService +{ + /** + * 查询工艺路线组成信息 + * + * @param routeProcessId 工艺路线组成信息主键 + * @return 工艺路线组成信息 + */ + public MesBaseRouteProcess selectMesBaseRouteProcessByRouteProcessId(Long routeProcessId); + + /** + * 查询工艺路线组成信息列表 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 工艺路线组成信息集合 + */ + public List selectMesBaseRouteProcessList(MesBaseRouteProcess mesBaseRouteProcess); + + /** + * 新增工艺路线组成信息 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 结果 + */ + public int insertMesBaseRouteProcess(MesBaseRouteProcess mesBaseRouteProcess); + + /** + * 修改工艺路线组成信息 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 结果 + */ + public int updateMesBaseRouteProcess(MesBaseRouteProcess mesBaseRouteProcess); + + /** + * 批量删除工艺路线组成信息 + * + * @param routeProcessIds 需要删除的工艺路线组成信息主键集合 + * @return 结果 + */ + public int deleteMesBaseRouteProcessByRouteProcessIds(Long[] routeProcessIds); + + /** + * 删除工艺路线组成信息信息 + * + * @param routeProcessId 工艺路线组成信息主键 + * @return 结果 + */ + public int deleteMesBaseRouteProcessByRouteProcessId(Long routeProcessId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseRouteService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseRouteService.java new file mode 100644 index 00000000..e5643730 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseRouteService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBaseRoute; + +/** + * 工艺路线Service接口 + * + * @author Yinq + * @date 2024-01-25 + */ +public interface IMesBaseRouteService +{ + /** + * 查询工艺路线 + * + * @param routeId 工艺路线主键 + * @return 工艺路线 + */ + public MesBaseRoute selectMesBaseRouteByRouteId(Long routeId); + + /** + * 查询工艺路线列表 + * + * @param mesBaseRoute 工艺路线 + * @return 工艺路线集合 + */ + public List selectMesBaseRouteList(MesBaseRoute mesBaseRoute); + + /** + * 新增工艺路线 + * + * @param mesBaseRoute 工艺路线 + * @return 结果 + */ + public int insertMesBaseRoute(MesBaseRoute mesBaseRoute); + + /** + * 修改工艺路线 + * + * @param mesBaseRoute 工艺路线 + * @return 结果 + */ + public int updateMesBaseRoute(MesBaseRoute mesBaseRoute); + + /** + * 批量删除工艺路线 + * + * @param routeIds 需要删除的工艺路线主键集合 + * @return 结果 + */ + public int deleteMesBaseRouteByRouteIds(Long[] routeIds); + + /** + * 删除工艺路线信息 + * + * @param routeId 工艺路线主键 + * @return 结果 + */ + public int deleteMesBaseRouteByRouteId(Long routeId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseRouteProcessServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseRouteProcessServiceImpl.java new file mode 100644 index 00000000..12f48cdd --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseRouteProcessServiceImpl.java @@ -0,0 +1,96 @@ +package com.hw.mes.service.impl; + +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.mes.mapper.MesBaseRouteProcessMapper; +import com.hw.mes.domain.MesBaseRouteProcess; +import com.hw.mes.service.IMesBaseRouteProcessService; + +/** + * 工艺路线组成信息Service业务层处理 + * + * @author Yinq + * @date 2024-01-25 + */ +@Service +public class MesBaseRouteProcessServiceImpl implements IMesBaseRouteProcessService +{ + @Autowired + private MesBaseRouteProcessMapper mesBaseRouteProcessMapper; + + /** + * 查询工艺路线组成信息 + * + * @param routeProcessId 工艺路线组成信息主键 + * @return 工艺路线组成信息 + */ + @Override + public MesBaseRouteProcess selectMesBaseRouteProcessByRouteProcessId(Long routeProcessId) + { + return mesBaseRouteProcessMapper.selectMesBaseRouteProcessByRouteProcessId(routeProcessId); + } + + /** + * 查询工艺路线组成信息列表 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 工艺路线组成信息 + */ + @Override + public List selectMesBaseRouteProcessList(MesBaseRouteProcess mesBaseRouteProcess) + { + return mesBaseRouteProcessMapper.selectMesBaseRouteProcessList(mesBaseRouteProcess); + } + + /** + * 新增工艺路线组成信息 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 结果 + */ + @Override + public int insertMesBaseRouteProcess(MesBaseRouteProcess mesBaseRouteProcess) + { + mesBaseRouteProcess.setCreateTime(DateUtils.getNowDate()); + return mesBaseRouteProcessMapper.insertMesBaseRouteProcess(mesBaseRouteProcess); + } + + /** + * 修改工艺路线组成信息 + * + * @param mesBaseRouteProcess 工艺路线组成信息 + * @return 结果 + */ + @Override + public int updateMesBaseRouteProcess(MesBaseRouteProcess mesBaseRouteProcess) + { + mesBaseRouteProcess.setUpdateTime(DateUtils.getNowDate()); + return mesBaseRouteProcessMapper.updateMesBaseRouteProcess(mesBaseRouteProcess); + } + + /** + * 批量删除工艺路线组成信息 + * + * @param routeProcessIds 需要删除的工艺路线组成信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseRouteProcessByRouteProcessIds(Long[] routeProcessIds) + { + return mesBaseRouteProcessMapper.deleteMesBaseRouteProcessByRouteProcessIds(routeProcessIds); + } + + /** + * 删除工艺路线组成信息信息 + * + * @param routeProcessId 工艺路线组成信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseRouteProcessByRouteProcessId(Long routeProcessId) + { + return mesBaseRouteProcessMapper.deleteMesBaseRouteProcessByRouteProcessId(routeProcessId); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseRouteServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseRouteServiceImpl.java new file mode 100644 index 00000000..7a0b7a58 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseRouteServiceImpl.java @@ -0,0 +1,137 @@ +package com.hw.mes.service.impl; + +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.hw.common.core.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.hw.mes.domain.MesBaseRouteProcess; +import com.hw.mes.mapper.MesBaseRouteMapper; +import com.hw.mes.domain.MesBaseRoute; +import com.hw.mes.service.IMesBaseRouteService; + +/** + * 工艺路线Service业务层处理 + * + * @author Yinq + * @date 2024-01-25 + */ +@Service +public class MesBaseRouteServiceImpl implements IMesBaseRouteService +{ + @Autowired + private MesBaseRouteMapper mesBaseRouteMapper; + + /** + * 查询工艺路线 + * + * @param routeId 工艺路线主键 + * @return 工艺路线 + */ + @Override + public MesBaseRoute selectMesBaseRouteByRouteId(Long routeId) + { + return mesBaseRouteMapper.selectMesBaseRouteByRouteId(routeId); + } + + /** + * 查询工艺路线列表 + * + * @param mesBaseRoute 工艺路线 + * @return 工艺路线 + */ + @Override + public List selectMesBaseRouteList(MesBaseRoute mesBaseRoute) + { + return mesBaseRouteMapper.selectMesBaseRouteList(mesBaseRoute); + } + + /** + * 新增工艺路线 + * + * @param mesBaseRoute 工艺路线 + * @return 结果 + */ + @Transactional + @Override + public int insertMesBaseRoute(MesBaseRoute mesBaseRoute) + { + mesBaseRoute.setCreateTime(DateUtils.getNowDate()); + int rows = mesBaseRouteMapper.insertMesBaseRoute(mesBaseRoute); + insertMesBaseRouteProcess(mesBaseRoute); + return rows; + } + + /** + * 修改工艺路线 + * + * @param mesBaseRoute 工艺路线 + * @return 结果 + */ + @Transactional + @Override + public int updateMesBaseRoute(MesBaseRoute mesBaseRoute) + { + mesBaseRoute.setUpdateTime(DateUtils.getNowDate()); + mesBaseRouteMapper.deleteMesBaseRouteProcessByRouteId(mesBaseRoute.getRouteId()); + insertMesBaseRouteProcess(mesBaseRoute); + return mesBaseRouteMapper.updateMesBaseRoute(mesBaseRoute); + } + + /** + * 批量删除工艺路线 + * + * @param routeIds 需要删除的工艺路线主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteMesBaseRouteByRouteIds(Long[] routeIds) + { + mesBaseRouteMapper.deleteMesBaseRouteProcessByRouteIds(routeIds); + return mesBaseRouteMapper.deleteMesBaseRouteByRouteIds(routeIds); + } + + /** + * 删除工艺路线信息 + * + * @param routeId 工艺路线主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteMesBaseRouteByRouteId(Long routeId) + { + mesBaseRouteMapper.deleteMesBaseRouteProcessByRouteId(routeId); + return mesBaseRouteMapper.deleteMesBaseRouteByRouteId(routeId); + } + + /** + * 新增工艺路线组成信息信息 + * + * @param mesBaseRoute 工艺路线对象 + */ + public void insertMesBaseRouteProcess(MesBaseRoute mesBaseRoute) + { + List mesBaseRouteProcessList = mesBaseRoute.getMesBaseRouteProcessList(); + Long routeId = mesBaseRoute.getRouteId(); + if (StringUtils.isNotNull(mesBaseRouteProcessList)) + { + List list = new ArrayList(); + for (MesBaseRouteProcess mesBaseRouteProcess : mesBaseRouteProcessList) + { + mesBaseRouteProcess.setRouteId(routeId); + mesBaseRouteProcess.setCreateTime(DateUtils.getNowDate()); + mesBaseRouteProcess.setCreateBy(SecurityUtils.getUsername()); + list.add(mesBaseRouteProcess); + } + if (list.size() > 0) + { + mesBaseRouteMapper.batchMesBaseRouteProcess(list); + } + } + } +} diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseRouteMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseRouteMapper.xml new file mode 100644 index 00000000..c5f05ee5 --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseRouteMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select route_id, route_name, route_desc, active_flag, remark, create_by, create_time, update_by, update_time from mes_base_route + + + + + + + + insert into mes_base_route + + route_name, + route_desc, + active_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{routeName}, + #{routeDesc}, + #{activeFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mes_base_route + + route_name = #{routeName}, + route_desc = #{routeDesc}, + active_flag = #{activeFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where route_id = #{routeId} + + + + delete from mes_base_route where route_id = #{routeId} + + + + delete from mes_base_route where route_id in + + #{routeId} + + + + + delete from mes_base_route_process where route_id in + + #{routeId} + + + + + delete from mes_base_route_process where route_id = #{routeId} + + + + insert into mes_base_route_process( route_process_id, route_id, process_id, process_order, remark, create_by, create_time, update_by, update_time) values + + ( #{item.routeProcessId}, #{item.routeId}, #{item.processId}, #{item.processOrder}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) + + + \ No newline at end of file diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseRouteProcessMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseRouteProcessMapper.xml new file mode 100644 index 00000000..2d6dd681 --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseRouteProcessMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + select route_process_id, route_id, process_id, process_order, remark, create_by, create_time, update_by, update_time from mes_base_route_process + + + + + + + + insert into mes_base_route_process + + route_id, + process_id, + process_order, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{routeId}, + #{processId}, + #{processOrder}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mes_base_route_process + + route_id = #{routeId}, + process_id = #{processId}, + process_order = #{processOrder}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where route_process_id = #{routeProcessId} + + + + delete from mes_base_route_process where route_process_id = #{routeProcessId} + + + + delete from mes_base_route_process where route_process_id in + + #{routeProcessId} + + + \ No newline at end of file diff --git a/hw-ui/src/api/mes/baseRoute.js b/hw-ui/src/api/mes/baseRoute.js new file mode 100644 index 00000000..34051f77 --- /dev/null +++ b/hw-ui/src/api/mes/baseRoute.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询工艺路线列表 +export function listBaseRoute(query) { + return request({ + url: '/mes/baseRoute/list', + method: 'get', + params: query + }) +} + +// 查询工艺路线下拉框列表 +export function findRouteList(query) { + return request({ + url: '/mes/baseRoute/findRouteList', + method: 'get', + params: query + }) +} + +// 查询工艺路线详细 +export function getBaseRoute(routeId) { + return request({ + url: '/mes/baseRoute/' + routeId, + method: 'get' + }) +} + +// 新增工艺路线 +export function addBaseRoute(data) { + return request({ + url: '/mes/baseRoute', + method: 'post', + data: data + }) +} + +// 修改工艺路线 +export function updateBaseRoute(data) { + return request({ + url: '/mes/baseRoute', + method: 'put', + data: data + }) +} + +// 删除工艺路线 +export function delBaseRoute(routeId) { + return request({ + url: '/mes/baseRoute/' + routeId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/mes/baseRouteProcess.js b/hw-ui/src/api/mes/baseRouteProcess.js new file mode 100644 index 00000000..6f06e331 --- /dev/null +++ b/hw-ui/src/api/mes/baseRouteProcess.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询工艺路线组成信息列表 +export function listBaseRouteProcess(query) { + return request({ + url: '/mes/baseRouteProcess/list', + method: 'get', + params: query + }) +} + +// 查询工艺路线组成信息详细 +export function getBaseRouteProcess(routeProcessId) { + return request({ + url: '/mes/baseRouteProcess/' + routeProcessId, + method: 'get' + }) +} + +// 新增工艺路线组成信息 +export function addBaseRouteProcess(data) { + return request({ + url: '/mes/baseRouteProcess', + method: 'post', + data: data + }) +} + +// 修改工艺路线组成信息 +export function updateBaseRouteProcess(data) { + return request({ + url: '/mes/baseRouteProcess', + method: 'put', + data: data + }) +} + +// 删除工艺路线组成信息 +export function delBaseRouteProcess(routeProcessId) { + return request({ + url: '/mes/baseRouteProcess/' + routeProcessId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/mes/processInfo.js b/hw-ui/src/api/mes/processInfo.js index cea5d8ce..81ad07f7 100644 --- a/hw-ui/src/api/mes/processInfo.js +++ b/hw-ui/src/api/mes/processInfo.js @@ -9,6 +9,15 @@ export function listProcessInfo(query) { }) } +// 查询工序下拉框列表 +export function findProcessList(query) { + return request({ + url: '/mes/processInfo/findProcessList', + method: 'get', + params: query + }) +} + // 查询工序信息详细 export function getProcessInfo(processId) { return request({ diff --git a/hw-ui/src/views/mes/baseRoute/index.vue b/hw-ui/src/views/mes/baseRoute/index.vue new file mode 100644 index 00000000..6a436cc6 --- /dev/null +++ b/hw-ui/src/views/mes/baseRoute/index.vue @@ -0,0 +1,426 @@ + + + diff --git a/hw-ui/src/views/mes/baseRouteProcess/index.vue b/hw-ui/src/views/mes/baseRouteProcess/index.vue new file mode 100644 index 00000000..93287d7e --- /dev/null +++ b/hw-ui/src/views/mes/baseRouteProcess/index.vue @@ -0,0 +1,338 @@ + + +