From 49188ecaaf50c858ffa8791f876fa1e0483b120c Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 24 Aug 2023 18:07:19 +0800 Subject: [PATCH] =?UTF-8?q?mes=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesReportWorkConsumeController.java | 100 +++++ .../controller/MesReportWorkController.java | 100 +++++ .../java/com/op/mes/domain/MesReportWork.java | 356 ++++++++++++++++++ .../op/mes/domain/MesReportWorkConsume.java | 171 +++++++++ .../mapper/MesReportWorkConsumeMapper.java | 61 +++ .../op/mes/mapper/MesReportWorkMapper.java | 61 +++ .../service/IMesReportWorkConsumeService.java | 60 +++ .../op/mes/service/IMesReportWorkService.java | 60 +++ .../impl/MesReportWorkConsumeServiceImpl.java | 97 +++++ .../impl/MesReportWorkServiceImpl.java | 97 +++++ .../{ => mes}/MesPrepareDetailMapper.xml | 0 .../mapper/{ => mes}/MesPrepareMapper.xml | 0 .../{ => mes}/MesPrepareValidateMapper.xml | 0 .../mapper/mes/MesReportWorkMapper.xml | 203 ++++++++++ 14 files changed, 1366 insertions(+) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java rename op-modules/op-mes/src/main/resources/mapper/{ => mes}/MesPrepareDetailMapper.xml (100%) rename op-modules/op-mes/src/main/resources/mapper/{ => mes}/MesPrepareMapper.xml (100%) rename op-modules/op-mes/src/main/resources/mapper/{ => mes}/MesPrepareValidateMapper.xml (100%) create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java new file mode 100644 index 00000000..4c07ab6a --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java @@ -0,0 +1,100 @@ +package com.op.mes.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.common.core.utils.uuid.IdUtils; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.mes.domain.MesReportWorkConsume; +import com.op.mes.service.IMesReportWorkConsumeService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 生产报工物料消耗Controller + * + * @author Open Platform + * @date 2023-08-24 + */ +@RestController +@RequestMapping("/reportWorkConsume") +public class MesReportWorkConsumeController extends BaseController { + @Autowired + private IMesReportWorkConsumeService mesReportWorkConsumeService; + + /** + * 查询生产报工物料消耗列表 + */ + @RequiresPermissions("mes:reportWorkConsume:list") + @GetMapping("/list") + public TableDataInfo list(MesReportWorkConsume mesReportWorkConsume) { + startPage(); + List list = mesReportWorkConsumeService.selectMesReportWorkConsumeList(mesReportWorkConsume); + return getDataTable(list); + } + + /** + * 导出生产报工物料消耗列表 + */ + @RequiresPermissions("mes:reportWorkConsume:export") + @Log(title = "生产报工物料消耗", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesReportWorkConsume mesReportWorkConsume) { + List list = mesReportWorkConsumeService.selectMesReportWorkConsumeList(mesReportWorkConsume); + ExcelUtil util = new ExcelUtil(MesReportWorkConsume.class); + util.exportExcel(response, list, "生产报工物料消耗数据"); + } + + /** + * 获取生产报工物料消耗详细信息 + */ + @RequiresPermissions("mes:reportWorkConsume:query") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") String recordId) { + return success(mesReportWorkConsumeService.selectMesReportWorkConsumeByRecordId(recordId)); + } + + /** + * 新增生产报工物料消耗 + */ + @RequiresPermissions("mes:reportWorkConsume:add") + @Log(title = "生产报工物料消耗", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesReportWorkConsume mesReportWorkConsume) { + mesReportWorkConsume.setRecordId(IdUtils.fastSimpleUUID()); + return toAjax(mesReportWorkConsumeService.insertMesReportWorkConsume(mesReportWorkConsume)); + } + + /** + * 修改生产报工物料消耗 + */ + @RequiresPermissions("mes:reportWorkConsume:edit") + @Log(title = "生产报工物料消耗", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesReportWorkConsume mesReportWorkConsume) { + return toAjax(mesReportWorkConsumeService.updateMesReportWorkConsume(mesReportWorkConsume)); + } + + /** + * 删除生产报工物料消耗 + */ + @RequiresPermissions("mes:reportWorkConsume:remove") + @Log(title = "生产报工物料消耗", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable String[] recordIds) { + return toAjax(mesReportWorkConsumeService.deleteMesReportWorkConsumeByRecordIds(recordIds)); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java new file mode 100644 index 00000000..95a14174 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -0,0 +1,100 @@ +package com.op.mes.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.common.core.utils.uuid.IdUtils; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.mes.domain.MesReportWork; +import com.op.mes.service.IMesReportWorkService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 报工报表Controller + * + * @author Open Platform + * @date 2023-08-24 + */ +@RestController +@RequestMapping("/reportWork") +public class MesReportWorkController extends BaseController { + @Autowired + private IMesReportWorkService mesReportWorkService; + + /** + * 查询报工报表列表 + */ + @RequiresPermissions("mes:reportWork:list") + @GetMapping("/list") + public TableDataInfo list(MesReportWork mesReportWork) { + startPage(); + List list = mesReportWorkService.selectMesReportWorkList(mesReportWork); + return getDataTable(list); + } + + /** + * 导出报工报表列表 + */ + @RequiresPermissions("mes:reportWork:export") + @Log(title = "报工报表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesReportWork mesReportWork) { + List list = mesReportWorkService.selectMesReportWorkList(mesReportWork); + ExcelUtil util = new ExcelUtil(MesReportWork.class); + util.exportExcel(response, list, "报工报表数据"); + } + + /** + * 获取报工报表详细信息 + */ + @RequiresPermissions("mes:reportWork:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(mesReportWorkService.selectMesReportWorkById(id)); + } + + /** + * 新增报工报表 + */ + @RequiresPermissions("mes:reportWork:add") + @Log(title = "报工报表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesReportWork mesReportWork) { + mesReportWork.setId(IdUtils.fastSimpleUUID()); + return toAjax(mesReportWorkService.insertMesReportWork(mesReportWork)); + } + + /** + * 修改报工报表 + */ + @RequiresPermissions("mes:reportWork:edit") + @Log(title = "报工报表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesReportWork mesReportWork) { + return toAjax(mesReportWorkService.updateMesReportWork(mesReportWork)); + } + + /** + * 删除报工报表 + */ + @RequiresPermissions("mes:reportWork:remove") + @Log(title = "报工报表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(mesReportWorkService.deleteMesReportWorkByIds(ids)); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java new file mode 100644 index 00000000..e578e15e --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -0,0 +1,356 @@ +package com.op.mes.domain; + +import java.math.BigDecimal; +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.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 报工报表对象 mes_report_work + * + * @author Open Platform + * @date 2023-08-24 + */ +public class MesReportWork extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 记录id */ + private String id; + + /** 报工类型，报工类型：SELF自行报工、UNI统一报工 */ + @Excel(name = "报工类型，报工类型：SELF自行报工、UNI统一报工") + private String reportType; + + /** 报工单编号 */ + @Excel(name = "报工单编号") + private String reportCode; + + /** 生产工单编码 */ + @Excel(name = "生产工单编码") + private String workorderCode; + + /** 产品编码 */ + @Excel(name = "产品编码") + private String productCode; + + /** 产品名称 */ + @Excel(name = "产品名称") + private String productName; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String spec; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 排产数量 */ + @Excel(name = "排产数量") + private BigDecimal quantity; + + /** 本次报工数量 */ + @Excel(name = "本次报工数量") + private BigDecimal quantityFeedback; + + /** 合格数量 */ + @Excel(name = "合格数量") + private BigDecimal quantityQualified; + + /** 不合格数量 */ + @Excel(name = "不合格数量") + private BigDecimal quantityUnqualified; + + /** 报工人员 */ + @Excel(name = "报工人员") + private String userName; + + /** 人员名称 */ + @Excel(name = "人员名称") + private String nickName; + + /** 报工途径：PAD、MOBILE、PC */ + @Excel(name = "报工途径：PAD、MOBILE、PC") + private String feedbackChannel; + + /** 报工时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "报工时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date feedbackTime; + + /** 录入人员 */ + @Excel(name = "录入人员") + private String recordUser; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 工时 */ + @Excel(name = "工时") + private Long workTime; + + /** 线体编码 */ + @Excel(name = "线体编码") + private String machineCode; + + /** 线体名称 */ + @Excel(name = "线体名称") + private String machineName; + + /** 班组编码 */ + @Excel(name = "班组编码") + private String teamCode; + + /** 班次编码 */ + @Excel(name = "班次编码") + private String shiftCode; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setReportType(String reportType) { + this.reportType = reportType; + } + public String getReportType() { + return reportType; + } + + public void setReportCode(String reportCode) { + this.reportCode = reportCode; + } + public String getReportCode() { + return reportCode; + } + + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() { + return workorderCode; + } + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductName() { + return productName; + } + public void setSpec(String spec) { + this.spec = spec; + } + + public String getSpec() { + return spec; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public BigDecimal getQuantity() { + return quantity; + } + public void setQuantityFeedback(BigDecimal quantityFeedback) { + this.quantityFeedback = quantityFeedback; + } + + public BigDecimal getQuantityFeedback() { + return quantityFeedback; + } + public void setQuantityQualified(BigDecimal quantityQualified) { + this.quantityQualified = quantityQualified; + } + + public BigDecimal getQuantityQualified() { + return quantityQualified; + } + public void setQuantityUnqualified(BigDecimal quantityUnqualified) { + this.quantityUnqualified = quantityUnqualified; + } + + public BigDecimal getQuantityUnqualified() { + return quantityUnqualified; + } + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserName() { + return userName; + } + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getNickName() { + return nickName; + } + public void setFeedbackChannel(String feedbackChannel) { + this.feedbackChannel = feedbackChannel; + } + + public String getFeedbackChannel() { + return feedbackChannel; + } + public void setFeedbackTime(Date feedbackTime) { + this.feedbackTime = feedbackTime; + } + + public Date getFeedbackTime() { + return feedbackTime; + } + public void setRecordUser(String recordUser) { + this.recordUser = recordUser; + } + + public String getRecordUser() { + return recordUser; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + public void setWorkTime(Long workTime) { + this.workTime = workTime; + } + + public Long getWorkTime() { + return workTime; + } + public void setMachineCode(String machineCode) { + this.machineCode = machineCode; + } + + public String getMachineCode() { + return machineCode; + } + public void setMachineName(String machineName) { + this.machineName = machineName; + } + + public String getMachineName() { + return machineName; + } + public void setTeamCode(String teamCode) { + this.teamCode = teamCode; + } + + public String getTeamCode() { + return teamCode; + } + public void setShiftCode(String shiftCode) { + this.shiftCode = shiftCode; + } + + public String getShiftCode() { + return shiftCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("reportType", getReportType()) + .append("reportCode", getReportCode()) + .append("workorderCode", getWorkorderCode()) + .append("productCode", getProductCode()) + .append("productName", getProductName()) + .append("spec", getSpec()) + .append("unit", getUnit()) + .append("quantity", getQuantity()) + .append("quantityFeedback", getQuantityFeedback()) + .append("quantityQualified", getQuantityQualified()) + .append("quantityUnqualified", getQuantityUnqualified()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("feedbackChannel", getFeedbackChannel()) + .append("feedbackTime", getFeedbackTime()) + .append("recordUser", getRecordUser()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("workTime", getWorkTime()) + .append("machineCode", getMachineCode()) + .append("machineName", getMachineName()) + .append("teamCode", getTeamCode()) + .append("shiftCode", getShiftCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java new file mode 100644 index 00000000..2effd3eb --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -0,0 +1,171 @@ +package com.op.mes.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 生产报工物料消耗对象 mes_report_work_consume + * + * @author Open Platform + * @date 2023-08-24 + */ +public class MesReportWorkConsume extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 工单编码 */ + @Excel(name = "工单编码") + private String workorderCode; + + /** 物料编号 */ + @Excel(name = "物料编号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料规格型号 */ + @Excel(name = "物料规格型号") + private String materialSpc; + + /** 数量 */ + @Excel(name = "数量") + private Long quantity; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() { + return workorderCode; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setMaterialSpc(String materialSpc) { + this.materialSpc = materialSpc; + } + + public String getMaterialSpc() { + return materialSpc; + } + public void setQuantity(Long quantity) { + this.quantity = quantity; + } + + public Long getQuantity() { + return quantity; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("workorderCode", getWorkorderCode()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("materialSpc", getMaterialSpc()) + .append("quantity", getQuantity()) + .append("unit", getUnit()) + .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()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java new file mode 100644 index 00000000..9cb360ca --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -0,0 +1,61 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.MesReportWorkConsume; + +/** + * 生产报工物料消耗Mapper接口 + * + * @author Open Platform + * @date 2023-08-24 + */ +public interface MesReportWorkConsumeMapper { + /** + * 查询生产报工物料消耗 + * + * @param recordId 生产报工物料消耗主键 + * @return 生产报工物料消耗 + */ + public MesReportWorkConsume selectMesReportWorkConsumeByRecordId(String recordId); + + /** + * 查询生产报工物料消耗列表 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 生产报工物料消耗集合 + */ + public List selectMesReportWorkConsumeList(MesReportWorkConsume mesReportWorkConsume); + + /** + * 新增生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 结果 + */ + public int insertMesReportWorkConsume(MesReportWorkConsume mesReportWorkConsume); + + /** + * 修改生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 结果 + */ + public int updateMesReportWorkConsume(MesReportWorkConsume mesReportWorkConsume); + + /** + * 删除生产报工物料消耗 + * + * @param recordId 生产报工物料消耗主键 + * @return 结果 + */ + public int deleteMesReportWorkConsumeByRecordId(String recordId); + + /** + * 批量删除生产报工物料消耗 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesReportWorkConsumeByRecordIds(String[] recordIds); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java new file mode 100644 index 00000000..da4d6174 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -0,0 +1,61 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.MesReportWork; + +/** + * 报工报表Mapper接口 + * + * @author Open Platform + * @date 2023-08-24 + */ +public interface MesReportWorkMapper { + /** + * 查询报工报表 + * + * @param id 报工报表主键 + * @return 报工报表 + */ + public MesReportWork selectMesReportWorkById(String id); + + /** + * 查询报工报表列表 + * + * @param mesReportWork 报工报表 + * @return 报工报表集合 + */ + public List selectMesReportWorkList(MesReportWork mesReportWork); + + /** + * 新增报工报表 + * + * @param mesReportWork 报工报表 + * @return 结果 + */ + public int insertMesReportWork(MesReportWork mesReportWork); + + /** + * 修改报工报表 + * + * @param mesReportWork 报工报表 + * @return 结果 + */ + public int updateMesReportWork(MesReportWork mesReportWork); + + /** + * 删除报工报表 + * + * @param id 报工报表主键 + * @return 结果 + */ + public int deleteMesReportWorkById(String id); + + /** + * 批量删除报工报表 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesReportWorkByIds(String[] ids); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java new file mode 100644 index 00000000..c2c849d1 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java @@ -0,0 +1,60 @@ +package com.op.mes.service; + +import java.util.List; +import com.op.mes.domain.MesReportWorkConsume; + +/** + * 生产报工物料消耗Service接口 + * + * @author Open Platform + * @date 2023-08-24 + */ +public interface IMesReportWorkConsumeService { + /** + * 查询生产报工物料消耗 + * + * @param recordId 生产报工物料消耗主键 + * @return 生产报工物料消耗 + */ + public MesReportWorkConsume selectMesReportWorkConsumeByRecordId(String recordId); + + /** + * 查询生产报工物料消耗列表 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 生产报工物料消耗集合 + */ + public List selectMesReportWorkConsumeList(MesReportWorkConsume mesReportWorkConsume); + + /** + * 新增生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 结果 + */ + public int insertMesReportWorkConsume(MesReportWorkConsume mesReportWorkConsume); + + /** + * 修改生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 结果 + */ + public int updateMesReportWorkConsume(MesReportWorkConsume mesReportWorkConsume); + + /** + * 批量删除生产报工物料消耗 + * + * @param recordIds 需要删除的生产报工物料消耗主键集合 + * @return 结果 + */ + public int deleteMesReportWorkConsumeByRecordIds(String[] recordIds); + + /** + * 删除生产报工物料消耗信息 + * + * @param recordId 生产报工物料消耗主键 + * @return 结果 + */ + public int deleteMesReportWorkConsumeByRecordId(String recordId); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java new file mode 100644 index 00000000..f6ef21cf --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -0,0 +1,60 @@ +package com.op.mes.service; + +import java.util.List; +import com.op.mes.domain.MesReportWork; + +/** + * 报工报表Service接口 + * + * @author Open Platform + * @date 2023-08-24 + */ +public interface IMesReportWorkService { + /** + * 查询报工报表 + * + * @param id 报工报表主键 + * @return 报工报表 + */ + public MesReportWork selectMesReportWorkById(String id); + + /** + * 查询报工报表列表 + * + * @param mesReportWork 报工报表 + * @return 报工报表集合 + */ + public List selectMesReportWorkList(MesReportWork mesReportWork); + + /** + * 新增报工报表 + * + * @param mesReportWork 报工报表 + * @return 结果 + */ + public int insertMesReportWork(MesReportWork mesReportWork); + + /** + * 修改报工报表 + * + * @param mesReportWork 报工报表 + * @return 结果 + */ + public int updateMesReportWork(MesReportWork mesReportWork); + + /** + * 批量删除报工报表 + * + * @param ids 需要删除的报工报表主键集合 + * @return 结果 + */ + public int deleteMesReportWorkByIds(String[] ids); + + /** + * 删除报工报表信息 + * + * @param id 报工报表主键 + * @return 结果 + */ + public int deleteMesReportWorkById(String id); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java new file mode 100644 index 00000000..fda3beed --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -0,0 +1,97 @@ +package com.op.mes.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.MesReportWorkConsumeMapper; +import com.op.mes.domain.MesReportWorkConsume; +import com.op.mes.service.IMesReportWorkConsumeService; + +/** + * 生产报工物料消耗Service业务层处理 + * + * @author Open Platform + * @date 2023-08-24 + */ +@Service +public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeService { + @Autowired + private MesReportWorkConsumeMapper mesReportWorkConsumeMapper; + + /** + * 查询生产报工物料消耗 + * + * @param recordId 生产报工物料消耗主键 + * @return 生产报工物料消耗 + */ + @Override + @DS("#header.poolName") + public MesReportWorkConsume selectMesReportWorkConsumeByRecordId(String recordId) { + return mesReportWorkConsumeMapper.selectMesReportWorkConsumeByRecordId(recordId); + } + + /** + * 查询生产报工物料消耗列表 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 生产报工物料消耗 + */ + @Override + @DS("#header.poolName") + public List selectMesReportWorkConsumeList(MesReportWorkConsume mesReportWorkConsume) { + return mesReportWorkConsumeMapper.selectMesReportWorkConsumeList(mesReportWorkConsume); + } + + /** + * 新增生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertMesReportWorkConsume(MesReportWorkConsume mesReportWorkConsume) { + mesReportWorkConsume.setCreateTime(DateUtils.getNowDate()); + return mesReportWorkConsumeMapper.insertMesReportWorkConsume(mesReportWorkConsume); + } + + /** + * 修改生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateMesReportWorkConsume(MesReportWorkConsume mesReportWorkConsume) { + mesReportWorkConsume.setUpdateTime(DateUtils.getNowDate()); + return mesReportWorkConsumeMapper.updateMesReportWorkConsume(mesReportWorkConsume); + } + + /** + * 批量删除生产报工物料消耗 + * + * @param recordIds 需要删除的生产报工物料消耗主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteMesReportWorkConsumeByRecordIds(String[] recordIds) { + return mesReportWorkConsumeMapper.deleteMesReportWorkConsumeByRecordIds(recordIds); + } + + /** + * 删除生产报工物料消耗信息 + * + * @param recordId 生产报工物料消耗主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteMesReportWorkConsumeByRecordId(String recordId) { + return mesReportWorkConsumeMapper.deleteMesReportWorkConsumeByRecordId(recordId); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java new file mode 100644 index 00000000..09c823be --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -0,0 +1,97 @@ +package com.op.mes.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.MesReportWorkMapper; +import com.op.mes.domain.MesReportWork; +import com.op.mes.service.IMesReportWorkService; + +/** + * 报工报表Service业务层处理 + * + * @author Open Platform + * @date 2023-08-24 + */ +@Service +public class MesReportWorkServiceImpl implements IMesReportWorkService { + @Autowired + private MesReportWorkMapper mesReportWorkMapper; + + /** + * 查询报工报表 + * + * @param id 报工报表主键 + * @return 报工报表 + */ + @Override + @DS("#header.poolName") + public MesReportWork selectMesReportWorkById(String id) { + return mesReportWorkMapper.selectMesReportWorkById(id); + } + + /** + * 查询报工报表列表 + * + * @param mesReportWork 报工报表 + * @return 报工报表 + */ + @Override + @DS("#header.poolName") + public List selectMesReportWorkList(MesReportWork mesReportWork) { + return mesReportWorkMapper.selectMesReportWorkList(mesReportWork); + } + + /** + * 新增报工报表 + * + * @param mesReportWork 报工报表 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertMesReportWork(MesReportWork mesReportWork) { + mesReportWork.setCreateTime(DateUtils.getNowDate()); + return mesReportWorkMapper.insertMesReportWork(mesReportWork); + } + + /** + * 修改报工报表 + * + * @param mesReportWork 报工报表 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateMesReportWork(MesReportWork mesReportWork) { + mesReportWork.setUpdateTime(DateUtils.getNowDate()); + return mesReportWorkMapper.updateMesReportWork(mesReportWork); + } + + /** + * 批量删除报工报表 + * + * @param ids 需要删除的报工报表主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteMesReportWorkByIds(String[] ids) { + return mesReportWorkMapper.deleteMesReportWorkByIds(ids); + } + + /** + * 删除报工报表信息 + * + * @param id 报工报表主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteMesReportWorkById(String id) { + return mesReportWorkMapper.deleteMesReportWorkById(id); + } +} diff --git a/op-modules/op-mes/src/main/resources/mapper/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml similarity index 100% rename from op-modules/op-mes/src/main/resources/mapper/MesPrepareDetailMapper.xml rename to op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml diff --git a/op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml similarity index 100% rename from op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml rename to op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml diff --git a/op-modules/op-mes/src/main/resources/mapper/MesPrepareValidateMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareValidateMapper.xml similarity index 100% rename from op-modules/op-mes/src/main/resources/mapper/MesPrepareValidateMapper.xml rename to op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareValidateMapper.xml diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml new file mode 100644 index 00000000..959d74c2 --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, report_type, report_code, workorder_code, product_code, product_name, spec, unit, quantity, quantity_feedback, quantity_qualified, quantity_unqualified, user_name, nick_name, feedback_channel, feedback_time, record_user, status, remark, work_time, machine_code, machine_name, team_code, shift_code, attr1, attr2, attr3, attr4, create_by, create_time, update_time, update_by from mes_report_work + + + + + + + + insert into mes_report_work + + id, + report_type, + report_code, + workorder_code, + product_code, + product_name, + spec, + unit, + quantity, + quantity_feedback, + quantity_qualified, + quantity_unqualified, + user_name, + nick_name, + feedback_channel, + feedback_time, + record_user, + status, + remark, + work_time, + machine_code, + machine_name, + team_code, + shift_code, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_time, + update_by, + + + #{id}, + #{reportType}, + #{reportCode}, + #{workorderCode}, + #{productCode}, + #{productName}, + #{spec}, + #{unit}, + #{quantity}, + #{quantityFeedback}, + #{quantityQualified}, + #{quantityUnqualified}, + #{userName}, + #{nickName}, + #{feedbackChannel}, + #{feedbackTime}, + #{recordUser}, + #{status}, + #{remark}, + #{workTime}, + #{machineCode}, + #{machineName}, + #{teamCode}, + #{shiftCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateTime}, + #{updateBy}, + + + + + update mes_report_work + + report_type = #{reportType}, + report_code = #{reportCode}, + workorder_code = #{workorderCode}, + product_code = #{productCode}, + product_name = #{productName}, + spec = #{spec}, + unit = #{unit}, + quantity = #{quantity}, + quantity_feedback = #{quantityFeedback}, + quantity_qualified = #{quantityQualified}, + quantity_unqualified = #{quantityUnqualified}, + user_name = #{userName}, + nick_name = #{nickName}, + feedback_channel = #{feedbackChannel}, + feedback_time = #{feedbackTime}, + record_user = #{recordUser}, + status = #{status}, + remark = #{remark}, + work_time = #{workTime}, + machine_code = #{machineCode}, + machine_name = #{machineName}, + team_code = #{teamCode}, + shift_code = #{shiftCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_time = #{updateTime}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from mes_report_work where id = #{id} + + + + delete from mes_report_work where id in + + #{id} + + + \ No newline at end of file