From 71959fc0bd63442b964439d90863e5375d3f4fd6 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Wed, 21 Sep 2022 19:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BA=A7=E5=87=BA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmProductProduceController.java | 104 +++++++ .../ktg/mes/wm/domain/WmProductProduce.java | 293 ++++++++++++++++++ .../mes/wm/mapper/WmProductProduceMapper.java | 61 ++++ .../wm/service/IWmProductProduceService.java | 61 ++++ .../impl/WmProductProduceServiceImpl.java | 96 ++++++ .../mapper/wm/WmProductProduceMapper.xml | 157 ++++++++++ 6 files changed, 772 insertions(+) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductProduceController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductProduce.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductProduceMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductProduceService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductProduceServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/wm/WmProductProduceMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductProduceController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductProduceController.java new file mode 100644 index 0000000..a7f097d --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductProduceController.java @@ -0,0 +1,104 @@ +package com.ktg.mes.wm.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.wm.domain.WmProductProduce; +import com.ktg.mes.wm.service.IWmProductProduceService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 产品产出记录Controller + * + * @author yinjinlu + * @date 2022-09-21 + */ +@RestController +@RequestMapping("/mes/wm/productproduce") +public class WmProductProduceController extends BaseController +{ + @Autowired + private IWmProductProduceService wmProductProduceService; + + /** + * 查询产品产出记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productproduce:list')") + @GetMapping("/list") + public TableDataInfo list(WmProductProduce wmProductProduce) + { + startPage(); + List list = wmProductProduceService.selectWmProductProduceList(wmProductProduce); + return getDataTable(list); + } + + /** + * 导出产品产出记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productproduce:export')") + @Log(title = "产品产出记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmProductProduce wmProductProduce) + { + List list = wmProductProduceService.selectWmProductProduceList(wmProductProduce); + ExcelUtil util = new ExcelUtil(WmProductProduce.class); + util.exportExcel(response, list, "产品产出记录数据"); + } + + /** + * 获取产品产出记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productproduce:query')") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") Long recordId) + { + return AjaxResult.success(wmProductProduceService.selectWmProductProduceByRecordId(recordId)); + } + + /** + * 新增产品产出记录 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productproduce:add')") + @Log(title = "产品产出记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmProductProduce wmProductProduce) + { + return toAjax(wmProductProduceService.insertWmProductProduce(wmProductProduce)); + } + + /** + * 修改产品产出记录 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productproduce:edit')") + @Log(title = "产品产出记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmProductProduce wmProductProduce) + { + return toAjax(wmProductProduceService.updateWmProductProduce(wmProductProduce)); + } + + /** + * 删除产品产出记录 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productproduce:remove')") + @Log(title = "产品产出记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable Long[] recordIds) + { + return toAjax(wmProductProduceService.deleteWmProductProduceByRecordIds(recordIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductProduce.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductProduce.java new file mode 100644 index 0000000..992d21e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductProduce.java @@ -0,0 +1,293 @@ +package com.ktg.mes.wm.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.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 产品产出记录对象 wm_product_produce + * + * @author yinjinlu + * @date 2022-09-21 + */ +public class WmProductProduce extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 入库单ID */ + private Long recordId; + + /** 生产工单ID */ + @Excel(name = "生产工单ID") + private Long workorderId; + + /** 生产工单编码 */ + @Excel(name = "生产工单编码") + private String workorderCode; + + /** 生产工单名称 */ + @Excel(name = "生产工单名称") + private String workorderName; + + /** 生产任务ID */ + @Excel(name = "生产任务ID") + private Long taskId; + + /** 生产任务编号 */ + @Excel(name = "生产任务编号") + private String taskCode; + + /** 生产任务名称 */ + @Excel(name = "生产任务名称") + private String taskName; + + /** 工作站ID */ + @Excel(name = "工作站ID") + private Long workstationId; + + /** 工作站编号 */ + @Excel(name = "工作站编号") + private String workstationCode; + + /** 工作站名称 */ + @Excel(name = "工作站名称") + private String workstationName; + + /** 工序ID */ + @Excel(name = "工序ID") + private Long processId; + + /** 工序编号 */ + @Excel(name = "工序编号") + private String processCode; + + /** 工序名称 */ + @Excel(name = "工序名称") + private String processName; + + /** 生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date produceDate; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setRecordId(Long recordId) + { + this.recordId = recordId; + } + + public Long getRecordId() + { + return recordId; + } + public void setWorkorderId(Long workorderId) + { + this.workorderId = workorderId; + } + + public Long getWorkorderId() + { + return workorderId; + } + public void setWorkorderCode(String workorderCode) + { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() + { + return workorderCode; + } + public void setWorkorderName(String workorderName) + { + this.workorderName = workorderName; + } + + public String getWorkorderName() + { + return workorderName; + } + public void setTaskId(Long taskId) + { + this.taskId = taskId; + } + + public Long getTaskId() + { + return taskId; + } + public void setTaskCode(String taskCode) + { + this.taskCode = taskCode; + } + + public String getTaskCode() + { + return taskCode; + } + public void setTaskName(String taskName) + { + this.taskName = taskName; + } + + public String getTaskName() + { + return taskName; + } + public void setWorkstationId(Long workstationId) + { + this.workstationId = workstationId; + } + + public Long getWorkstationId() + { + return workstationId; + } + public void setWorkstationCode(String workstationCode) + { + this.workstationCode = workstationCode; + } + + public String getWorkstationCode() + { + return workstationCode; + } + public void setWorkstationName(String workstationName) + { + this.workstationName = workstationName; + } + + public String getWorkstationName() + { + return workstationName; + } + public void setProcessId(Long processId) + { + this.processId = processId; + } + + public Long getProcessId() + { + return processId; + } + public void setProcessCode(String processCode) + { + this.processCode = processCode; + } + + public String getProcessCode() + { + return processCode; + } + public void setProcessName(String processName) + { + this.processName = processName; + } + + public String getProcessName() + { + return processName; + } + public void setProduceDate(Date produceDate) + { + this.produceDate = produceDate; + } + + public Date getProduceDate() + { + return produceDate; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + 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("recordId", getRecordId()) + .append("workorderId", getWorkorderId()) + .append("workorderCode", getWorkorderCode()) + .append("workorderName", getWorkorderName()) + .append("taskId", getTaskId()) + .append("taskCode", getTaskCode()) + .append("taskName", getTaskName()) + .append("workstationId", getWorkstationId()) + .append("workstationCode", getWorkstationCode()) + .append("workstationName", getWorkstationName()) + .append("processId", getProcessId()) + .append("processCode", getProcessCode()) + .append("processName", getProcessName()) + .append("produceDate", getProduceDate()) + .append("status", getStatus()) + .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/wm/mapper/WmProductProduceMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductProduceMapper.java new file mode 100644 index 0000000..9cdb579 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductProduceMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmProductProduce; + +/** + * 产品产出记录Mapper接口 + * + * @author yinjinlu + * @date 2022-09-21 + */ +public interface WmProductProduceMapper +{ + /** + * 查询产品产出记录 + * + * @param recordId 产品产出记录主键 + * @return 产品产出记录 + */ + public WmProductProduce selectWmProductProduceByRecordId(Long recordId); + + /** + * 查询产品产出记录列表 + * + * @param wmProductProduce 产品产出记录 + * @return 产品产出记录集合 + */ + public List selectWmProductProduceList(WmProductProduce wmProductProduce); + + /** + * 新增产品产出记录 + * + * @param wmProductProduce 产品产出记录 + * @return 结果 + */ + public int insertWmProductProduce(WmProductProduce wmProductProduce); + + /** + * 修改产品产出记录 + * + * @param wmProductProduce 产品产出记录 + * @return 结果 + */ + public int updateWmProductProduce(WmProductProduce wmProductProduce); + + /** + * 删除产品产出记录 + * + * @param recordId 产品产出记录主键 + * @return 结果 + */ + public int deleteWmProductProduceByRecordId(Long recordId); + + /** + * 批量删除产品产出记录 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmProductProduceByRecordIds(Long[] recordIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductProduceService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductProduceService.java new file mode 100644 index 0000000..337b26c --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductProduceService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmProductProduce; + +/** + * 产品产出记录Service接口 + * + * @author yinjinlu + * @date 2022-09-21 + */ +public interface IWmProductProduceService +{ + /** + * 查询产品产出记录 + * + * @param recordId 产品产出记录主键 + * @return 产品产出记录 + */ + public WmProductProduce selectWmProductProduceByRecordId(Long recordId); + + /** + * 查询产品产出记录列表 + * + * @param wmProductProduce 产品产出记录 + * @return 产品产出记录集合 + */ + public List selectWmProductProduceList(WmProductProduce wmProductProduce); + + /** + * 新增产品产出记录 + * + * @param wmProductProduce 产品产出记录 + * @return 结果 + */ + public int insertWmProductProduce(WmProductProduce wmProductProduce); + + /** + * 修改产品产出记录 + * + * @param wmProductProduce 产品产出记录 + * @return 结果 + */ + public int updateWmProductProduce(WmProductProduce wmProductProduce); + + /** + * 批量删除产品产出记录 + * + * @param recordIds 需要删除的产品产出记录主键集合 + * @return 结果 + */ + public int deleteWmProductProduceByRecordIds(Long[] recordIds); + + /** + * 删除产品产出记录信息 + * + * @param recordId 产品产出记录主键 + * @return 结果 + */ + public int deleteWmProductProduceByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductProduceServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductProduceServiceImpl.java new file mode 100644 index 0000000..02404ae --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductProduceServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.wm.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.wm.mapper.WmProductProduceMapper; +import com.ktg.mes.wm.domain.WmProductProduce; +import com.ktg.mes.wm.service.IWmProductProduceService; + +/** + * 产品产出记录Service业务层处理 + * + * @author yinjinlu + * @date 2022-09-21 + */ +@Service +public class WmProductProduceServiceImpl implements IWmProductProduceService +{ + @Autowired + private WmProductProduceMapper wmProductProduceMapper; + + /** + * 查询产品产出记录 + * + * @param recordId 产品产出记录主键 + * @return 产品产出记录 + */ + @Override + public WmProductProduce selectWmProductProduceByRecordId(Long recordId) + { + return wmProductProduceMapper.selectWmProductProduceByRecordId(recordId); + } + + /** + * 查询产品产出记录列表 + * + * @param wmProductProduce 产品产出记录 + * @return 产品产出记录 + */ + @Override + public List selectWmProductProduceList(WmProductProduce wmProductProduce) + { + return wmProductProduceMapper.selectWmProductProduceList(wmProductProduce); + } + + /** + * 新增产品产出记录 + * + * @param wmProductProduce 产品产出记录 + * @return 结果 + */ + @Override + public int insertWmProductProduce(WmProductProduce wmProductProduce) + { + wmProductProduce.setCreateTime(DateUtils.getNowDate()); + return wmProductProduceMapper.insertWmProductProduce(wmProductProduce); + } + + /** + * 修改产品产出记录 + * + * @param wmProductProduce 产品产出记录 + * @return 结果 + */ + @Override + public int updateWmProductProduce(WmProductProduce wmProductProduce) + { + wmProductProduce.setUpdateTime(DateUtils.getNowDate()); + return wmProductProduceMapper.updateWmProductProduce(wmProductProduce); + } + + /** + * 批量删除产品产出记录 + * + * @param recordIds 需要删除的产品产出记录主键 + * @return 结果 + */ + @Override + public int deleteWmProductProduceByRecordIds(Long[] recordIds) + { + return wmProductProduceMapper.deleteWmProductProduceByRecordIds(recordIds); + } + + /** + * 删除产品产出记录信息 + * + * @param recordId 产品产出记录主键 + * @return 结果 + */ + @Override + public int deleteWmProductProduceByRecordId(Long recordId) + { + return wmProductProduceMapper.deleteWmProductProduceByRecordId(recordId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductProduceMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductProduceMapper.xml new file mode 100644 index 0000000..63ac700 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductProduceMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select record_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, produce_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_produce + + + + + + + + insert into wm_product_produce + + workorder_id, + workorder_code, + workorder_name, + task_id, + task_code, + task_name, + workstation_id, + workstation_code, + workstation_name, + process_id, + process_code, + process_name, + produce_date, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{workorderId}, + #{workorderCode}, + #{workorderName}, + #{taskId}, + #{taskCode}, + #{taskName}, + #{workstationId}, + #{workstationCode}, + #{workstationName}, + #{processId}, + #{processCode}, + #{processName}, + #{produceDate}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_product_produce + + workorder_id = #{workorderId}, + workorder_code = #{workorderCode}, + workorder_name = #{workorderName}, + task_id = #{taskId}, + task_code = #{taskCode}, + task_name = #{taskName}, + workstation_id = #{workstationId}, + workstation_code = #{workstationCode}, + workstation_name = #{workstationName}, + process_id = #{processId}, + process_code = #{processCode}, + process_name = #{processName}, + produce_date = #{produceDate}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where record_id = #{recordId} + + + + delete from wm_product_produce where record_id = #{recordId} + + + + delete from wm_product_produce where record_id in + + #{recordId} + + + \ No newline at end of file