diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdItemBatchConfigController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdItemBatchConfigController.java new file mode 100644 index 0000000..3fe31a3 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdItemBatchConfigController.java @@ -0,0 +1,112 @@ +package com.ktg.mes.md.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.collections.CollectionUtils; +import org.springframework.security.access.prepost.PreAuthorize; +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.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.md.domain.MdItemBatchConfig; +import com.ktg.mes.md.service.IMdItemBatchConfigService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 物料批次属性配置Controller + * + * @author yinjinlu + * @date 2025-02-05 + */ +@RestController +@RequestMapping("/mes/md/batchconfig") +public class MdItemBatchConfigController extends BaseController +{ + @Autowired + private IMdItemBatchConfigService mdItemBatchConfigService; + + /** + * 查询物料批次属性配置列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:batchconfig:list')") + @GetMapping("/list") + public TableDataInfo list(MdItemBatchConfig mdItemBatchConfig) + { + startPage(); + List list = mdItemBatchConfigService.selectMdItemBatchConfigList(mdItemBatchConfig); + return getDataTable(list); + } + + /** + * 导出物料批次属性配置列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:batchconfig:export')") + @Log(title = "物料批次属性配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MdItemBatchConfig mdItemBatchConfig) + { + List list = mdItemBatchConfigService.selectMdItemBatchConfigList(mdItemBatchConfig); + ExcelUtil util = new ExcelUtil(MdItemBatchConfig.class); + util.exportExcel(response, list, "物料批次属性配置数据"); + } + + /** + * 获取物料批次属性配置详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:md:batchconfig:query')") + @GetMapping(value = "/{itemId}") + public AjaxResult getInfo(@PathVariable("itemId") Long itemId) + { + MdItemBatchConfig mdItemBatchConfig = new MdItemBatchConfig(); + mdItemBatchConfig.setItemId(itemId); + List list = mdItemBatchConfigService.selectMdItemBatchConfigList(mdItemBatchConfig); + if(!CollectionUtils.isEmpty(list)){ + return AjaxResult.success(list.get(0)); + } + return AjaxResult.success(); + } + + /** + * 新增物料批次属性配置 + */ + @PreAuthorize("@ss.hasPermi('mes:md:batchconfig:add')") + @Log(title = "物料批次属性配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MdItemBatchConfig mdItemBatchConfig) + { + return toAjax(mdItemBatchConfigService.insertMdItemBatchConfig(mdItemBatchConfig)); + } + + /** + * 修改物料批次属性配置 + */ + @PreAuthorize("@ss.hasPermi('mes:md:batchconfig:edit')") + @Log(title = "物料批次属性配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MdItemBatchConfig mdItemBatchConfig) + { + return toAjax(mdItemBatchConfigService.updateMdItemBatchConfig(mdItemBatchConfig)); + } + + /** + * 删除物料批次属性配置 + */ + @PreAuthorize("@ss.hasPermi('mes:md:batchconfig:remove')") + @Log(title = "物料批次属性配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public AjaxResult remove(@PathVariable Long[] configIds) + { + return toAjax(mdItemBatchConfigService.deleteMdItemBatchConfigByConfigIds(configIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItemBatchConfig.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItemBatchConfig.java new file mode 100644 index 0000000..99b472e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItemBatchConfig.java @@ -0,0 +1,322 @@ +package com.ktg.mes.md.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 物料批次属性配置对象 md_item_batch_config + * + * @author yinjinlu + * @date 2025-02-05 + */ +public class MdItemBatchConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 批次ID */ + private Long configId; + + /** 产品物料ID */ + @Excel(name = "产品物料ID") + private Long itemId; + + /** 生产日期 */ + @Excel(name = "生产日期") + private String produceDateFlag; + + /** 有效期 */ + @Excel(name = "有效期") + private String expireDateFlag; + + /** 入库日期 */ + @Excel(name = "入库日期") + private String recptDateFlag; + + /** 供应商 */ + @Excel(name = "供应商") + private String vendorFlag; + + /** 客户 */ + @Excel(name = "客户") + private String clientFlag; + + /** 销售订单编号 */ + @Excel(name = "销售订单编号") + private String coCodeFlag; + + /** 采购订单编号 */ + @Excel(name = "采购订单编号") + private String poCodeFlag; + + /** 生产工单 */ + @Excel(name = "生产工单") + private String workorderFlag; + + /** 生产任务 */ + @Excel(name = "生产任务") + private String taskFlag; + + /** 工作站 */ + @Excel(name = "工作站") + private String workstationFlag; + + /** 工具 */ + @Excel(name = "工具") + private String toolFlag; + + /** 模具 */ + @Excel(name = "模具") + private String moldFlag; + + /** 生产批号 */ + @Excel(name = "生产批号") + private String lotNumberFlag; + + /** 质量状态 */ + @Excel(name = "质量状态") + private String qualityStatusFlag; + + /** 生效状态 */ + @Excel(name = "生效状态") + private String enableFlag; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private Long attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private Long attr4; + + public void setConfigId(Long configId) + { + this.configId = configId; + } + + public Long getConfigId() + { + return configId; + } + public void setItemId(Long itemId) + { + this.itemId = itemId; + } + + public Long getItemId() + { + return itemId; + } + public void setProduceDateFlag(String produceDateFlag) + { + this.produceDateFlag = produceDateFlag; + } + + public String getProduceDateFlag() + { + return produceDateFlag; + } + public void setExpireDateFlag(String expireDateFlag) + { + this.expireDateFlag = expireDateFlag; + } + + public String getExpireDateFlag() + { + return expireDateFlag; + } + public void setRecptDateFlag(String recptDateFlag) + { + this.recptDateFlag = recptDateFlag; + } + + public String getRecptDateFlag() + { + return recptDateFlag; + } + public void setVendorFlag(String vendorFlag) + { + this.vendorFlag = vendorFlag; + } + + public String getVendorFlag() + { + return vendorFlag; + } + public void setClientFlag(String clientFlag) + { + this.clientFlag = clientFlag; + } + + public String getClientFlag() + { + return clientFlag; + } + public void setCoCodeFlag(String coCodeFlag) + { + this.coCodeFlag = coCodeFlag; + } + + public String getCoCodeFlag() + { + return coCodeFlag; + } + public void setPoCodeFlag(String poCodeFlag) + { + this.poCodeFlag = poCodeFlag; + } + + public String getPoCodeFlag() + { + return poCodeFlag; + } + public void setWorkorderFlag(String workorderFlag) + { + this.workorderFlag = workorderFlag; + } + + public String getWorkorderFlag() + { + return workorderFlag; + } + public void setTaskFlag(String taskFlag) + { + this.taskFlag = taskFlag; + } + + public String getTaskFlag() + { + return taskFlag; + } + public void setWorkstationFlag(String workstationFlag) + { + this.workstationFlag = workstationFlag; + } + + public String getWorkstationFlag() + { + return workstationFlag; + } + public void setToolFlag(String toolFlag) + { + this.toolFlag = toolFlag; + } + + public String getToolFlag() + { + return toolFlag; + } + public void setMoldFlag(String moldFlag) + { + this.moldFlag = moldFlag; + } + + public String getMoldFlag() + { + return moldFlag; + } + public void setLotNumberFlag(String lotNumberFlag) + { + this.lotNumberFlag = lotNumberFlag; + } + + public String getLotNumberFlag() + { + return lotNumberFlag; + } + public void setQualityStatusFlag(String qualityStatusFlag) + { + this.qualityStatusFlag = qualityStatusFlag; + } + + public String getQualityStatusFlag() + { + return qualityStatusFlag; + } + public void setEnableFlag(String enableFlag) + { + this.enableFlag = enableFlag; + } + + public String getEnableFlag() + { + return enableFlag; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("itemId", getItemId()) + .append("produceDateFlag", getProduceDateFlag()) + .append("expireDateFlag", getExpireDateFlag()) + .append("recptDateFlag", getRecptDateFlag()) + .append("vendorFlag", getVendorFlag()) + .append("clientFlag", getClientFlag()) + .append("coCodeFlag", getCoCodeFlag()) + .append("poCodeFlag", getPoCodeFlag()) + .append("workorderFlag", getWorkorderFlag()) + .append("taskFlag", getTaskFlag()) + .append("workstationFlag", getWorkstationFlag()) + .append("toolFlag", getToolFlag()) + .append("moldFlag", getMoldFlag()) + .append("lotNumberFlag", getLotNumberFlag()) + .append("qualityStatusFlag", getQualityStatusFlag()) + .append("enableFlag", getEnableFlag()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdItemBatchConfigMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdItemBatchConfigMapper.java new file mode 100644 index 0000000..020f440 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdItemBatchConfigMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.md.mapper; + +import java.util.List; +import com.ktg.mes.md.domain.MdItemBatchConfig; + +/** + * 物料批次属性配置Mapper接口 + * + * @author yinjinlu + * @date 2025-02-05 + */ +public interface MdItemBatchConfigMapper +{ + /** + * 查询物料批次属性配置 + * + * @param configId 物料批次属性配置主键 + * @return 物料批次属性配置 + */ + public MdItemBatchConfig selectMdItemBatchConfigByConfigId(Long configId); + + /** + * 查询物料批次属性配置列表 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 物料批次属性配置集合 + */ + public List selectMdItemBatchConfigList(MdItemBatchConfig mdItemBatchConfig); + + /** + * 新增物料批次属性配置 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 结果 + */ + public int insertMdItemBatchConfig(MdItemBatchConfig mdItemBatchConfig); + + /** + * 修改物料批次属性配置 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 结果 + */ + public int updateMdItemBatchConfig(MdItemBatchConfig mdItemBatchConfig); + + /** + * 删除物料批次属性配置 + * + * @param configId 物料批次属性配置主键 + * @return 结果 + */ + public int deleteMdItemBatchConfigByConfigId(Long configId); + + /** + * 批量删除物料批次属性配置 + * + * @param configIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMdItemBatchConfigByConfigIds(Long[] configIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdItemBatchConfigService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdItemBatchConfigService.java new file mode 100644 index 0000000..07d3643 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdItemBatchConfigService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.md.service; + +import java.util.List; +import com.ktg.mes.md.domain.MdItemBatchConfig; + +/** + * 物料批次属性配置Service接口 + * + * @author yinjinlu + * @date 2025-02-05 + */ +public interface IMdItemBatchConfigService +{ + /** + * 查询物料批次属性配置 + * + * @param configId 物料批次属性配置主键 + * @return 物料批次属性配置 + */ + public MdItemBatchConfig selectMdItemBatchConfigByConfigId(Long configId); + + /** + * 查询物料批次属性配置列表 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 物料批次属性配置集合 + */ + public List selectMdItemBatchConfigList(MdItemBatchConfig mdItemBatchConfig); + + /** + * 新增物料批次属性配置 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 结果 + */ + public int insertMdItemBatchConfig(MdItemBatchConfig mdItemBatchConfig); + + /** + * 修改物料批次属性配置 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 结果 + */ + public int updateMdItemBatchConfig(MdItemBatchConfig mdItemBatchConfig); + + /** + * 批量删除物料批次属性配置 + * + * @param configIds 需要删除的物料批次属性配置主键集合 + * @return 结果 + */ + public int deleteMdItemBatchConfigByConfigIds(Long[] configIds); + + /** + * 删除物料批次属性配置信息 + * + * @param configId 物料批次属性配置主键 + * @return 结果 + */ + public int deleteMdItemBatchConfigByConfigId(Long configId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemBatchConfigServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemBatchConfigServiceImpl.java new file mode 100644 index 0000000..f618b00 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdItemBatchConfigServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.md.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.md.mapper.MdItemBatchConfigMapper; +import com.ktg.mes.md.domain.MdItemBatchConfig; +import com.ktg.mes.md.service.IMdItemBatchConfigService; + +/** + * 物料批次属性配置Service业务层处理 + * + * @author yinjinlu + * @date 2025-02-05 + */ +@Service +public class MdItemBatchConfigServiceImpl implements IMdItemBatchConfigService +{ + @Autowired + private MdItemBatchConfigMapper mdItemBatchConfigMapper; + + /** + * 查询物料批次属性配置 + * + * @param configId 物料批次属性配置主键 + * @return 物料批次属性配置 + */ + @Override + public MdItemBatchConfig selectMdItemBatchConfigByConfigId(Long configId) + { + return mdItemBatchConfigMapper.selectMdItemBatchConfigByConfigId(configId); + } + + /** + * 查询物料批次属性配置列表 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 物料批次属性配置 + */ + @Override + public List selectMdItemBatchConfigList(MdItemBatchConfig mdItemBatchConfig) + { + return mdItemBatchConfigMapper.selectMdItemBatchConfigList(mdItemBatchConfig); + } + + /** + * 新增物料批次属性配置 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 结果 + */ + @Override + public int insertMdItemBatchConfig(MdItemBatchConfig mdItemBatchConfig) + { + mdItemBatchConfig.setCreateTime(DateUtils.getNowDate()); + return mdItemBatchConfigMapper.insertMdItemBatchConfig(mdItemBatchConfig); + } + + /** + * 修改物料批次属性配置 + * + * @param mdItemBatchConfig 物料批次属性配置 + * @return 结果 + */ + @Override + public int updateMdItemBatchConfig(MdItemBatchConfig mdItemBatchConfig) + { + mdItemBatchConfig.setUpdateTime(DateUtils.getNowDate()); + return mdItemBatchConfigMapper.updateMdItemBatchConfig(mdItemBatchConfig); + } + + /** + * 批量删除物料批次属性配置 + * + * @param configIds 需要删除的物料批次属性配置主键 + * @return 结果 + */ + @Override + public int deleteMdItemBatchConfigByConfigIds(Long[] configIds) + { + return mdItemBatchConfigMapper.deleteMdItemBatchConfigByConfigIds(configIds); + } + + /** + * 删除物料批次属性配置信息 + * + * @param configId 物料批次属性配置主键 + * @return 结果 + */ + @Override + public int deleteMdItemBatchConfigByConfigId(Long configId) + { + return mdItemBatchConfigMapper.deleteMdItemBatchConfigByConfigId(configId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/md/MdItemBatchConfigMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdItemBatchConfigMapper.xml new file mode 100644 index 0000000..0b90668 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/md/MdItemBatchConfigMapper.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select config_id, item_id, produce_date_flag, expire_date_flag, recpt_date_flag, vendor_flag, client_flag, co_code_flag, po_code_flag, workorder_flag, task_flag, workstation_flag, tool_flag, mold_flag, lot_number_flag, quality_status_flag, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_item_batch_config + + + + + + + + insert into md_item_batch_config + + item_id, + produce_date_flag, + expire_date_flag, + recpt_date_flag, + vendor_flag, + client_flag, + co_code_flag, + po_code_flag, + workorder_flag, + task_flag, + workstation_flag, + tool_flag, + mold_flag, + lot_number_flag, + quality_status_flag, + enable_flag, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{itemId}, + #{produceDateFlag}, + #{expireDateFlag}, + #{recptDateFlag}, + #{vendorFlag}, + #{clientFlag}, + #{coCodeFlag}, + #{poCodeFlag}, + #{workorderFlag}, + #{taskFlag}, + #{workstationFlag}, + #{toolFlag}, + #{moldFlag}, + #{lotNumberFlag}, + #{qualityStatusFlag}, + #{enableFlag}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update md_item_batch_config + + item_id = #{itemId}, + produce_date_flag = #{produceDateFlag}, + expire_date_flag = #{expireDateFlag}, + recpt_date_flag = #{recptDateFlag}, + vendor_flag = #{vendorFlag}, + client_flag = #{clientFlag}, + co_code_flag = #{coCodeFlag}, + po_code_flag = #{poCodeFlag}, + workorder_flag = #{workorderFlag}, + task_flag = #{taskFlag}, + workstation_flag = #{workstationFlag}, + tool_flag = #{toolFlag}, + mold_flag = #{moldFlag}, + lot_number_flag = #{lotNumberFlag}, + quality_status_flag = #{qualityStatusFlag}, + enable_flag = #{enableFlag}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where config_id = #{configId} + + + + delete from md_item_batch_config where config_id = #{configId} + + + + delete from md_item_batch_config where config_id in + + #{configId} + + + \ No newline at end of file