diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepare.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepare.java new file mode 100644 index 00000000..5a1accf0 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepare.java @@ -0,0 +1,341 @@ +package com.op.system.api.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 MesPrepare 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-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetail.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetail.java new file mode 100644 index 00000000..091f7a40 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetail.java @@ -0,0 +1,223 @@ +package com.op.system.api.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备料单明细对象 mes_prepare_detail + * + * @author Open Platform + * @date 2023-08-04 + */ +public class MesPrepareDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** ID */ + private String recordId; + + /** 备料主ID */ + @Excel(name = "备料主ID") + private String prepareId; + + /** 物料编号 */ + @Excel(name = "物料编号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materailName; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String materailSpc; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 生产数量 */ + @Excel(name = "生产数量") + private Long quantity; + + /** 工单生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date productDate; + + /** 班次 */ + @Excel(name = "班次") + private String shiftId; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 预留字段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 prodType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String factoryCode; + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setPrepareId(String prepareId) { + this.prepareId = prepareId; + } + + public String getPrepareId() { + return prepareId; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterailName(String materailName) { + this.materailName = materailName; + } + + public String getMaterailName() { + return materailName; + } + public void setMaterailSpc(String materailSpc) { + this.materailSpc = materailSpc; + } + + public String getMaterailSpc() { + return materailSpc; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + public void setQuantity(Long quantity) { + this.quantity = quantity; + } + + public Long getQuantity() { + return quantity; + } + 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 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 setProdType(String prodType) { + this.prodType = prodType; + } + + public String getProdType() { + return prodType; + } + 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("prepareId", getPrepareId()) + .append("materialCode", getMaterialCode()) + .append("materailName", getMaterailName()) + .append("materailSpc", getMaterailSpc()) + .append("unit", getUnit()) + .append("quantity", getQuantity()) + .append("productDate", getProductDate()) + .append("shiftId", getShiftId()) + .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("prodType", getProdType()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml index edd2ebab..3df02a46 100644 --- a/op-common/op-common-datascope/op-common-datascope.iml +++ b/op-common/op-common-datascope/op-common-datascope.iml @@ -7,6 +7,7 @@ + diff --git a/op-common/op-common-log/op-common-log.iml b/op-common/op-common-log/op-common-log.iml new file mode 100644 index 00000000..edd2ebab --- /dev/null +++ b/op-common/op-common-log/op-common-log.iml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml index 57386d32..5f28b4a0 100644 --- a/op-common/op-common-security/op-common-security.iml +++ b/op-common/op-common-security/op-common-security.iml @@ -7,6 +7,7 @@ + diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/BaseBomComponentDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/BaseBomComponentDTO.java new file mode 100644 index 00000000..33bc0da3 --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/BaseBomComponentDTO.java @@ -0,0 +1,259 @@ +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; + +/** + * 物料BOM子表对象 base_bom_component + * + * @author Open Platform + * @date 2023-08-04 + */ +public class BaseBomComponentDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** BOM单号 */ + @Excel(name = "BOM单号") + private String bomCode; + + /** 工厂/站点 */ + @Excel(name = "工厂/站点") + private String site; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String productCode; + + /** 组件上层物料编码 */ + @Excel(name = "组件上层物料编码") + private String cumc; + + /** 组件编码 */ + @Excel(name = "组件编码") + private String component; + + /** BOM层次 */ + @Excel(name = "BOM层次") + private String bomHierarchy; + + /** 项目编号 */ + @Excel(name = "项目编号") + private String projectNo; + + /** 标准用量 */ + @Excel(name = "标准用量") + private Long standardDosage; + + /** 损耗率 */ + @Excel(name = "损耗率") + private Long lossRate; + + /** 损耗额 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "损耗额", width = 30, dateFormat = "yyyy-MM-dd") + private Date lossAmount; + + /** 含损耗用量 */ + @Excel(name = "含损耗用量") + private Long cilosses; + + /** 组件数量单位 */ + @Excel(name = "组件数量单位") + private String componentUnit; + + /** 组件采购标志 */ + @Excel(name = "组件采购标志") + private String componentProFlag; + + /** 物料供应标识 */ + @Excel(name = "物料供应标识") + private String msi; + + /** 成本核算标识相关 */ + @Excel(name = "成本核算标识相关") + private String sanka; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + public void setBomCode(String bomCode) { + this.bomCode = bomCode; + } + + public String getBomCode() { + return bomCode; + } + public void setSite(String site) { + this.site = site; + } + + public String getSite() { + return site; + } + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + public void setCumc(String cumc) { + this.cumc = cumc; + } + + public String getCumc() { + return cumc; + } + public void setComponent(String component) { + this.component = component; + } + + public String getComponent() { + return component; + } + public void setBomHierarchy(String bomHierarchy) { + this.bomHierarchy = bomHierarchy; + } + + public String getBomHierarchy() { + return bomHierarchy; + } + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + public String getProjectNo() { + return projectNo; + } + public void setStandardDosage(Long standardDosage) { + this.standardDosage = standardDosage; + } + + public Long getStandardDosage() { + return standardDosage; + } + public void setLossRate(Long lossRate) { + this.lossRate = lossRate; + } + + public Long getLossRate() { + return lossRate; + } + public void setLossAmount(Date lossAmount) { + this.lossAmount = lossAmount; + } + + public Date getLossAmount() { + return lossAmount; + } + public void setCilosses(Long cilosses) { + this.cilosses = cilosses; + } + + public Long getCilosses() { + return cilosses; + } + public void setComponentUnit(String componentUnit) { + this.componentUnit = componentUnit; + } + + public String getComponentUnit() { + return componentUnit; + } + public void setComponentProFlag(String componentProFlag) { + this.componentProFlag = componentProFlag; + } + + public String getComponentProFlag() { + return componentProFlag; + } + public void setMsi(String msi) { + this.msi = msi; + } + + public String getMsi() { + return msi; + } + public void setSanka(String sanka) { + this.sanka = sanka; + } + + public String getSanka() { + return sanka; + } + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("bomCode", getBomCode()) + .append("site", getSite()) + .append("productCode", getProductCode()) + .append("cumc", getCumc()) + .append("component", getComponent()) + .append("bomHierarchy", getBomHierarchy()) + .append("projectNo", getProjectNo()) + .append("standardDosage", getStandardDosage()) + .append("lossRate", getLossRate()) + .append("lossAmount", getLossAmount()) + .append("cilosses", getCilosses()) + .append("componentUnit", getComponentUnit()) + .append("componentProFlag", getComponentProFlag()) + .append("msi", getMsi()) + .append("sanka", getSanka()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/BaseBomDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/BaseBomDTO.java new file mode 100644 index 00000000..8671f7cb --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/BaseBomDTO.java @@ -0,0 +1,262 @@ +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; + +/** + * BOM物料管理对象 base_bom + * + * @author Open Platform + * @date 2023-08-02 + */ +public class BaseBomDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 生产版本 */ + @Excel(name = "生产版本") + private String productionVersion; + + /** BOM单号 */ + @Excel(name = "BOM单号") + private String bomCode; + + /** 可选BOM */ + @Excel(name = "可选BOM") + private String optionalBom; + + /** 可选BOM文本 */ + @Excel(name = "可选BOM文本") + private String optionalBomText; + + /** 生产版本有效期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产版本有效期", width = 30, dateFormat = "yyyy-MM-dd") + private Date pvvd; + + /** 生产版本截止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产版本截止日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date pved; + + /** BOM计算数量 */ + @Excel(name = "BOM计算数量") + private Long bomCalculateNumber; + + /** BOM计算单位 */ + @Excel(name = "BOM计算单位") + private String bomCalculateUnit; + + /** BOM基本数量 */ + @Excel(name = "BOM基本数量") + private Long bomBaseNumber; + + /** BOM基本单位 */ + @Excel(name = "BOM基本单位") + private String bomBaseUnit; + + /** 组件数量单位 */ + @Excel(name = "组件数量单位") + private String componentUnit; + + /** 组件采购标志 */ + @Excel(name = "组件采购标志") + private String componentProFlag; + + /** 物料供应标识 */ + @Excel(name = "物料供应标识") + private String msi; + + /** 成本核算标识相关 */ + @Excel(name = "成本核算标识相关") + private String sanka; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 是否在用 */ + @Excel(name = "是否在用") + private String currentVersion; + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setProductionVersion(String productionVersion) { + this.productionVersion = productionVersion; + } + + public String getProductionVersion() { + return productionVersion; + } + public void setBomCode(String bomCode) { + this.bomCode = bomCode; + } + + public String getBomCode() { + return bomCode; + } + public void setOptionalBom(String optionalBom) { + this.optionalBom = optionalBom; + } + + public String getOptionalBom() { + return optionalBom; + } + public void setOptionalBomText(String optionalBomText) { + this.optionalBomText = optionalBomText; + } + + public String getOptionalBomText() { + return optionalBomText; + } + public void setPvvd(Date pvvd) { + this.pvvd = pvvd; + } + + public Date getPvvd() { + return pvvd; + } + public void setPved(Date pved) { + this.pved = pved; + } + + public Date getPved() { + return pved; + } + public void setBomCalculateNumber(Long bomCalculateNumber) { + this.bomCalculateNumber = bomCalculateNumber; + } + + public Long getBomCalculateNumber() { + return bomCalculateNumber; + } + public void setBomCalculateUnit(String bomCalculateUnit) { + this.bomCalculateUnit = bomCalculateUnit; + } + + public String getBomCalculateUnit() { + return bomCalculateUnit; + } + public void setBomBaseNumber(Long bomBaseNumber) { + this.bomBaseNumber = bomBaseNumber; + } + + public Long getBomBaseNumber() { + return bomBaseNumber; + } + public void setBomBaseUnit(String bomBaseUnit) { + this.bomBaseUnit = bomBaseUnit; + } + + public String getBomBaseUnit() { + return bomBaseUnit; + } + public void setComponentUnit(String componentUnit) { + this.componentUnit = componentUnit; + } + + public String getComponentUnit() { + return componentUnit; + } + public void setComponentProFlag(String componentProFlag) { + this.componentProFlag = componentProFlag; + } + + public String getComponentProFlag() { + return componentProFlag; + } + public void setMsi(String msi) { + this.msi = msi; + } + + public String getMsi() { + return msi; + } + + public void setSanka(String sanka) { + this.sanka = sanka; + } + + public String getSanka() { + return sanka; + } + 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 setCurrentVersion(String currentVersion) { + this.currentVersion = currentVersion; + } + + public String getCurrentVersion() { + return currentVersion; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("factoryCode", getFactoryCode()) + .append("productionVersion", getProductionVersion()) + .append("bomCode", getBomCode()) + .append("optionalBom", getOptionalBom()) + .append("optionalBomText", getOptionalBomText()) + .append("pvvd", getPvvd()) + .append("pved", getPved()) + .append("bomCalculateNumber", getBomCalculateNumber()) + .append("bomCalculateUnit", getBomCalculateUnit()) + .append("bomBaseNumber", getBomBaseNumber()) + .append("bomBaseUnit", getBomBaseUnit()) + .append("componentUnit", getComponentUnit()) + .append("componentProFlag", getComponentProFlag()) + .append("msi", getMsi()) + .append("sanka", getSanka()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("currentVersion", getCurrentVersion()) + .toString(); + } +} 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 new file mode 100644 index 00000000..5e230447 --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/MesPrepareDTO.java @@ -0,0 +1,341 @@ +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/domain/dto/WCSDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDTO.java deleted file mode 100644 index 8801013e..00000000 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDTO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.op.plan.domain.dto; - -import java.util.Date; -import java.util.List; - -public class WCSDTO { - - private String reqCode; - - private Date reqTime; - - private String planNo; - - private String code; - - private String message; - - private List data; - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getReqCode() { - return reqCode; - } - - public void setReqCode(String reqCode) { - this.reqCode = reqCode; - } - - public Date getReqTime() { - return reqTime; - } - - public void setReqTime(Date reqTime) { - this.reqTime = reqTime; - } - - public String getPlanNo() { - return planNo; - } - - public void setPlanNo(String planNo) { - this.planNo = planNo; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } -} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDataDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDataDTO.java deleted file mode 100644 index 37b9d225..00000000 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDataDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.op.plan.domain.dto; - - -import java.util.List; - -public class WCSDataDTO { - - private String sku; - - private String loadNo; - - private List unLoadItems; - - public String getSku() { - return sku; - } - - public void setSku(String sku) { - this.sku = sku; - } - - public String getLoadNo() { - return loadNo; - } - - public void setLoadNo(String loadNo) { - this.loadNo = loadNo; - } - - public List getUnLoadItems() { - return unLoadItems; - } - - public void setUnLoadItems(List unLoadItems) { - this.unLoadItems = unLoadItems; - } -} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDataItemsDTO.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDataItemsDTO.java deleted file mode 100644 index 2dcbd981..00000000 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/dto/WCSDataItemsDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.op.plan.domain.dto; - - -public class WCSDataItemsDTO { - - private String unloadNo; - - public String getUnloadNo() { - return unloadNo; - } - - public void setUnloadNo(String unloadNo) { - this.unloadNo = unloadNo; - } -} 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 ae831a71..541af650 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 @@ -2,6 +2,7 @@ package com.op.plan.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.plan.domain.ProOrderWorkorder; +import com.op.system.api.domain.dto.MesPrepare; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -118,5 +119,7 @@ public interface ProOrderWorkorderMapper { * @return */ int deleteProOrderWorkorderByOrderId(String id); + + void createPrepare(MesPrepare mesPrepare); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index 570dd8eb..82e10dac 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -101,4 +101,5 @@ public interface IProOrderWorkorderService { * @return */ AjaxResult checkWorkOrder(String id); + } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index b9bccba6..b350947a 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -376,6 +376,11 @@ public class ProOrderServiceImpl implements IProOrderService { // 通过订单号code更新订单信息 proOrderMapper.updateProOrderByOrderCode(order); } else { + // 创建字段 + order.setCreateBy(SecurityContextHolder.getUserName()); + // 更新字段 + order.setUpdateBy(SecurityContextHolder.getUserName()); + order.setUpdateTime(DateUtils.getNowDate()); // 不存在则创建 order.setId(IdUtils.fastSimpleUUID()); order.setOrderType(order.getProdType()); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 6f3391bc..113e5aa4 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -6,11 +6,14 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.security.utils.SecurityUtils; import com.op.plan.domain.*; +import com.op.plan.domain.dto.BaseBomDTO; import com.op.plan.domain.dto.ProOrderDTO; import com.op.plan.domain.dto.SplitOrderDTO; import com.op.plan.mapper.*; import com.op.plan.service.IProOrderWorkorderService; +import com.op.system.api.domain.dto.MesPrepare; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -171,9 +174,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { @DS("#header.poolName") @Transactional(rollbackFor = Exception.class) public int downProOrderWorkorderByWorkorderIds(String[] workorderIds) { - //关联工艺 + List workorders = proOrderWorkorderMapper.getWorkOrderByIds(workorderIds); for(ProOrderWorkorder workorder:workorders){ + //关联工艺 if(StringUtils.isNotBlank(workorder.getRouteCode())){ List workDetails = proWorkorderProcessDetailMapper.getWorkOrderDetailsByRouteCode(workorder); if(!CollectionUtils.isEmpty(workDetails)){ @@ -189,6 +193,21 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } } } + //生成备料单 + for(String workorderId:workorderIds){ + ProOrderWorkorder orderWorkorder = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(workorderId); + //备(领)料主单 + MesPrepare mesPrepare = new MesPrepare(); + BeanUtils.copyBeanProp(mesPrepare,orderWorkorder); + mesPrepare.setPrepareId(orderWorkorder.getWorkorderCode()+"L");//领料单号 + mesPrepare.setWorkorderCode(orderWorkorder.getWorkorderCode()); + mesPrepare.setCreateBy(SecurityUtils.getUsername()); + mesPrepare.setCreateTime(DateUtils.getNowDate()); + mesPrepare.setStatus("L0");//待确认 + proOrderWorkorderMapper.createPrepare(mesPrepare); + //备(领)料明细-获取bom + + } //下达工单 return proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(workorderIds); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java index c1293e46..40bb1e2c 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java @@ -11,11 +11,12 @@ import com.op.common.core.utils.http.HttpUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.plan.domain.*; -import com.op.plan.domain.dto.WCSDTO; -import com.op.plan.domain.dto.WCSDataDTO; -import com.op.plan.domain.dto.WCSDataItemsDTO; + import com.op.plan.mapper.ProOrderWorkorderMapper; import com.op.plan.mapper.ProWetMaterialPlanDetailMapper; +import com.op.system.api.domain.dto.WCSDTO; +import com.op.system.api.domain.dto.WCSDataDTO; +import com.op.system.api.domain.dto.WCSDataItemsDTO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index c6f2f5f1..7a2048b7 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -199,6 +199,75 @@ #{isEnd}, + + insert into mes_prepare + + prepare_id, + workorder_code, + workorder_name, + parent_order, + order_id, + order_code, + product_id, + product_code, + prod_type, + product_name, + product_spc, + wet_detail_plan_id, + product_date, + shift_id, + ancestors, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + material_code, + material_name, + material_spc, + unit, + quantity, + + + #{prepareId}, + #{workorderCode}, + #{workorderName}, + #{parentOrder}, + #{orderId}, + #{orderCode}, + #{productId}, + #{productCode}, + #{prodType}, + #{productName}, + #{productSpc}, + #{wetDetailPlanId}, + #{productDate}, + #{shiftId}, + #{ancestors}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{materialCode}, + #{materialName}, + #{materialSpc}, + #{unit}, + #{quantity}, + + update pro_order_workorder diff --git a/op-modules/op-sap/op-modules-sap.iml b/op-modules/op-sap/op-modules-sap.iml index 25909668..5965147f 100644 --- a/op-modules/op-sap/op-modules-sap.iml +++ b/op-modules/op-sap/op-modules-sap.iml @@ -21,6 +21,7 @@ + @@ -196,6 +197,5 @@ - \ No newline at end of file