From f6154c58160ac4fc83f5e857ee0e0e2c1066fbca Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 26 Jan 2024 16:34:43 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E5=B7=A5=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E6=89=98=E7=9B=98=E3=80=81=E9=99=84=E4=BB=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesBaseAttachInfoController.java | 105 +++++ .../MesBasePalletInfoController.java | 105 +++++ .../MesBaseStationInfoController.java | 104 +++++ .../com/hw/mes/domain/MesBaseAttachInfo.java | 131 ++++++ .../com/hw/mes/domain/MesBasePalletInfo.java | 56 +++ .../com/hw/mes/domain/MesBaseStationInfo.java | 131 ++++++ .../mes/mapper/MesBaseAttachInfoMapper.java | 61 +++ .../mes/mapper/MesBasePalletInfoMapper.java | 61 +++ .../mes/mapper/MesBaseStationInfoMapper.java | 61 +++ .../service/IMesBaseAttachInfoService.java | 61 +++ .../service/IMesBasePalletInfoService.java | 61 +++ .../service/IMesBaseStationInfoService.java | 61 +++ .../impl/MesBaseAttachInfoServiceImpl.java | 99 +++++ .../impl/MesBasePalletInfoServiceImpl.java | 99 +++++ .../service/impl/MesBaseRouteServiceImpl.java | 2 + .../impl/MesBaseStationInfoServiceImpl.java | 99 +++++ .../impl/MesBaseSupplierInfoServiceImpl.java | 3 + .../mapper/mes/MesBaseAttachInfoMapper.xml | 117 ++++++ .../mapper/mes/MesBasePalletInfoMapper.xml | 80 ++++ .../mapper/mes/MesBaseStationInfoMapper.xml | 123 ++++++ hw-ui/src/api/mes/baseAttachInfo.js | 44 ++ hw-ui/src/api/mes/basePalletInfo.js | 44 ++ hw-ui/src/api/mes/baseStationInfo.js | 44 ++ hw-ui/src/views/mes/baseAttachInfo/index.vue | 357 ++++++++++++++++ hw-ui/src/views/mes/basePalletInfo/index.vue | 294 +++++++++++++ hw-ui/src/views/mes/baseRoute/index.vue | 3 +- hw-ui/src/views/mes/baseStationInfo/index.vue | 386 ++++++++++++++++++ 27 files changed, 2790 insertions(+), 2 deletions(-) create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBasePalletInfoController.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseAttachInfo.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseAttachInfoMapper.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBasePalletInfoMapper.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseAttachInfoService.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBasePalletInfoService.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java create mode 100644 hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseAttachInfoMapper.xml create mode 100644 hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml create mode 100644 hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseStationInfoMapper.xml create mode 100644 hw-ui/src/api/mes/baseAttachInfo.js create mode 100644 hw-ui/src/api/mes/basePalletInfo.js create mode 100644 hw-ui/src/api/mes/baseStationInfo.js create mode 100644 hw-ui/src/views/mes/baseAttachInfo/index.vue create mode 100644 hw-ui/src/views/mes/basePalletInfo/index.vue create mode 100644 hw-ui/src/views/mes/baseStationInfo/index.vue diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java new file mode 100644 index 00000000..b206ca45 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.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.MesBaseAttachInfo; +import com.hw.mes.service.IMesBaseAttachInfoService; +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-26 + */ +@RestController +@RequestMapping("/baseAttachInfo") +public class MesBaseAttachInfoController extends BaseController +{ + @Autowired + private IMesBaseAttachInfoService mesBaseAttachInfoService; + + /** + * 查询附件信息列表 + */ + @RequiresPermissions("mes:baseAttachInfo:list") + @GetMapping("/list") + public TableDataInfo list(MesBaseAttachInfo mesBaseAttachInfo) + { + startPage(); + List list = mesBaseAttachInfoService.selectMesBaseAttachInfoList(mesBaseAttachInfo); + return getDataTable(list); + } + + /** + * 导出附件信息列表 + */ + @RequiresPermissions("mes:baseAttachInfo:export") + @Log(title = "附件信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBaseAttachInfo mesBaseAttachInfo) + { + List list = mesBaseAttachInfoService.selectMesBaseAttachInfoList(mesBaseAttachInfo); + ExcelUtil util = new ExcelUtil(MesBaseAttachInfo.class); + util.exportExcel(response, list, "附件信息数据"); + } + + /** + * 获取附件信息详细信息 + */ + @RequiresPermissions("mes:baseAttachInfo:query") + @GetMapping(value = "/{attachId}") + public AjaxResult getInfo(@PathVariable("attachId") Long attachId) + { + return success(mesBaseAttachInfoService.selectMesBaseAttachInfoByAttachId(attachId)); + } + + /** + * 新增附件信息 + */ + @RequiresPermissions("mes:baseAttachInfo:add") + @Log(title = "附件信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBaseAttachInfo mesBaseAttachInfo) + { + return toAjax(mesBaseAttachInfoService.insertMesBaseAttachInfo(mesBaseAttachInfo)); + } + + /** + * 修改附件信息 + */ + @RequiresPermissions("mes:baseAttachInfo:edit") + @Log(title = "附件信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBaseAttachInfo mesBaseAttachInfo) + { + return toAjax(mesBaseAttachInfoService.updateMesBaseAttachInfo(mesBaseAttachInfo)); + } + + /** + * 删除附件信息 + */ + @RequiresPermissions("mes:baseAttachInfo:remove") + @Log(title = "附件信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{attachIds}") + public AjaxResult remove(@PathVariable Long[] attachIds) + { + return toAjax(mesBaseAttachInfoService.deleteMesBaseAttachInfoByAttachIds(attachIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBasePalletInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBasePalletInfoController.java new file mode 100644 index 00000000..3e36f8a7 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBasePalletInfoController.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.MesBasePalletInfo; +import com.hw.mes.service.IMesBasePalletInfoService; +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-26 + */ +@RestController +@RequestMapping("/basePalletInfo") +public class MesBasePalletInfoController extends BaseController +{ + @Autowired + private IMesBasePalletInfoService mesBasePalletInfoService; + + /** + * 查询托盘信息列表 + */ + @RequiresPermissions("mes:basePalletInfo:list") + @GetMapping("/list") + public TableDataInfo list(MesBasePalletInfo mesBasePalletInfo) + { + startPage(); + List list = mesBasePalletInfoService.selectMesBasePalletInfoList(mesBasePalletInfo); + return getDataTable(list); + } + + /** + * 导出托盘信息列表 + */ + @RequiresPermissions("mes:basePalletInfo:export") + @Log(title = "托盘信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBasePalletInfo mesBasePalletInfo) + { + List list = mesBasePalletInfoService.selectMesBasePalletInfoList(mesBasePalletInfo); + ExcelUtil util = new ExcelUtil(MesBasePalletInfo.class); + util.exportExcel(response, list, "托盘信息数据"); + } + + /** + * 获取托盘信息详细信息 + */ + @RequiresPermissions("mes:basePalletInfo:query") + @GetMapping(value = "/{palletInfoId}") + public AjaxResult getInfo(@PathVariable("palletInfoId") Long palletInfoId) + { + return success(mesBasePalletInfoService.selectMesBasePalletInfoByPalletInfoId(palletInfoId)); + } + + /** + * 新增托盘信息 + */ + @RequiresPermissions("mes:basePalletInfo:add") + @Log(title = "托盘信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBasePalletInfo mesBasePalletInfo) + { + return toAjax(mesBasePalletInfoService.insertMesBasePalletInfo(mesBasePalletInfo)); + } + + /** + * 修改托盘信息 + */ + @RequiresPermissions("mes:basePalletInfo:edit") + @Log(title = "托盘信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBasePalletInfo mesBasePalletInfo) + { + return toAjax(mesBasePalletInfoService.updateMesBasePalletInfo(mesBasePalletInfo)); + } + + /** + * 删除托盘信息 + */ + @RequiresPermissions("mes:basePalletInfo:remove") + @Log(title = "托盘信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{palletInfoIds}") + public AjaxResult remove(@PathVariable Long[] palletInfoIds) + { + return toAjax(mesBasePalletInfoService.deleteMesBasePalletInfoByPalletInfoIds(palletInfoIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java new file mode 100644 index 00000000..952d66f8 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java @@ -0,0 +1,104 @@ +package com.hw.mes.controller; + +import java.util.List; +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.MesBaseStationInfo; +import com.hw.mes.service.IMesBaseStationInfoService; +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-26 + */ +@RestController +@RequestMapping("/baseStationInfo") +public class MesBaseStationInfoController extends BaseController +{ + @Autowired + private IMesBaseStationInfoService mesBaseStationInfoService; + + /** + * 查询工位信息列表 + */ + @RequiresPermissions("mes:baseStationInfo:list") + @GetMapping("/list") + public TableDataInfo list(MesBaseStationInfo mesBaseStationInfo) + { + startPage(); + List list = mesBaseStationInfoService.selectMesBaseStationInfoList(mesBaseStationInfo); + return getDataTable(list); + } + + /** + * 导出工位信息列表 + */ + @RequiresPermissions("mes:baseStationInfo:export") + @Log(title = "工位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBaseStationInfo mesBaseStationInfo) + { + List list = mesBaseStationInfoService.selectMesBaseStationInfoList(mesBaseStationInfo); + ExcelUtil util = new ExcelUtil(MesBaseStationInfo.class); + util.exportExcel(response, list, "工位信息数据"); + } + + /** + * 获取工位信息详细信息 + */ + @RequiresPermissions("mes:baseStationInfo:query") + @GetMapping(value = "/{stationId}") + public AjaxResult getInfo(@PathVariable("stationId") Long stationId) + { + return success(mesBaseStationInfoService.selectMesBaseStationInfoByStationId(stationId)); + } + + /** + * 新增工位信息 + */ + @RequiresPermissions("mes:baseStationInfo:add") + @Log(title = "工位信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBaseStationInfo mesBaseStationInfo) + { + return toAjax(mesBaseStationInfoService.insertMesBaseStationInfo(mesBaseStationInfo)); + } + + /** + * 修改工位信息 + */ + @RequiresPermissions("mes:baseStationInfo:edit") + @Log(title = "工位信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBaseStationInfo mesBaseStationInfo) + { + return toAjax(mesBaseStationInfoService.updateMesBaseStationInfo(mesBaseStationInfo)); + } + + /** + * 删除工位信息 + */ + @RequiresPermissions("mes:baseStationInfo:remove") + @Log(title = "工位信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{stationIds}") + public AjaxResult remove(@PathVariable Long[] stationIds) + { + return toAjax(mesBaseStationInfoService.deleteMesBaseStationInfoByStationIds(stationIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseAttachInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseAttachInfo.java new file mode 100644 index 00000000..7464f56f --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseAttachInfo.java @@ -0,0 +1,131 @@ +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_attach_info + * + * @author Yinq + * @date 2024-01-26 + */ +public class MesBaseAttachInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long attachId; + + /** + * 附件编号 + */ + @Excel(name = "附件编号") + private String attachCode; + + /** + * 附件名称 + */ + @Excel(name = "附件名称") + private String attachName; + + /** + * 附件类别 + */ + @Excel(name = "附件类别") + private String attachType; + + /** + * 附件路径 + */ + @Excel(name = "附件路径") + private String attachPath; + + /** + * 所属工序 + */ + @Excel(name = "所属工序") + private Long processId; + + /** + * 激活标识 + */ + @Excel(name = "激活标识") + private String activeFlag; + + public void setAttachId(Long attachId) { + this.attachId = attachId; + } + + public Long getAttachId() { + return attachId; + } + + public void setAttachCode(String attachCode) { + this.attachCode = attachCode; + } + + public String getAttachCode() { + return attachCode; + } + + public void setAttachName(String attachName) { + this.attachName = attachName; + } + + public String getAttachName() { + return attachName; + } + + public void setAttachType(String attachType) { + this.attachType = attachType; + } + + public String getAttachType() { + return attachType; + } + + public void setAttachPath(String attachPath) { + this.attachPath = attachPath; + } + + public String getAttachPath() { + return attachPath; + } + + public void setProcessId(Long processId) { + this.processId = processId; + } + + public Long getProcessId() { + return processId; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("attachId", getAttachId()) + .append("attachCode", getAttachCode()) + .append("attachName", getAttachName()) + .append("attachType", getAttachType()) + .append("attachPath", getAttachPath()) + .append("processId", getProcessId()) + .append("activeFlag", getActiveFlag()) + .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/domain/MesBasePalletInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java new file mode 100644 index 00000000..4e8976b4 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java @@ -0,0 +1,56 @@ +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_pallet_info + * + * @author Yinq + * @date 2024-01-26 + */ +public class MesBasePalletInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 托盘ID */ + private Long palletInfoId; + + /** RFID编码 */ + @Excel(name = "RFID编码") + private String palletInfoCode; + + public void setPalletInfoId(Long palletInfoId) + { + this.palletInfoId = palletInfoId; + } + + public Long getPalletInfoId() + { + return palletInfoId; + } + public void setPalletInfoCode(String palletInfoCode) + { + this.palletInfoCode = palletInfoCode; + } + + public String getPalletInfoCode() + { + return palletInfoCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("palletInfoId", getPalletInfoId()) + .append("palletInfoCode", getPalletInfoCode()) + .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/domain/MesBaseStationInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java new file mode 100644 index 00000000..79399a89 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java @@ -0,0 +1,131 @@ +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_station_info + * + * @author Yinq + * @date 2024-01-26 + */ +public class MesBaseStationInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long stationId; + + /** + * 工位编号 + */ + @Excel(name = "工位编号") + private String stationCode; + + /** + * 工位名称 + */ + @Excel(name = "工位名称") + private String stationName; + + /** + * 所属工序 + */ + @Excel(name = "所属工序") + private Long processId; + + /** + * 楼层 + */ + @Excel(name = "楼层") + private Long floor; + + /** + * 单位生产时间 + */ + @Excel(name = "单位生产时间") + private Long productionTime; + + /** + * 激活标识 + */ + @Excel(name = "激活标识") + private String activeFlag; + + public void setStationId(Long stationId) { + this.stationId = stationId; + } + + public Long getStationId() { + return stationId; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } + + public String getStationCode() { + return stationCode; + } + + public void setStationName(String stationName) { + this.stationName = stationName; + } + + public String getStationName() { + return stationName; + } + + public void setProcessId(Long processId) { + this.processId = processId; + } + + public Long getProcessId() { + return processId; + } + + public void setFloor(Long floor) { + this.floor = floor; + } + + public Long getFloor() { + return floor; + } + + public void setProductionTime(Long productionTime) { + this.productionTime = productionTime; + } + + public Long getProductionTime() { + return productionTime; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("stationId", getStationId()) + .append("stationCode", getStationCode()) + .append("stationName", getStationName()) + .append("processId", getProcessId()) + .append("floor", getFloor()) + .append("productionTime", getProductionTime()) + .append("activeFlag", getActiveFlag()) + .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/MesBaseAttachInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseAttachInfoMapper.java new file mode 100644 index 00000000..2763d92a --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseAttachInfoMapper.java @@ -0,0 +1,61 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBaseAttachInfo; + +/** + * 附件信息Mapper接口 + * + * @author Yinq + * @date 2024-01-26 + */ +public interface MesBaseAttachInfoMapper +{ + /** + * 查询附件信息 + * + * @param attachId 附件信息主键 + * @return 附件信息 + */ + public MesBaseAttachInfo selectMesBaseAttachInfoByAttachId(Long attachId); + + /** + * 查询附件信息列表 + * + * @param mesBaseAttachInfo 附件信息 + * @return 附件信息集合 + */ + public List selectMesBaseAttachInfoList(MesBaseAttachInfo mesBaseAttachInfo); + + /** + * 新增附件信息 + * + * @param mesBaseAttachInfo 附件信息 + * @return 结果 + */ + public int insertMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo); + + /** + * 修改附件信息 + * + * @param mesBaseAttachInfo 附件信息 + * @return 结果 + */ + public int updateMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo); + + /** + * 删除附件信息 + * + * @param attachId 附件信息主键 + * @return 结果 + */ + public int deleteMesBaseAttachInfoByAttachId(Long attachId); + + /** + * 批量删除附件信息 + * + * @param attachIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseAttachInfoByAttachIds(Long[] attachIds); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBasePalletInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBasePalletInfoMapper.java new file mode 100644 index 00000000..4c9606cc --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBasePalletInfoMapper.java @@ -0,0 +1,61 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBasePalletInfo; + +/** + * 托盘信息Mapper接口 + * + * @author Yinq + * @date 2024-01-26 + */ +public interface MesBasePalletInfoMapper +{ + /** + * 查询托盘信息 + * + * @param palletInfoId 托盘信息主键 + * @return 托盘信息 + */ + public MesBasePalletInfo selectMesBasePalletInfoByPalletInfoId(Long palletInfoId); + + /** + * 查询托盘信息列表 + * + * @param mesBasePalletInfo 托盘信息 + * @return 托盘信息集合 + */ + public List selectMesBasePalletInfoList(MesBasePalletInfo mesBasePalletInfo); + + /** + * 新增托盘信息 + * + * @param mesBasePalletInfo 托盘信息 + * @return 结果 + */ + public int insertMesBasePalletInfo(MesBasePalletInfo mesBasePalletInfo); + + /** + * 修改托盘信息 + * + * @param mesBasePalletInfo 托盘信息 + * @return 结果 + */ + public int updateMesBasePalletInfo(MesBasePalletInfo mesBasePalletInfo); + + /** + * 删除托盘信息 + * + * @param palletInfoId 托盘信息主键 + * @return 结果 + */ + public int deleteMesBasePalletInfoByPalletInfoId(Long palletInfoId); + + /** + * 批量删除托盘信息 + * + * @param palletInfoIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBasePalletInfoByPalletInfoIds(Long[] palletInfoIds); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java new file mode 100644 index 00000000..e7e5c1b7 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java @@ -0,0 +1,61 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBaseStationInfo; + +/** + * 工位信息Mapper接口 + * + * @author Yinq + * @date 2024-01-26 + */ +public interface MesBaseStationInfoMapper +{ + /** + * 查询工位信息 + * + * @param stationId 工位信息主键 + * @return 工位信息 + */ + public MesBaseStationInfo selectMesBaseStationInfoByStationId(Long stationId); + + /** + * 查询工位信息列表 + * + * @param mesBaseStationInfo 工位信息 + * @return 工位信息集合 + */ + public List selectMesBaseStationInfoList(MesBaseStationInfo mesBaseStationInfo); + + /** + * 新增工位信息 + * + * @param mesBaseStationInfo 工位信息 + * @return 结果 + */ + public int insertMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo); + + /** + * 修改工位信息 + * + * @param mesBaseStationInfo 工位信息 + * @return 结果 + */ + public int updateMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo); + + /** + * 删除工位信息 + * + * @param stationId 工位信息主键 + * @return 结果 + */ + public int deleteMesBaseStationInfoByStationId(Long stationId); + + /** + * 批量删除工位信息 + * + * @param stationIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseStationInfoByStationIds(Long[] stationIds); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseAttachInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseAttachInfoService.java new file mode 100644 index 00000000..dc6a3a1c --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseAttachInfoService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBaseAttachInfo; + +/** + * 附件信息Service接口 + * + * @author Yinq + * @date 2024-01-26 + */ +public interface IMesBaseAttachInfoService +{ + /** + * 查询附件信息 + * + * @param attachId 附件信息主键 + * @return 附件信息 + */ + public MesBaseAttachInfo selectMesBaseAttachInfoByAttachId(Long attachId); + + /** + * 查询附件信息列表 + * + * @param mesBaseAttachInfo 附件信息 + * @return 附件信息集合 + */ + public List selectMesBaseAttachInfoList(MesBaseAttachInfo mesBaseAttachInfo); + + /** + * 新增附件信息 + * + * @param mesBaseAttachInfo 附件信息 + * @return 结果 + */ + public int insertMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo); + + /** + * 修改附件信息 + * + * @param mesBaseAttachInfo 附件信息 + * @return 结果 + */ + public int updateMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo); + + /** + * 批量删除附件信息 + * + * @param attachIds 需要删除的附件信息主键集合 + * @return 结果 + */ + public int deleteMesBaseAttachInfoByAttachIds(Long[] attachIds); + + /** + * 删除附件信息信息 + * + * @param attachId 附件信息主键 + * @return 结果 + */ + public int deleteMesBaseAttachInfoByAttachId(Long attachId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBasePalletInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBasePalletInfoService.java new file mode 100644 index 00000000..dc3c48f8 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBasePalletInfoService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBasePalletInfo; + +/** + * 托盘信息Service接口 + * + * @author Yinq + * @date 2024-01-26 + */ +public interface IMesBasePalletInfoService +{ + /** + * 查询托盘信息 + * + * @param palletInfoId 托盘信息主键 + * @return 托盘信息 + */ + public MesBasePalletInfo selectMesBasePalletInfoByPalletInfoId(Long palletInfoId); + + /** + * 查询托盘信息列表 + * + * @param mesBasePalletInfo 托盘信息 + * @return 托盘信息集合 + */ + public List selectMesBasePalletInfoList(MesBasePalletInfo mesBasePalletInfo); + + /** + * 新增托盘信息 + * + * @param mesBasePalletInfo 托盘信息 + * @return 结果 + */ + public int insertMesBasePalletInfo(MesBasePalletInfo mesBasePalletInfo); + + /** + * 修改托盘信息 + * + * @param mesBasePalletInfo 托盘信息 + * @return 结果 + */ + public int updateMesBasePalletInfo(MesBasePalletInfo mesBasePalletInfo); + + /** + * 批量删除托盘信息 + * + * @param palletInfoIds 需要删除的托盘信息主键集合 + * @return 结果 + */ + public int deleteMesBasePalletInfoByPalletInfoIds(Long[] palletInfoIds); + + /** + * 删除托盘信息信息 + * + * @param palletInfoId 托盘信息主键 + * @return 结果 + */ + public int deleteMesBasePalletInfoByPalletInfoId(Long palletInfoId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java new file mode 100644 index 00000000..f474b5c2 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBaseStationInfo; + +/** + * 工位信息Service接口 + * + * @author Yinq + * @date 2024-01-26 + */ +public interface IMesBaseStationInfoService +{ + /** + * 查询工位信息 + * + * @param stationId 工位信息主键 + * @return 工位信息 + */ + public MesBaseStationInfo selectMesBaseStationInfoByStationId(Long stationId); + + /** + * 查询工位信息列表 + * + * @param mesBaseStationInfo 工位信息 + * @return 工位信息集合 + */ + public List selectMesBaseStationInfoList(MesBaseStationInfo mesBaseStationInfo); + + /** + * 新增工位信息 + * + * @param mesBaseStationInfo 工位信息 + * @return 结果 + */ + public int insertMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo); + + /** + * 修改工位信息 + * + * @param mesBaseStationInfo 工位信息 + * @return 结果 + */ + public int updateMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo); + + /** + * 批量删除工位信息 + * + * @param stationIds 需要删除的工位信息主键集合 + * @return 结果 + */ + public int deleteMesBaseStationInfoByStationIds(Long[] stationIds); + + /** + * 删除工位信息信息 + * + * @param stationId 工位信息主键 + * @return 结果 + */ + public int deleteMesBaseStationInfoByStationId(Long stationId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java new file mode 100644 index 00000000..289c49dc --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java @@ -0,0 +1,99 @@ +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 com.hw.mes.mapper.MesBaseAttachInfoMapper; +import com.hw.mes.domain.MesBaseAttachInfo; +import com.hw.mes.service.IMesBaseAttachInfoService; + +/** + * 附件信息Service业务层处理 + * + * @author Yinq + * @date 2024-01-26 + */ +@Service +public class MesBaseAttachInfoServiceImpl implements IMesBaseAttachInfoService +{ + @Autowired + private MesBaseAttachInfoMapper mesBaseAttachInfoMapper; + + /** + * 查询附件信息 + * + * @param attachId 附件信息主键 + * @return 附件信息 + */ + @Override + public MesBaseAttachInfo selectMesBaseAttachInfoByAttachId(Long attachId) + { + return mesBaseAttachInfoMapper.selectMesBaseAttachInfoByAttachId(attachId); + } + + /** + * 查询附件信息列表 + * + * @param mesBaseAttachInfo 附件信息 + * @return 附件信息 + */ + @Override + public List selectMesBaseAttachInfoList(MesBaseAttachInfo mesBaseAttachInfo) + { + return mesBaseAttachInfoMapper.selectMesBaseAttachInfoList(mesBaseAttachInfo); + } + + /** + * 新增附件信息 + * + * @param mesBaseAttachInfo 附件信息 + * @return 结果 + */ + @Override + public int insertMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo) + { + mesBaseAttachInfo.setCreateBy(SecurityUtils.getUsername()); + mesBaseAttachInfo.setCreateTime(DateUtils.getNowDate()); + return mesBaseAttachInfoMapper.insertMesBaseAttachInfo(mesBaseAttachInfo); + } + + /** + * 修改附件信息 + * + * @param mesBaseAttachInfo 附件信息 + * @return 结果 + */ + @Override + public int updateMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo) + { + mesBaseAttachInfo.setUpdateTime(DateUtils.getNowDate()); + mesBaseAttachInfo.setUpdateBy(SecurityUtils.getUsername()); + return mesBaseAttachInfoMapper.updateMesBaseAttachInfo(mesBaseAttachInfo); + } + + /** + * 批量删除附件信息 + * + * @param attachIds 需要删除的附件信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseAttachInfoByAttachIds(Long[] attachIds) + { + return mesBaseAttachInfoMapper.deleteMesBaseAttachInfoByAttachIds(attachIds); + } + + /** + * 删除附件信息信息 + * + * @param attachId 附件信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseAttachInfoByAttachId(Long attachId) + { + return mesBaseAttachInfoMapper.deleteMesBaseAttachInfoByAttachId(attachId); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java new file mode 100644 index 00000000..5064ff63 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java @@ -0,0 +1,99 @@ +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 com.hw.mes.mapper.MesBasePalletInfoMapper; +import com.hw.mes.domain.MesBasePalletInfo; +import com.hw.mes.service.IMesBasePalletInfoService; + +/** + * 托盘信息Service业务层处理 + * + * @author Yinq + * @date 2024-01-26 + */ +@Service +public class MesBasePalletInfoServiceImpl implements IMesBasePalletInfoService +{ + @Autowired + private MesBasePalletInfoMapper mesBasePalletInfoMapper; + + /** + * 查询托盘信息 + * + * @param palletInfoId 托盘信息主键 + * @return 托盘信息 + */ + @Override + public MesBasePalletInfo selectMesBasePalletInfoByPalletInfoId(Long palletInfoId) + { + return mesBasePalletInfoMapper.selectMesBasePalletInfoByPalletInfoId(palletInfoId); + } + + /** + * 查询托盘信息列表 + * + * @param mesBasePalletInfo 托盘信息 + * @return 托盘信息 + */ + @Override + public List selectMesBasePalletInfoList(MesBasePalletInfo mesBasePalletInfo) + { + return mesBasePalletInfoMapper.selectMesBasePalletInfoList(mesBasePalletInfo); + } + + /** + * 新增托盘信息 + * + * @param mesBasePalletInfo 托盘信息 + * @return 结果 + */ + @Override + public int insertMesBasePalletInfo(MesBasePalletInfo mesBasePalletInfo) + { + mesBasePalletInfo.setCreateTime(DateUtils.getNowDate()); + mesBasePalletInfo.setCreateBy(SecurityUtils.getUsername()); + return mesBasePalletInfoMapper.insertMesBasePalletInfo(mesBasePalletInfo); + } + + /** + * 修改托盘信息 + * + * @param mesBasePalletInfo 托盘信息 + * @return 结果 + */ + @Override + public int updateMesBasePalletInfo(MesBasePalletInfo mesBasePalletInfo) + { + mesBasePalletInfo.setUpdateTime(DateUtils.getNowDate()); + mesBasePalletInfo.setUpdateBy(SecurityUtils.getUsername()); + return mesBasePalletInfoMapper.updateMesBasePalletInfo(mesBasePalletInfo); + } + + /** + * 批量删除托盘信息 + * + * @param palletInfoIds 需要删除的托盘信息主键 + * @return 结果 + */ + @Override + public int deleteMesBasePalletInfoByPalletInfoIds(Long[] palletInfoIds) + { + return mesBasePalletInfoMapper.deleteMesBasePalletInfoByPalletInfoIds(palletInfoIds); + } + + /** + * 删除托盘信息信息 + * + * @param palletInfoId 托盘信息主键 + * @return 结果 + */ + @Override + public int deleteMesBasePalletInfoByPalletInfoId(Long palletInfoId) + { + return mesBasePalletInfoMapper.deleteMesBasePalletInfoByPalletInfoId(palletInfoId); + } +} 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 index 7a0b7a58..e555df03 100644 --- 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 @@ -60,6 +60,7 @@ public class MesBaseRouteServiceImpl implements IMesBaseRouteService public int insertMesBaseRoute(MesBaseRoute mesBaseRoute) { mesBaseRoute.setCreateTime(DateUtils.getNowDate()); + mesBaseRoute.setCreateBy(SecurityUtils.getUsername()); int rows = mesBaseRouteMapper.insertMesBaseRoute(mesBaseRoute); insertMesBaseRouteProcess(mesBaseRoute); return rows; @@ -76,6 +77,7 @@ public class MesBaseRouteServiceImpl implements IMesBaseRouteService public int updateMesBaseRoute(MesBaseRoute mesBaseRoute) { mesBaseRoute.setUpdateTime(DateUtils.getNowDate()); + mesBaseRoute.setUpdateBy(SecurityUtils.getUsername()); mesBaseRouteMapper.deleteMesBaseRouteProcessByRouteId(mesBaseRoute.getRouteId()); insertMesBaseRouteProcess(mesBaseRoute); return mesBaseRouteMapper.updateMesBaseRoute(mesBaseRoute); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java new file mode 100644 index 00000000..888af9c2 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java @@ -0,0 +1,99 @@ +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 com.hw.mes.mapper.MesBaseStationInfoMapper; +import com.hw.mes.domain.MesBaseStationInfo; +import com.hw.mes.service.IMesBaseStationInfoService; + +/** + * 工位信息Service业务层处理 + * + * @author Yinq + * @date 2024-01-26 + */ +@Service +public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService +{ + @Autowired + private MesBaseStationInfoMapper mesBaseStationInfoMapper; + + /** + * 查询工位信息 + * + * @param stationId 工位信息主键 + * @return 工位信息 + */ + @Override + public MesBaseStationInfo selectMesBaseStationInfoByStationId(Long stationId) + { + return mesBaseStationInfoMapper.selectMesBaseStationInfoByStationId(stationId); + } + + /** + * 查询工位信息列表 + * + * @param mesBaseStationInfo 工位信息 + * @return 工位信息 + */ + @Override + public List selectMesBaseStationInfoList(MesBaseStationInfo mesBaseStationInfo) + { + return mesBaseStationInfoMapper.selectMesBaseStationInfoList(mesBaseStationInfo); + } + + /** + * 新增工位信息 + * + * @param mesBaseStationInfo 工位信息 + * @return 结果 + */ + @Override + public int insertMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo) + { + mesBaseStationInfo.setCreateTime(DateUtils.getNowDate()); + mesBaseStationInfo.setCreateBy(SecurityUtils.getUsername()); + return mesBaseStationInfoMapper.insertMesBaseStationInfo(mesBaseStationInfo); + } + + /** + * 修改工位信息 + * + * @param mesBaseStationInfo 工位信息 + * @return 结果 + */ + @Override + public int updateMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo) + { + mesBaseStationInfo.setUpdateTime(DateUtils.getNowDate()); + mesBaseStationInfo.setUpdateBy(SecurityUtils.getUsername()); + return mesBaseStationInfoMapper.updateMesBaseStationInfo(mesBaseStationInfo); + } + + /** + * 批量删除工位信息 + * + * @param stationIds 需要删除的工位信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseStationInfoByStationIds(Long[] stationIds) + { + return mesBaseStationInfoMapper.deleteMesBaseStationInfoByStationIds(stationIds); + } + + /** + * 删除工位信息信息 + * + * @param stationId 工位信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseStationInfoByStationId(Long stationId) + { + return mesBaseStationInfoMapper.deleteMesBaseStationInfoByStationId(stationId); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseSupplierInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseSupplierInfoServiceImpl.java index 002b5dc8..6ffa57f5 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseSupplierInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseSupplierInfoServiceImpl.java @@ -2,6 +2,7 @@ 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 com.hw.mes.mapper.MesBaseSupplierInfoMapper; @@ -54,6 +55,7 @@ public class MesBaseSupplierInfoServiceImpl implements IMesBaseSupplierInfoServi public int insertMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo) { mesBaseSupplierInfo.setCreateTime(DateUtils.getNowDate()); + mesBaseSupplierInfo.setCreateBy(SecurityUtils.getUsername()); return mesBaseSupplierInfoMapper.insertMesBaseSupplierInfo(mesBaseSupplierInfo); } @@ -67,6 +69,7 @@ public class MesBaseSupplierInfoServiceImpl implements IMesBaseSupplierInfoServi public int updateMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo) { mesBaseSupplierInfo.setUpdateTime(DateUtils.getNowDate()); + mesBaseSupplierInfo.setUpdateBy(SecurityUtils.getUsername()); return mesBaseSupplierInfoMapper.updateMesBaseSupplierInfo(mesBaseSupplierInfo); } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseAttachInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseAttachInfoMapper.xml new file mode 100644 index 00000000..1ee1716b --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseAttachInfoMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + select attach_id, + attach_code, + attach_name, + attach_type, + attach_path, + process_id, + active_flag, + remark, + create_by, + create_time, + update_by, + update_time + from mes_base_attach_info + + + + + + + + insert into mes_base_attach_info + + attach_code, + attach_name, + attach_type, + attach_path, + process_id, + active_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{attachCode}, + #{attachName}, + #{attachType}, + #{attachPath}, + #{processId}, + #{activeFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mes_base_attach_info + + attach_code = #{attachCode}, + attach_name = #{attachName}, + attach_type = #{attachType}, + attach_path = #{attachPath}, + process_id = #{processId}, + active_flag = #{activeFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where attach_id = #{attachId} + + + + delete + from mes_base_attach_info + where attach_id = #{attachId} + + + + delete from mes_base_attach_info where attach_id in + + #{attachId} + + + \ No newline at end of file diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml new file mode 100644 index 00000000..a4a8e5be --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + select pallet_info_id, pallet_info_code, remark, create_by, create_time, update_by, update_time + from mes_base_pallet_info + + + + + + + + insert into mes_base_pallet_info + + pallet_info_code, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{palletInfoCode}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mes_base_pallet_info + + pallet_info_code = #{palletInfoCode}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where pallet_info_id = #{palletInfoId} + + + + delete + from mes_base_pallet_info + where pallet_info_id = #{palletInfoId} + + + + delete from mes_base_pallet_info where pallet_info_id in + + #{palletInfoId} + + + \ No newline at end of file diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseStationInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseStationInfoMapper.xml new file mode 100644 index 00000000..c907eec5 --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseStationInfoMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + select station_id, + station_code, + station_name, + process_id, + floor, + production_time, + active_flag, + remark, + create_by, + create_time, + update_by, + update_time + from mes_base_station_info + + + + + + + + insert into mes_base_station_info + + station_code, + station_name, + process_id, + floor, + production_time, + active_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{stationCode}, + #{stationName}, + #{processId}, + #{floor}, + #{productionTime}, + #{activeFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mes_base_station_info + + station_code = #{stationCode}, + station_name = #{stationName}, + process_id = #{processId}, + floor = #{floor}, + production_time = #{productionTime}, + active_flag = #{activeFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where station_id = #{stationId} + + + + delete + from mes_base_station_info + where station_id = #{stationId} + + + + delete from mes_base_station_info where station_id in + + #{stationId} + + + \ No newline at end of file diff --git a/hw-ui/src/api/mes/baseAttachInfo.js b/hw-ui/src/api/mes/baseAttachInfo.js new file mode 100644 index 00000000..9c28d129 --- /dev/null +++ b/hw-ui/src/api/mes/baseAttachInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询附件信息列表 +export function listBaseAttachInfo(query) { + return request({ + url: '/mes/baseAttachInfo/list', + method: 'get', + params: query + }) +} + +// 查询附件信息详细 +export function getBaseAttachInfo(attachId) { + return request({ + url: '/mes/baseAttachInfo/' + attachId, + method: 'get' + }) +} + +// 新增附件信息 +export function addBaseAttachInfo(data) { + return request({ + url: '/mes/baseAttachInfo', + method: 'post', + data: data + }) +} + +// 修改附件信息 +export function updateBaseAttachInfo(data) { + return request({ + url: '/mes/baseAttachInfo', + method: 'put', + data: data + }) +} + +// 删除附件信息 +export function delBaseAttachInfo(attachId) { + return request({ + url: '/mes/baseAttachInfo/' + attachId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/mes/basePalletInfo.js b/hw-ui/src/api/mes/basePalletInfo.js new file mode 100644 index 00000000..d7822ad2 --- /dev/null +++ b/hw-ui/src/api/mes/basePalletInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询托盘信息列表 +export function listBasePalletInfo(query) { + return request({ + url: '/mes/basePalletInfo/list', + method: 'get', + params: query + }) +} + +// 查询托盘信息详细 +export function getBasePalletInfo(palletInfoId) { + return request({ + url: '/mes/basePalletInfo/' + palletInfoId, + method: 'get' + }) +} + +// 新增托盘信息 +export function addBasePalletInfo(data) { + return request({ + url: '/mes/basePalletInfo', + method: 'post', + data: data + }) +} + +// 修改托盘信息 +export function updateBasePalletInfo(data) { + return request({ + url: '/mes/basePalletInfo', + method: 'put', + data: data + }) +} + +// 删除托盘信息 +export function delBasePalletInfo(palletInfoId) { + return request({ + url: '/mes/basePalletInfo/' + palletInfoId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/mes/baseStationInfo.js b/hw-ui/src/api/mes/baseStationInfo.js new file mode 100644 index 00000000..8c47ec6b --- /dev/null +++ b/hw-ui/src/api/mes/baseStationInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询工位信息列表 +export function listBaseStationInfo(query) { + return request({ + url: '/mes/baseStationInfo/list', + method: 'get', + params: query + }) +} + +// 查询工位信息详细 +export function getBaseStationInfo(stationId) { + return request({ + url: '/mes/baseStationInfo/' + stationId, + method: 'get' + }) +} + +// 新增工位信息 +export function addBaseStationInfo(data) { + return request({ + url: '/mes/baseStationInfo', + method: 'post', + data: data + }) +} + +// 修改工位信息 +export function updateBaseStationInfo(data) { + return request({ + url: '/mes/baseStationInfo', + method: 'put', + data: data + }) +} + +// 删除工位信息 +export function delBaseStationInfo(stationId) { + return request({ + url: '/mes/baseStationInfo/' + stationId, + method: 'delete' + }) +} diff --git a/hw-ui/src/views/mes/baseAttachInfo/index.vue b/hw-ui/src/views/mes/baseAttachInfo/index.vue new file mode 100644 index 00000000..f4488fa1 --- /dev/null +++ b/hw-ui/src/views/mes/baseAttachInfo/index.vue @@ -0,0 +1,357 @@ + + + diff --git a/hw-ui/src/views/mes/basePalletInfo/index.vue b/hw-ui/src/views/mes/basePalletInfo/index.vue new file mode 100644 index 00000000..41973a4d --- /dev/null +++ b/hw-ui/src/views/mes/basePalletInfo/index.vue @@ -0,0 +1,294 @@ + + + diff --git a/hw-ui/src/views/mes/baseRoute/index.vue b/hw-ui/src/views/mes/baseRoute/index.vue index 6a436cc6..c401e359 100644 --- a/hw-ui/src/views/mes/baseRoute/index.vue +++ b/hw-ui/src/views/mes/baseRoute/index.vue @@ -192,8 +192,7 @@ import { getBaseRoute, delBaseRoute, addBaseRoute, - updateBaseRoute, - findRouteList + updateBaseRoute } from "@/api/mes/baseRoute"; import {findProcessList} from "@//api/mes/processInfo"; diff --git a/hw-ui/src/views/mes/baseStationInfo/index.vue b/hw-ui/src/views/mes/baseStationInfo/index.vue new file mode 100644 index 00000000..8ae1b98d --- /dev/null +++ b/hw-ui/src/views/mes/baseStationInfo/index.vue @@ -0,0 +1,386 @@ + + +