diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesPrepareDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesPrepareDTO.java deleted file mode 100644 index 5e230447..00000000 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesPrepareDTO.java +++ /dev/null @@ -1,341 +0,0 @@ -package com.op.plan.domain.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.util.Date; - -/** - * 备料单对象 mes_prepare - * - * @author Open Platform - * @date 2023-08-03 - */ -public class MesPrepareDTO extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 备料单id */ - private String prepareId; - - /** 工单编码 */ - @Excel(name = "工单编码") - private String workorderCode; - - /** 工单名称 */ - @Excel(name = "工单名称") - private String workorderName; - - /** 父工单 */ - @Excel(name = "父工单") - private String parentOrder; - - /** 订单id */ - @Excel(name = "订单id") - private String orderId; - - /** 订单编码 */ - @Excel(name = "订单编码") - private String orderCode; - - /** 产品id */ - @Excel(name = "产品id") - private String productId; - - /** 产品编号 */ - @Excel(name = "产品编号") - private String productCode; - - /** 产品类型 */ - @Excel(name = "产品类型") - private String prodType; - - /** 产品名称 */ - @Excel(name = "产品名称") - private String productName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String productSpc; - - /** 配料计划明细id */ - @Excel(name = "配料计划明细id") - private String wetDetailPlanId; - - /** 工单生产日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date productDate; - - /** 班次 */ - @Excel(name = "班次") - private String shiftId; - - /** 所有父节点id */ - @Excel(name = "所有父节点id") - private String ancestors; - - /** 单据状态 */ - @Excel(name = "单据状态") - private String status; - - /** 物料编码 */ - @Excel(name = "物料编码") - private String materialCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String materialName; - - /** 物料规格型号 */ - @Excel(name = "物料规格型号") - private String materialSpc; - - /** 单位 */ - @Excel(name = "单位") - private String unit; - - /** 生产数量 */ - @Excel(name = "生产数量") - private String quantity; - - /** 预留字段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 String getMaterialCode() { - return materialCode; - } - public void setMaterialCode(String materialCode) { - this.materialCode = 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 setUnit(String unit) { - this.unit = unit; - } - public String getUnit() { - return unit; - } - - public void setQuantity(String quantity) { - this.quantity = quantity; - } - public String getQuantity() { - return quantity; - } - - public void setPrepareId(String prepareId) { - this.prepareId = prepareId; - } - public String getPrepareId() { - return prepareId; - } - 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 setParentOrder(String parentOrder) { - this.parentOrder = parentOrder; - } - - public String getParentOrder() { - return parentOrder; - } - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public String getOrderId() { - return orderId; - } - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getOrderCode() { - return orderCode; - } - public void setProductId(String productId) { - this.productId = productId; - } - - public String getProductId() { - return productId; - } - public void setProductCode(String productCode) { - this.productCode = productCode; - } - - public String getProductCode() { - return productCode; - } - public void setProdType(String prodType) { - this.prodType = prodType; - } - - public String getProdType() { - return prodType; - } - public void setProductName(String productName) { - this.productName = productName; - } - - public String getProductName() { - return productName; - } - public void setProductSpc(String productSpc) { - this.productSpc = productSpc; - } - - public String getProductSpc() { - return productSpc; - } - public void setWetDetailPlanId(String wetDetailPlanId) { - this.wetDetailPlanId = wetDetailPlanId; - } - - public String getWetDetailPlanId() { - return wetDetailPlanId; - } - public void setProductDate(Date productDate) { - this.productDate = productDate; - } - - public Date getProductDate() { - return productDate; - } - public void setShiftId(String shiftId) { - this.shiftId = shiftId; - } - - public String getShiftId() { - return shiftId; - } - public void setAncestors(String ancestors) { - this.ancestors = ancestors; - } - - public String getAncestors() { - return ancestors; - } - 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(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("prepareId", getPrepareId()) - .append("workorderCode", getWorkorderCode()) - .append("workorderName", getWorkorderName()) - .append("parentOrder", getParentOrder()) - .append("orderId", getOrderId()) - .append("orderCode", getOrderCode()) - .append("productId", getProductId()) - .append("productCode", getProductCode()) - .append("prodType", getProdType()) - .append("productName", getProductName()) - .append("productSpc", getProductSpc()) - .append("wetDetailPlanId", getWetDetailPlanId()) - .append("productDate", getProductDate()) - .append("shiftId", getShiftId()) - .append("ancestors", getAncestors()) - .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()) - .append("factoryCode", getFactoryCode()) - .append("materialCode", getMaterialCode()) - .append("materialName", getMaterialName()) - .append("materialSpc", getMaterialSpc()) - .append("quantity", getQuantity()) - .append("unit", getUnit()) - .toString(); - } -} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 50eddafa..1d5d6203 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -121,7 +121,7 @@ public interface ProOrderWorkorderMapper { */ int deleteProOrderWorkorderByOrderId(String id); - void createPrepare(MesPrepareDTO mesPrepareDTO); + void createPrepare(MesPrepareDTO mesPrepare); ProOrder getOrderCodeById(String workorderId);