diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseFactoryInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseFactoryInfoController.java index 7ec41fe..3b1ee3d 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseFactoryInfoController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseFactoryInfoController.java @@ -49,6 +49,16 @@ public class MesBaseFactoryInfoController extends BaseController return getDataTable(list); } + /** + * 查询工厂信息下拉框列表 + */ + @GetMapping("/findFactoryList") + public AjaxResult findFactoryList(MesBaseFactoryInfo mesBaseFactoryInfo) + { + List list = mesBaseFactoryInfoService.selectMesBaseFactoryInfoList(mesBaseFactoryInfo); + return success(list); + } + /** * 导出工厂信息列表 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProdlineInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProdlineInfoController.java new file mode 100644 index 0000000..9cc4ab2 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseProdlineInfoController.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.MesBaseProdlineInfo; +import com.hw.mes.service.IMesBaseProdlineInfoService; +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-24 + */ +@RestController +@RequestMapping("/baseProdlineInfo") +public class MesBaseProdlineInfoController extends BaseController +{ + @Autowired + private IMesBaseProdlineInfoService mesBaseProdlineInfoService; + + /** + * 查询产线信息列表 + */ + @RequiresPermissions("mes:baseProdlineInfo:list") + @GetMapping("/list") + public TableDataInfo list(MesBaseProdlineInfo mesBaseProdlineInfo) + { + startPage(); + List list = mesBaseProdlineInfoService.selectMesBaseProdlineInfoList(mesBaseProdlineInfo); + return getDataTable(list); + } + + /** + * 导出产线信息列表 + */ + @RequiresPermissions("mes:baseProdlineInfo:export") + @Log(title = "产线信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBaseProdlineInfo mesBaseProdlineInfo) + { + List list = mesBaseProdlineInfoService.selectMesBaseProdlineInfoList(mesBaseProdlineInfo); + ExcelUtil util = new ExcelUtil(MesBaseProdlineInfo.class); + util.exportExcel(response, list, "产线信息数据"); + } + + /** + * 获取产线信息详细信息 + */ + @RequiresPermissions("mes:baseProdlineInfo:query") + @GetMapping(value = "/{prodlineId}") + public AjaxResult getInfo(@PathVariable("prodlineId") Long prodlineId) + { + return success(mesBaseProdlineInfoService.selectMesBaseProdlineInfoByProdlineId(prodlineId)); + } + + /** + * 新增产线信息 + */ + @RequiresPermissions("mes:baseProdlineInfo:add") + @Log(title = "产线信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBaseProdlineInfo mesBaseProdlineInfo) + { + return toAjax(mesBaseProdlineInfoService.insertMesBaseProdlineInfo(mesBaseProdlineInfo)); + } + + /** + * 修改产线信息 + */ + @RequiresPermissions("mes:baseProdlineInfo:edit") + @Log(title = "产线信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBaseProdlineInfo mesBaseProdlineInfo) + { + return toAjax(mesBaseProdlineInfoService.updateMesBaseProdlineInfo(mesBaseProdlineInfo)); + } + + /** + * 删除产线信息 + */ + @RequiresPermissions("mes:baseProdlineInfo:remove") + @Log(title = "产线信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{prodlineIds}") + public AjaxResult remove(@PathVariable Long[] prodlineIds) + { + return toAjax(mesBaseProdlineInfoService.deleteMesBaseProdlineInfoByProdlineIds(prodlineIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseSupplierInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseSupplierInfoController.java new file mode 100644 index 0000000..32e759d --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseSupplierInfoController.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.MesBaseSupplierInfo; +import com.hw.mes.service.IMesBaseSupplierInfoService; +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-24 + */ +@RestController +@RequestMapping("/supplierInfo") +public class MesBaseSupplierInfoController extends BaseController +{ + @Autowired + private IMesBaseSupplierInfoService mesBaseSupplierInfoService; + + /** + * 查询物料供应商信息列表 + */ + @RequiresPermissions("mes:supplierInfo:list") + @GetMapping("/list") + public TableDataInfo list(MesBaseSupplierInfo mesBaseSupplierInfo) + { + startPage(); + List list = mesBaseSupplierInfoService.selectMesBaseSupplierInfoList(mesBaseSupplierInfo); + return getDataTable(list); + } + + /** + * 导出物料供应商信息列表 + */ + @RequiresPermissions("mes:supplierInfo:export") + @Log(title = "物料供应商信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesBaseSupplierInfo mesBaseSupplierInfo) + { + List list = mesBaseSupplierInfoService.selectMesBaseSupplierInfoList(mesBaseSupplierInfo); + ExcelUtil util = new ExcelUtil(MesBaseSupplierInfo.class); + util.exportExcel(response, list, "物料供应商信息数据"); + } + + /** + * 获取物料供应商信息详细信息 + */ + @RequiresPermissions("mes:supplierInfo:query") + @GetMapping(value = "/{supplierId}") + public AjaxResult getInfo(@PathVariable("supplierId") Long supplierId) + { + return success(mesBaseSupplierInfoService.selectMesBaseSupplierInfoBySupplierId(supplierId)); + } + + /** + * 新增物料供应商信息 + */ + @RequiresPermissions("mes:supplierInfo:add") + @Log(title = "物料供应商信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesBaseSupplierInfo mesBaseSupplierInfo) + { + return toAjax(mesBaseSupplierInfoService.insertMesBaseSupplierInfo(mesBaseSupplierInfo)); + } + + /** + * 修改物料供应商信息 + */ + @RequiresPermissions("mes:supplierInfo:edit") + @Log(title = "物料供应商信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesBaseSupplierInfo mesBaseSupplierInfo) + { + return toAjax(mesBaseSupplierInfoService.updateMesBaseSupplierInfo(mesBaseSupplierInfo)); + } + + /** + * 删除物料供应商信息 + */ + @RequiresPermissions("mes:supplierInfo:remove") + @Log(title = "物料供应商信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{supplierIds}") + public AjaxResult remove(@PathVariable Long[] supplierIds) + { + return toAjax(mesBaseSupplierInfoService.deleteMesBaseSupplierInfoBySupplierIds(supplierIds)); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProdlineInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProdlineInfo.java new file mode 100644 index 0000000..5a282c1 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProdlineInfo.java @@ -0,0 +1,124 @@ +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_prodline_info + * + * @author Yinq + * @date 2024-01-24 + */ +public class MesBaseProdlineInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long prodlineId; + + /** 产线编号 */ + @Excel(name = "产线编号") + private String prodlineCode; + + /** 产线名称 */ + @Excel(name = "产线名称") + private String prodlineName; + + /** 产线类型 */ + @Excel(name = "产线类型") + private String prodlineType; + + /** 所属工厂ID */ + @Excel(name = "所属工厂ID") + private Long factoryId; + + /** 所属工厂名称 */ + @Excel(name = "所属工厂名称") + private String factoryName; + + /** 是否标识 */ + @Excel(name = "是否标识") + private String isFlag; + + public String getFactoryName() { + return factoryName; + } + + public void setFactoryName(String factoryName) { + this.factoryName = factoryName; + } + + public void setProdlineId(Long prodlineId) + { + this.prodlineId = prodlineId; + } + + public Long getProdlineId() + { + return prodlineId; + } + public void setProdlineCode(String prodlineCode) + { + this.prodlineCode = prodlineCode; + } + + public String getProdlineCode() + { + return prodlineCode; + } + public void setProdlineName(String prodlineName) + { + this.prodlineName = prodlineName; + } + + public String getProdlineName() + { + return prodlineName; + } + public void setProdlineType(String prodlineType) + { + this.prodlineType = prodlineType; + } + + public String getProdlineType() + { + return prodlineType; + } + public void setFactoryId(Long factoryId) + { + this.factoryId = factoryId; + } + + public Long getFactoryId() + { + return factoryId; + } + public void setIsFlag(String isFlag) + { + this.isFlag = isFlag; + } + + public String getIsFlag() + { + return isFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("prodlineId", getProdlineId()) + .append("prodlineCode", getProdlineCode()) + .append("prodlineName", getProdlineName()) + .append("prodlineType", getProdlineType()) + .append("factoryId", getFactoryId()) + .append("isFlag", getIsFlag()) + .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/MesBaseSupplierInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseSupplierInfo.java new file mode 100644 index 0000000..3daba23 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseSupplierInfo.java @@ -0,0 +1,115 @@ +package com.hw.mes.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_supplier_info + * + * @author Yinq + * @date 2024-01-24 + */ +public class MesBaseSupplierInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long supplierId; + + /** 供应商编号 */ + @Excel(name = "供应商编号") + private String supplierCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** erp主键 */ + @Excel(name = "erp主键") + private Long erpId; + + /** 供应商状态 */ + @Excel(name = "供应商状态") + private String supplierStatus; + + /** 审核日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date auditDate; + + public void setSupplierId(Long supplierId) + { + this.supplierId = supplierId; + } + + public Long getSupplierId() + { + return supplierId; + } + public void setSupplierCode(String supplierCode) + { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() + { + return supplierCode; + } + public void setSupplierName(String supplierName) + { + this.supplierName = supplierName; + } + + public String getSupplierName() + { + return supplierName; + } + public void setErpId(Long erpId) + { + this.erpId = erpId; + } + + public Long getErpId() + { + return erpId; + } + public void setSupplierStatus(String supplierStatus) + { + this.supplierStatus = supplierStatus; + } + + public String getSupplierStatus() + { + return supplierStatus; + } + public void setAuditDate(Date auditDate) + { + this.auditDate = auditDate; + } + + public Date getAuditDate() + { + return auditDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("supplierId", getSupplierId()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("erpId", getErpId()) + .append("supplierStatus", getSupplierStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("auditDate", getAuditDate()) + .toString(); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProdlineInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProdlineInfoMapper.java new file mode 100644 index 0000000..8baec00 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProdlineInfoMapper.java @@ -0,0 +1,61 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBaseProdlineInfo; + +/** + * 产线信息Mapper接口 + * + * @author Yinq + * @date 2024-01-24 + */ +public interface MesBaseProdlineInfoMapper +{ + /** + * 查询产线信息 + * + * @param prodlineId 产线信息主键 + * @return 产线信息 + */ + public MesBaseProdlineInfo selectMesBaseProdlineInfoByProdlineId(Long prodlineId); + + /** + * 查询产线信息列表 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 产线信息集合 + */ + public List selectMesBaseProdlineInfoList(MesBaseProdlineInfo mesBaseProdlineInfo); + + /** + * 新增产线信息 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 结果 + */ + public int insertMesBaseProdlineInfo(MesBaseProdlineInfo mesBaseProdlineInfo); + + /** + * 修改产线信息 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 结果 + */ + public int updateMesBaseProdlineInfo(MesBaseProdlineInfo mesBaseProdlineInfo); + + /** + * 删除产线信息 + * + * @param prodlineId 产线信息主键 + * @return 结果 + */ + public int deleteMesBaseProdlineInfoByProdlineId(Long prodlineId); + + /** + * 批量删除产线信息 + * + * @param prodlineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseProdlineInfoByProdlineIds(Long[] prodlineIds); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseSupplierInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseSupplierInfoMapper.java new file mode 100644 index 0000000..beb93fa --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseSupplierInfoMapper.java @@ -0,0 +1,61 @@ +package com.hw.mes.mapper; + +import java.util.List; +import com.hw.mes.domain.MesBaseSupplierInfo; + +/** + * 物料供应商信息Mapper接口 + * + * @author Yinq + * @date 2024-01-24 + */ +public interface MesBaseSupplierInfoMapper +{ + /** + * 查询物料供应商信息 + * + * @param supplierId 物料供应商信息主键 + * @return 物料供应商信息 + */ + public MesBaseSupplierInfo selectMesBaseSupplierInfoBySupplierId(Long supplierId); + + /** + * 查询物料供应商信息列表 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 物料供应商信息集合 + */ + public List selectMesBaseSupplierInfoList(MesBaseSupplierInfo mesBaseSupplierInfo); + + /** + * 新增物料供应商信息 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 结果 + */ + public int insertMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo); + + /** + * 修改物料供应商信息 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 结果 + */ + public int updateMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo); + + /** + * 删除物料供应商信息 + * + * @param supplierId 物料供应商信息主键 + * @return 结果 + */ + public int deleteMesBaseSupplierInfoBySupplierId(Long supplierId); + + /** + * 批量删除物料供应商信息 + * + * @param supplierIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseSupplierInfoBySupplierIds(Long[] supplierIds); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProdlineInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProdlineInfoService.java new file mode 100644 index 0000000..63ec08e --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProdlineInfoService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBaseProdlineInfo; + +/** + * 产线信息Service接口 + * + * @author Yinq + * @date 2024-01-24 + */ +public interface IMesBaseProdlineInfoService +{ + /** + * 查询产线信息 + * + * @param prodlineId 产线信息主键 + * @return 产线信息 + */ + public MesBaseProdlineInfo selectMesBaseProdlineInfoByProdlineId(Long prodlineId); + + /** + * 查询产线信息列表 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 产线信息集合 + */ + public List selectMesBaseProdlineInfoList(MesBaseProdlineInfo mesBaseProdlineInfo); + + /** + * 新增产线信息 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 结果 + */ + public int insertMesBaseProdlineInfo(MesBaseProdlineInfo mesBaseProdlineInfo); + + /** + * 修改产线信息 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 结果 + */ + public int updateMesBaseProdlineInfo(MesBaseProdlineInfo mesBaseProdlineInfo); + + /** + * 批量删除产线信息 + * + * @param prodlineIds 需要删除的产线信息主键集合 + * @return 结果 + */ + public int deleteMesBaseProdlineInfoByProdlineIds(Long[] prodlineIds); + + /** + * 删除产线信息信息 + * + * @param prodlineId 产线信息主键 + * @return 结果 + */ + public int deleteMesBaseProdlineInfoByProdlineId(Long prodlineId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseSupplierInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseSupplierInfoService.java new file mode 100644 index 0000000..e68d7e8 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseSupplierInfoService.java @@ -0,0 +1,61 @@ +package com.hw.mes.service; + +import java.util.List; +import com.hw.mes.domain.MesBaseSupplierInfo; + +/** + * 物料供应商信息Service接口 + * + * @author Yinq + * @date 2024-01-24 + */ +public interface IMesBaseSupplierInfoService +{ + /** + * 查询物料供应商信息 + * + * @param supplierId 物料供应商信息主键 + * @return 物料供应商信息 + */ + public MesBaseSupplierInfo selectMesBaseSupplierInfoBySupplierId(Long supplierId); + + /** + * 查询物料供应商信息列表 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 物料供应商信息集合 + */ + public List selectMesBaseSupplierInfoList(MesBaseSupplierInfo mesBaseSupplierInfo); + + /** + * 新增物料供应商信息 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 结果 + */ + public int insertMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo); + + /** + * 修改物料供应商信息 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 结果 + */ + public int updateMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo); + + /** + * 批量删除物料供应商信息 + * + * @param supplierIds 需要删除的物料供应商信息主键集合 + * @return 结果 + */ + public int deleteMesBaseSupplierInfoBySupplierIds(Long[] supplierIds); + + /** + * 删除物料供应商信息信息 + * + * @param supplierId 物料供应商信息主键 + * @return 结果 + */ + public int deleteMesBaseSupplierInfoBySupplierId(Long supplierId); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProdlineInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProdlineInfoServiceImpl.java new file mode 100644 index 0000000..7b59893 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProdlineInfoServiceImpl.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.MesBaseProdlineInfoMapper; +import com.hw.mes.domain.MesBaseProdlineInfo; +import com.hw.mes.service.IMesBaseProdlineInfoService; + +/** + * 产线信息Service业务层处理 + * + * @author Yinq + * @date 2024-01-24 + */ +@Service +public class MesBaseProdlineInfoServiceImpl implements IMesBaseProdlineInfoService +{ + @Autowired + private MesBaseProdlineInfoMapper mesBaseProdlineInfoMapper; + + /** + * 查询产线信息 + * + * @param prodlineId 产线信息主键 + * @return 产线信息 + */ + @Override + public MesBaseProdlineInfo selectMesBaseProdlineInfoByProdlineId(Long prodlineId) + { + return mesBaseProdlineInfoMapper.selectMesBaseProdlineInfoByProdlineId(prodlineId); + } + + /** + * 查询产线信息列表 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 产线信息 + */ + @Override + public List selectMesBaseProdlineInfoList(MesBaseProdlineInfo mesBaseProdlineInfo) + { + return mesBaseProdlineInfoMapper.selectMesBaseProdlineInfoList(mesBaseProdlineInfo); + } + + /** + * 新增产线信息 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 结果 + */ + @Override + public int insertMesBaseProdlineInfo(MesBaseProdlineInfo mesBaseProdlineInfo) + { + mesBaseProdlineInfo.setCreateTime(DateUtils.getNowDate()); + return mesBaseProdlineInfoMapper.insertMesBaseProdlineInfo(mesBaseProdlineInfo); + } + + /** + * 修改产线信息 + * + * @param mesBaseProdlineInfo 产线信息 + * @return 结果 + */ + @Override + public int updateMesBaseProdlineInfo(MesBaseProdlineInfo mesBaseProdlineInfo) + { + mesBaseProdlineInfo.setUpdateTime(DateUtils.getNowDate()); + return mesBaseProdlineInfoMapper.updateMesBaseProdlineInfo(mesBaseProdlineInfo); + } + + /** + * 批量删除产线信息 + * + * @param prodlineIds 需要删除的产线信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseProdlineInfoByProdlineIds(Long[] prodlineIds) + { + return mesBaseProdlineInfoMapper.deleteMesBaseProdlineInfoByProdlineIds(prodlineIds); + } + + /** + * 删除产线信息信息 + * + * @param prodlineId 产线信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseProdlineInfoByProdlineId(Long prodlineId) + { + return mesBaseProdlineInfoMapper.deleteMesBaseProdlineInfoByProdlineId(prodlineId); + } +} 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 new file mode 100644 index 0000000..002b5dc --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseSupplierInfoServiceImpl.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.MesBaseSupplierInfoMapper; +import com.hw.mes.domain.MesBaseSupplierInfo; +import com.hw.mes.service.IMesBaseSupplierInfoService; + +/** + * 物料供应商信息Service业务层处理 + * + * @author Yinq + * @date 2024-01-24 + */ +@Service +public class MesBaseSupplierInfoServiceImpl implements IMesBaseSupplierInfoService +{ + @Autowired + private MesBaseSupplierInfoMapper mesBaseSupplierInfoMapper; + + /** + * 查询物料供应商信息 + * + * @param supplierId 物料供应商信息主键 + * @return 物料供应商信息 + */ + @Override + public MesBaseSupplierInfo selectMesBaseSupplierInfoBySupplierId(Long supplierId) + { + return mesBaseSupplierInfoMapper.selectMesBaseSupplierInfoBySupplierId(supplierId); + } + + /** + * 查询物料供应商信息列表 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 物料供应商信息 + */ + @Override + public List selectMesBaseSupplierInfoList(MesBaseSupplierInfo mesBaseSupplierInfo) + { + return mesBaseSupplierInfoMapper.selectMesBaseSupplierInfoList(mesBaseSupplierInfo); + } + + /** + * 新增物料供应商信息 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 结果 + */ + @Override + public int insertMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo) + { + mesBaseSupplierInfo.setCreateTime(DateUtils.getNowDate()); + return mesBaseSupplierInfoMapper.insertMesBaseSupplierInfo(mesBaseSupplierInfo); + } + + /** + * 修改物料供应商信息 + * + * @param mesBaseSupplierInfo 物料供应商信息 + * @return 结果 + */ + @Override + public int updateMesBaseSupplierInfo(MesBaseSupplierInfo mesBaseSupplierInfo) + { + mesBaseSupplierInfo.setUpdateTime(DateUtils.getNowDate()); + return mesBaseSupplierInfoMapper.updateMesBaseSupplierInfo(mesBaseSupplierInfo); + } + + /** + * 批量删除物料供应商信息 + * + * @param supplierIds 需要删除的物料供应商信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseSupplierInfoBySupplierIds(Long[] supplierIds) + { + return mesBaseSupplierInfoMapper.deleteMesBaseSupplierInfoBySupplierIds(supplierIds); + } + + /** + * 删除物料供应商信息信息 + * + * @param supplierId 物料供应商信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseSupplierInfoBySupplierId(Long supplierId) + { + return mesBaseSupplierInfoMapper.deleteMesBaseSupplierInfoBySupplierId(supplierId); + } +} diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseFactoryInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseFactoryInfoMapper.xml index a921061..2900c31 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseFactoryInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseFactoryInfoMapper.xml @@ -1,42 +1,57 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - + + + + + + + + + + - select factory_id, company_name, factory_code, factory_name, factory_status, remark, create_by, create_time, update_by, update_time from mes_base_factory_info + select factory_id, + company_name, + factory_code, + factory_name, + factory_status, + remark, + create_by, + create_time, + update_by, + update_time + from mes_base_factory_info - + - - + + insert into mes_base_factory_info company_name, @@ -48,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{companyName}, #{factoryCode}, @@ -59,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + @@ -79,11 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from mes_base_factory_info where factory_id = #{factoryId} + delete + from mes_base_factory_info + where factory_id = #{factoryId} - delete from mes_base_factory_info where factory_id in + delete from mes_base_factory_info where factory_id in #{factoryId} diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProdlineInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProdlineInfoMapper.xml new file mode 100644 index 0000000..5e22112 --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProdlineInfoMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + select mbpi.prodline_id, + mbpi.prodline_code, + mbpi.prodline_name, + mbpi.prodline_type, + mbpi.factory_id, + mbfi.factory_name, + mbpi.is_flag, + mbpi.remark, + mbpi.create_by, + mbpi.create_time, + mbpi.update_by, + mbpi.update_time + from mes_base_prodline_info mbpi + left join mes_base_factory_info mbfi on mbfi.factory_id = mbpi.factory_id + + + + + + + + insert into mes_base_prodline_info + + prodline_code, + prodline_name, + prodline_type, + factory_id, + is_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{prodlineCode}, + #{prodlineName}, + #{prodlineType}, + #{factoryId}, + #{isFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update mes_base_prodline_info + + prodline_code = #{prodlineCode}, + prodline_name = #{prodlineName}, + prodline_type = #{prodlineType}, + factory_id = #{factoryId}, + is_flag = #{isFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where prodline_id = #{prodlineId} + + + + delete + from mes_base_prodline_info + where prodline_id = #{prodlineId} + + + + delete from mes_base_prodline_info where prodline_id in + + #{prodlineId} + + + \ No newline at end of file diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseSupplierInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseSupplierInfoMapper.xml new file mode 100644 index 0000000..94b96ae --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseSupplierInfoMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select supplier_id, supplier_code, supplier_name, erp_id, supplier_status, remark, create_by, create_time, update_by, update_time, audit_date from mes_base_supplier_info + + + + + + + + insert into mes_base_supplier_info + + supplier_code, + supplier_name, + erp_id, + supplier_status, + remark, + create_by, + create_time, + update_by, + update_time, + audit_date, + + + #{supplierCode}, + #{supplierName}, + #{erpId}, + #{supplierStatus}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{auditDate}, + + + + + update mes_base_supplier_info + + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + erp_id = #{erpId}, + supplier_status = #{supplierStatus}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + audit_date = #{auditDate}, + + where supplier_id = #{supplierId} + + + + delete from mes_base_supplier_info where supplier_id = #{supplierId} + + + + delete from mes_base_supplier_info where supplier_id in + + #{supplierId} + + + \ No newline at end of file diff --git a/hw-ui/src/api/mes/baseFactoryInfo.js b/hw-ui/src/api/mes/baseFactoryInfo.js index 45e79ae..9ebd448 100644 --- a/hw-ui/src/api/mes/baseFactoryInfo.js +++ b/hw-ui/src/api/mes/baseFactoryInfo.js @@ -9,6 +9,15 @@ export function listBaseFactoryInfo(query) { }) } +// 查询工厂信息列表 +export function findFactoryList(query) { + return request({ + url: '/mes/baseFactoryInfo/findFactoryList', + method: 'get', + params: query + }) +} + // 查询工厂信息详细 export function getBaseFactoryInfo(factoryId) { return request({ diff --git a/hw-ui/src/api/mes/baseProdlineInfo.js b/hw-ui/src/api/mes/baseProdlineInfo.js new file mode 100644 index 0000000..c847f0c --- /dev/null +++ b/hw-ui/src/api/mes/baseProdlineInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询产线信息列表 +export function listBaseProdlineInfo(query) { + return request({ + url: '/mes/baseProdlineInfo/list', + method: 'get', + params: query + }) +} + +// 查询产线信息详细 +export function getBaseProdlineInfo(prodlineId) { + return request({ + url: '/mes/baseProdlineInfo/' + prodlineId, + method: 'get' + }) +} + +// 新增产线信息 +export function addBaseProdlineInfo(data) { + return request({ + url: '/mes/baseProdlineInfo', + method: 'post', + data: data + }) +} + +// 修改产线信息 +export function updateBaseProdlineInfo(data) { + return request({ + url: '/mes/baseProdlineInfo', + method: 'put', + data: data + }) +} + +// 删除产线信息 +export function delBaseProdlineInfo(prodlineId) { + return request({ + url: '/mes/baseProdlineInfo/' + prodlineId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/mes/supplierInfo.js b/hw-ui/src/api/mes/supplierInfo.js new file mode 100644 index 0000000..96298b8 --- /dev/null +++ b/hw-ui/src/api/mes/supplierInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询物料供应商信息列表 +export function listSupplierInfo(query) { + return request({ + url: '/mes/supplierInfo/list', + method: 'get', + params: query + }) +} + +// 查询物料供应商信息详细 +export function getSupplierInfo(supplierId) { + return request({ + url: '/mes/supplierInfo/' + supplierId, + method: 'get' + }) +} + +// 新增物料供应商信息 +export function addSupplierInfo(data) { + return request({ + url: '/mes/supplierInfo', + method: 'post', + data: data + }) +} + +// 修改物料供应商信息 +export function updateSupplierInfo(data) { + return request({ + url: '/mes/supplierInfo', + method: 'put', + data: data + }) +} + +// 删除物料供应商信息 +export function delSupplierInfo(supplierId) { + return request({ + url: '/mes/supplierInfo/' + supplierId, + method: 'delete' + }) +} diff --git a/hw-ui/src/views/mes/baseProdlineInfo/index.vue b/hw-ui/src/views/mes/baseProdlineInfo/index.vue new file mode 100644 index 0000000..bc9af48 --- /dev/null +++ b/hw-ui/src/views/mes/baseProdlineInfo/index.vue @@ -0,0 +1,377 @@ + + + diff --git a/hw-ui/src/views/mes/supplierInfo/index.vue b/hw-ui/src/views/mes/supplierInfo/index.vue new file mode 100644 index 0000000..83160ce --- /dev/null +++ b/hw-ui/src/views/mes/supplierInfo/index.vue @@ -0,0 +1,374 @@ + + +