生产订单管理模块
wws
1 year ago
parent
974dd13455
commit
585b4e5692
@ -0,0 +1,38 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
/**
|
||||
* 拆分批次实体类
|
||||
*/
|
||||
public class Batch {
|
||||
// 批次号
|
||||
private String batchCode;
|
||||
// 批次数量
|
||||
private Long batchQuantity;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Batch{" +
|
||||
"batchCode='" + batchCode + '\'' +
|
||||
", batchQuantity=" + batchQuantity +
|
||||
'}';
|
||||
}
|
||||
|
||||
public String getBatchCode() {
|
||||
return batchCode;
|
||||
}
|
||||
|
||||
public void setBatchCode(String batchCode) {
|
||||
this.batchCode = batchCode;
|
||||
}
|
||||
|
||||
public Long getBatchQuantity() {
|
||||
return batchQuantity;
|
||||
}
|
||||
|
||||
public void setBatchQuantity(Long batchQuantity) {
|
||||
this.batchQuantity = batchQuantity;
|
||||
}
|
||||
|
||||
public Batch() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
//换算值实体类
|
||||
public class Convert {
|
||||
private Integer dictCode;
|
||||
private String dictLabel;
|
||||
private String dictValue;
|
||||
private String dictSort;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Convert{" +
|
||||
"dictCode=" + dictCode +
|
||||
", dictLabel='" + dictLabel + '\'' +
|
||||
", dictValue='" + dictValue + '\'' +
|
||||
", dictSort='" + dictSort + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
public Integer getDictCode() {
|
||||
return dictCode;
|
||||
}
|
||||
|
||||
public void setDictCode(Integer dictCode) {
|
||||
this.dictCode = dictCode;
|
||||
}
|
||||
|
||||
public String getDictLabel() {
|
||||
return dictLabel;
|
||||
}
|
||||
|
||||
public void setDictLabel(String dictLabel) {
|
||||
this.dictLabel = dictLabel;
|
||||
}
|
||||
|
||||
public String getDictValue() {
|
||||
return dictValue;
|
||||
}
|
||||
|
||||
public void setDictValue(String dictValue) {
|
||||
this.dictValue = dictValue;
|
||||
}
|
||||
|
||||
public String getDictSort() {
|
||||
return dictSort;
|
||||
}
|
||||
|
||||
public void setDictSort(String dictSort) {
|
||||
this.dictSort = dictSort;
|
||||
}
|
||||
|
||||
public Convert(Integer dictCode, String dictLabel, String dictValue, String dictSort) {
|
||||
this.dictCode = dictCode;
|
||||
this.dictLabel = dictLabel;
|
||||
this.dictValue = dictValue;
|
||||
this.dictSort = dictSort;
|
||||
}
|
||||
|
||||
public Convert() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
//线体实体类
|
||||
public class ProLine {
|
||||
private String key;
|
||||
private String label;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ProLine{" +
|
||||
"key='" + key + '\'' +
|
||||
", label='" + label + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
public String getKey() {
|
||||
return key;
|
||||
}
|
||||
|
||||
public void setKey(String key) {
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return label;
|
||||
}
|
||||
|
||||
public void setLabel(String label) {
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public ProLine(String key, String label) {
|
||||
this.key = key;
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public ProLine() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,345 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.web.domain.TreeEntity;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 生产工单对象 pro_order_workorder
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
public class ProOrderWorkorder extends TreeEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 工单ID */
|
||||
private String workorderId;
|
||||
|
||||
/** 工单编码 */
|
||||
@Excel(name = "工单编码")
|
||||
private String workorderCode;
|
||||
|
||||
/** 工单名称 */
|
||||
@Excel(name = "工单名称")
|
||||
private String workorderName;
|
||||
|
||||
/** 订单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 productName;
|
||||
|
||||
/** 规格型号 */
|
||||
@Excel(name = "规格型号")
|
||||
private String productSpc;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 已生产数量 */
|
||||
@Excel(name = "已生产数量")
|
||||
private Long quantityProduced;
|
||||
|
||||
/** 已拆分数量 */
|
||||
@Excel(name = "已拆分数量")
|
||||
private Long quantitySplit;
|
||||
|
||||
/** 工艺编码 */
|
||||
@Excel(name = "工艺编码")
|
||||
private String routeCode;
|
||||
|
||||
/** 产线编码 */
|
||||
@Excel(name = "产线编码")
|
||||
private String prodLineCode;
|
||||
|
||||
/** 工单生产日期 */
|
||||
@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 parentOrder;
|
||||
|
||||
/** 所有父节点ID */
|
||||
@Excel(name = "所有父节点ID")
|
||||
private String ancestors;
|
||||
|
||||
/** 单据状态 */
|
||||
@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;
|
||||
|
||||
/** 批次号 */
|
||||
private StringBuilder batchCodeList;
|
||||
|
||||
public StringBuilder getBatchCodeList() {
|
||||
return batchCodeList;
|
||||
}
|
||||
|
||||
public void setBatchCodeList(StringBuilder batchCodeList) {
|
||||
this.batchCodeList = batchCodeList;
|
||||
}
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String factoryCode;
|
||||
|
||||
public void setWorkorderId(String workorderId) {
|
||||
this.workorderId = workorderId;
|
||||
}
|
||||
|
||||
public String 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 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 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 setUnit(String unit) {
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit() {
|
||||
return unit;
|
||||
}
|
||||
public void setQuantityProduced(Long quantityProduced) {
|
||||
this.quantityProduced = quantityProduced;
|
||||
}
|
||||
|
||||
public Long getQuantityProduced() {
|
||||
return quantityProduced;
|
||||
}
|
||||
public void setQuantitySplit(Long quantitySplit) {
|
||||
this.quantitySplit = quantitySplit;
|
||||
}
|
||||
|
||||
public Long getQuantitySplit() {
|
||||
return quantitySplit;
|
||||
}
|
||||
public void setRouteCode(String routeCode) {
|
||||
this.routeCode = routeCode;
|
||||
}
|
||||
|
||||
public String getRouteCode() {
|
||||
return routeCode;
|
||||
}
|
||||
public void setProdLineCode(String prodLineCode) {
|
||||
this.prodLineCode = prodLineCode;
|
||||
}
|
||||
|
||||
public String getProdLineCode() {
|
||||
return prodLineCode;
|
||||
}
|
||||
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 setParentOrder(String parentOrder) {
|
||||
this.parentOrder = parentOrder;
|
||||
}
|
||||
|
||||
public String getParentOrder() {
|
||||
return parentOrder;
|
||||
}
|
||||
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 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("workorderId", getWorkorderId())
|
||||
.append("workorderCode", getWorkorderCode())
|
||||
.append("workorderName", getWorkorderName())
|
||||
.append("orderId", getOrderId())
|
||||
.append("orderCode", getOrderCode())
|
||||
.append("productId", getProductId())
|
||||
.append("productCode", getProductCode())
|
||||
.append("productName", getProductName())
|
||||
.append("productSpc", getProductSpc())
|
||||
.append("unit", getUnit())
|
||||
.append("quantityProduced", getQuantityProduced())
|
||||
.append("quantitySplit", getQuantitySplit())
|
||||
.append("routeCode", getRouteCode())
|
||||
.append("prodLineCode", getProdLineCode())
|
||||
.append("productDate", getProductDate())
|
||||
.append("shiftId", getShiftId())
|
||||
.append("parentOrder", getParentOrder())
|
||||
.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("prodType", getProdType())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.append("batchCodeList",getBatchCodeList())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,159 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 生产工单批次对象 pro_order_workorder_batch
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
public class ProOrderWorkorderBatch extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 批次ID */
|
||||
@Excel(name = "批次ID")
|
||||
private String batchId;
|
||||
|
||||
/** 工单ID */
|
||||
private String workorderId;
|
||||
|
||||
/** 批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String batchCode;
|
||||
|
||||
/** 批次数量 */
|
||||
@Excel(name = "批次数量")
|
||||
private Long batchQuantity;
|
||||
|
||||
/** 单据状态 */
|
||||
@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 setBatchId(String batchId) {
|
||||
this.batchId = batchId;
|
||||
}
|
||||
|
||||
public String getBatchId() {
|
||||
return batchId;
|
||||
}
|
||||
public void setWorkorderId(String workorderId) {
|
||||
this.workorderId = workorderId;
|
||||
}
|
||||
|
||||
public String getWorkorderId() {
|
||||
return workorderId;
|
||||
}
|
||||
public void setBatchCode(String batchCode) {
|
||||
this.batchCode = batchCode;
|
||||
}
|
||||
|
||||
public String getBatchCode() {
|
||||
return batchCode;
|
||||
}
|
||||
public void setBatchQuantity(Long batchQuantity) {
|
||||
this.batchQuantity = batchQuantity;
|
||||
}
|
||||
|
||||
public Long getBatchQuantity() {
|
||||
return batchQuantity;
|
||||
}
|
||||
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("batchId", getBatchId())
|
||||
.append("workorderId", getWorkorderId())
|
||||
.append("batchCode", getBatchCode())
|
||||
.append("batchQuantity", getBatchQuantity())
|
||||
.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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.op.mes.domain;
|
||||
|
||||
//班次实体类
|
||||
public class ProShift {
|
||||
private Integer shiftId;
|
||||
private String shiftDesc;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ProShift{" +
|
||||
"shiftId=" + shiftId +
|
||||
", shiftDesc='" + shiftDesc + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
public Integer getShiftId() {
|
||||
return shiftId;
|
||||
}
|
||||
|
||||
public void setShiftId(Integer shiftId) {
|
||||
this.shiftId = shiftId;
|
||||
}
|
||||
|
||||
public String getShiftDesc() {
|
||||
return shiftDesc;
|
||||
}
|
||||
|
||||
public void setShiftDesc(String shiftDesc) {
|
||||
this.shiftDesc = shiftDesc;
|
||||
}
|
||||
|
||||
public ProShift(Integer shiftId, String shiftDesc) {
|
||||
this.shiftId = shiftId;
|
||||
this.shiftDesc = shiftDesc;
|
||||
}
|
||||
|
||||
public ProShift() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,254 @@
|
||||
package com.op.mes.domain.dto;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
public class ProOrderDTO {
|
||||
/** ID */
|
||||
private String id;
|
||||
|
||||
/** 计划工厂编码 */
|
||||
private String factoryCode;
|
||||
|
||||
/** 订单类型 */
|
||||
private String orderType;
|
||||
|
||||
/** 订单号 */
|
||||
private String orderCode;
|
||||
|
||||
/** 物料号 */
|
||||
private String prodCode;
|
||||
|
||||
/** 物料名称 */
|
||||
private String prodDesc;
|
||||
|
||||
/** 订单数量 */
|
||||
private Long quantity;
|
||||
|
||||
/** 已拆分数量 */
|
||||
private Long quantitySplit;
|
||||
|
||||
/** 单位 */
|
||||
private String unit;
|
||||
|
||||
/** 任务清单 */
|
||||
private String workerOrder;
|
||||
|
||||
/** 计划生产日期 */
|
||||
private Date planProDate;
|
||||
|
||||
/** 计划完成日期 */
|
||||
private Date planComplete;
|
||||
|
||||
/** */
|
||||
private String atrr1;
|
||||
|
||||
/** */
|
||||
private String atrr2;
|
||||
|
||||
/** */
|
||||
private String atrr3;
|
||||
|
||||
/** 0未拆分 */
|
||||
private String status;
|
||||
|
||||
/** 上级工单 */
|
||||
private String parentOrder;
|
||||
|
||||
/** 产品类型 */
|
||||
private String prodType;
|
||||
|
||||
/** 物料型号 */
|
||||
private String ProdSpc;
|
||||
|
||||
private List<ProOrderDTO> children;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getOrderType() {
|
||||
return orderType;
|
||||
}
|
||||
|
||||
public void setOrderType(String orderType) {
|
||||
this.orderType = orderType;
|
||||
}
|
||||
|
||||
public String getOrderCode() {
|
||||
return orderCode;
|
||||
}
|
||||
|
||||
public void setOrderCode(String orderCode) {
|
||||
this.orderCode = orderCode;
|
||||
}
|
||||
|
||||
public String getProdCode() {
|
||||
return prodCode;
|
||||
}
|
||||
|
||||
public void setProdCode(String prodCode) {
|
||||
this.prodCode = prodCode;
|
||||
}
|
||||
|
||||
public String getProdDesc() {
|
||||
return prodDesc;
|
||||
}
|
||||
|
||||
public void setProdDesc(String prodDesc) {
|
||||
this.prodDesc = prodDesc;
|
||||
}
|
||||
|
||||
public Long getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Long quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public Long getQuantitySplit() {
|
||||
return quantitySplit;
|
||||
}
|
||||
|
||||
public void setQuantitySplit(Long quantitySplit) {
|
||||
this.quantitySplit = quantitySplit;
|
||||
}
|
||||
|
||||
public String getUnit() {
|
||||
return unit;
|
||||
}
|
||||
|
||||
public void setUnit(String unit) {
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getWorkerOrder() {
|
||||
return workerOrder;
|
||||
}
|
||||
|
||||
public void setWorkerOrder(String workerOrder) {
|
||||
this.workerOrder = workerOrder;
|
||||
}
|
||||
|
||||
public Date getPlanProDate() {
|
||||
return planProDate;
|
||||
}
|
||||
|
||||
public void setPlanProDate(Date planProDate) {
|
||||
this.planProDate = planProDate;
|
||||
}
|
||||
|
||||
public Date getPlanComplete() {
|
||||
return planComplete;
|
||||
}
|
||||
|
||||
public void setPlanComplete(Date planComplete) {
|
||||
this.planComplete = planComplete;
|
||||
}
|
||||
|
||||
public String getAtrr1() {
|
||||
return atrr1;
|
||||
}
|
||||
|
||||
public void setAtrr1(String atrr1) {
|
||||
this.atrr1 = atrr1;
|
||||
}
|
||||
|
||||
public String getAtrr2() {
|
||||
return atrr2;
|
||||
}
|
||||
|
||||
public void setAtrr2(String atrr2) {
|
||||
this.atrr2 = atrr2;
|
||||
}
|
||||
|
||||
public String getAtrr3() {
|
||||
return atrr3;
|
||||
}
|
||||
|
||||
public void setAtrr3(String atrr3) {
|
||||
this.atrr3 = atrr3;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getParentOrder() {
|
||||
return parentOrder;
|
||||
}
|
||||
|
||||
public void setParentOrder(String parentOrder) {
|
||||
this.parentOrder = parentOrder;
|
||||
}
|
||||
|
||||
public String getProdType() {
|
||||
return prodType;
|
||||
}
|
||||
|
||||
public void setProdType(String prodType) {
|
||||
this.prodType = prodType;
|
||||
}
|
||||
|
||||
public String getProdSpc() {
|
||||
return ProdSpc;
|
||||
}
|
||||
|
||||
public void setProdSpc(String prodSpc) {
|
||||
ProdSpc = prodSpc;
|
||||
}
|
||||
|
||||
public List<ProOrderDTO> getChildren() {
|
||||
return children;
|
||||
}
|
||||
|
||||
public void setChildren(List<ProOrderDTO> children) {
|
||||
this.children = children;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ProOrderDTO{" +
|
||||
"id='" + id + '\'' +
|
||||
", factoryCode='" + factoryCode + '\'' +
|
||||
", orderType='" + orderType + '\'' +
|
||||
", orderCode='" + orderCode + '\'' +
|
||||
", prodCode='" + prodCode + '\'' +
|
||||
", prodDesc='" + prodDesc + '\'' +
|
||||
", quantity=" + quantity +
|
||||
", quantitySplit=" + quantitySplit +
|
||||
", unit='" + unit + '\'' +
|
||||
", workerOrder='" + workerOrder + '\'' +
|
||||
", planProDate=" + planProDate +
|
||||
", planComplete=" + planComplete +
|
||||
", atrr1='" + atrr1 + '\'' +
|
||||
", atrr2='" + atrr2 + '\'' +
|
||||
", atrr3='" + atrr3 + '\'' +
|
||||
", status='" + status + '\'' +
|
||||
", parentOrder='" + parentOrder + '\'' +
|
||||
", prodType='" + prodType + '\'' +
|
||||
", ProdSpc='" + ProdSpc + '\'' +
|
||||
", children=" + children +
|
||||
'}';
|
||||
}
|
||||
|
||||
public ProOrderDTO() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
package com.op.mes.domain.dto;
|
||||
|
||||
import com.op.mes.domain.Batch;
|
||||
import com.op.mes.domain.ProOrder;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
//接受前端拆分模型
|
||||
public class SplitOrderDTO {
|
||||
//批次号与批次数量
|
||||
private List<Batch> formFields;
|
||||
//产线
|
||||
private String prodLineCode;
|
||||
//日期
|
||||
private Date productDate;
|
||||
//班次
|
||||
private String shiftId;
|
||||
//拆分数量
|
||||
private Long splitNum;
|
||||
//所有改变的订单列表
|
||||
private ProOrderDTO product;
|
||||
|
||||
public List<Batch> getFormFields() {
|
||||
return formFields;
|
||||
}
|
||||
|
||||
public void setFormFields(List<Batch> formFields) {
|
||||
this.formFields = formFields;
|
||||
}
|
||||
|
||||
public String getProdLineCode() {
|
||||
return prodLineCode;
|
||||
}
|
||||
|
||||
public void setProdLineCode(String prodLineCode) {
|
||||
this.prodLineCode = prodLineCode;
|
||||
}
|
||||
|
||||
public Date getProductDate() {
|
||||
return productDate;
|
||||
}
|
||||
|
||||
public void setProductDate(Date productDate) {
|
||||
this.productDate = productDate;
|
||||
}
|
||||
|
||||
public String getShiftId() {
|
||||
return shiftId;
|
||||
}
|
||||
|
||||
public void setShiftId(String shiftId) {
|
||||
this.shiftId = shiftId;
|
||||
}
|
||||
|
||||
public Long getSplitNum() {
|
||||
return splitNum;
|
||||
}
|
||||
|
||||
public void setSplitNum(Long splitNum) {
|
||||
this.splitNum = splitNum;
|
||||
}
|
||||
|
||||
public ProOrderDTO getProduct() {
|
||||
return product;
|
||||
}
|
||||
|
||||
public void setProduct(ProOrderDTO product) {
|
||||
this.product = product;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SplitOrderDTO{" +
|
||||
"formFields=" + formFields +
|
||||
", prodLineCode='" + prodLineCode + '\'' +
|
||||
", productDate=" + productDate +
|
||||
", shiftId='" + shiftId + '\'' +
|
||||
", splitNum=" + splitNum +
|
||||
", product=" + product +
|
||||
'}';
|
||||
}
|
||||
|
||||
public SplitOrderDTO() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package com.op.mes.domain.vo;
|
||||
|
||||
import com.op.mes.domain.ProLine;
|
||||
import com.op.mes.domain.ProShift;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class LineAndShiftVo {
|
||||
//线体
|
||||
private List<ProLine> lines;
|
||||
//班次
|
||||
private List<ProShift> shifts;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "LineAndShiftVo{" +
|
||||
"lines=" + lines +
|
||||
", shifts=" + shifts +
|
||||
'}';
|
||||
}
|
||||
|
||||
public List<ProLine> getLines() {
|
||||
return lines;
|
||||
}
|
||||
|
||||
public void setLines(List<ProLine> lines) {
|
||||
this.lines = lines;
|
||||
}
|
||||
|
||||
public List<ProShift> getShifts() {
|
||||
return shifts;
|
||||
}
|
||||
|
||||
public void setShifts(List<ProShift> shifts) {
|
||||
this.shifts = shifts;
|
||||
}
|
||||
|
||||
public LineAndShiftVo(List<ProLine> lines, List<ProShift> shifts) {
|
||||
this.lines = lines;
|
||||
this.shifts = shifts;
|
||||
}
|
||||
|
||||
public LineAndShiftVo() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
package com.op.mes.mapper;
|
||||
|
||||
import com.op.mes.domain.Batch;
|
||||
import com.op.mes.domain.ProOrderWorkorderBatch;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产工单批次Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
public interface ProOrderWorkorderBatchMapper {
|
||||
/**
|
||||
* 查询生产工单批次
|
||||
*
|
||||
* @param workorderId 生产工单批次主键
|
||||
* @return 生产工单批次
|
||||
*/
|
||||
public ProOrderWorkorderBatch selectProOrderWorkorderBatchByWorkorderId(String workorderId);
|
||||
|
||||
/**
|
||||
* 查询生产工单批次列表
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 生产工单批次集合
|
||||
*/
|
||||
public List<ProOrderWorkorderBatch> selectProOrderWorkorderBatchList(ProOrderWorkorderBatch proOrderWorkorderBatch);
|
||||
|
||||
/**
|
||||
* 新增生产工单批次
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProOrderWorkorderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch);
|
||||
|
||||
/**
|
||||
* 修改生产工单批次
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProOrderWorkorderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch);
|
||||
|
||||
/**
|
||||
* 删除生产工单批次
|
||||
*
|
||||
* @param workorderId 生产工单批次主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderBatchByWorkorderId(String workorderId);
|
||||
|
||||
/**
|
||||
* 批量删除生产工单批次
|
||||
*
|
||||
* @param workorderIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderBatchByWorkorderIds(String[] workorderIds);
|
||||
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package com.op.mes.mapper;
|
||||
|
||||
import com.op.mes.domain.ProOrderWorkorder;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产工单Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
public interface ProOrderWorkorderMapper {
|
||||
/**
|
||||
* 查询生产工单
|
||||
*
|
||||
* @param workorderId 生产工单主键
|
||||
* @return 生产工单
|
||||
*/
|
||||
public ProOrderWorkorder selectProOrderWorkorderByWorkorderId(String workorderId);
|
||||
|
||||
/**
|
||||
* 查询生产工单列表
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 生产工单集合
|
||||
*/
|
||||
public List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
/**
|
||||
* 新增生产工单
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
/**
|
||||
* 修改生产工单
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
/**
|
||||
* 删除生产工单
|
||||
*
|
||||
* @param workorderId 生产工单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderByWorkorderId(String workorderId);
|
||||
|
||||
/**
|
||||
* 批量删除生产工单
|
||||
*
|
||||
* @param workorderIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderByWorkorderIds(String[] workorderIds);
|
||||
|
||||
/**
|
||||
* 通过订单id查询工单信息
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
List<ProOrderWorkorder> selectFirWorkOrder(String id);
|
||||
|
||||
/**
|
||||
* 通过code查询子工单
|
||||
* @param workorderCode
|
||||
* @return
|
||||
*/
|
||||
List<ProOrderWorkorder> selectChildWorkOrder(String workorderCode);
|
||||
}
|
||||
@ -1,60 +1,104 @@
|
||||
package com.op.mes.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.common.core.web.domain.AjaxResult;
|
||||
import com.op.mes.domain.Convert;
|
||||
import com.op.mes.domain.ProOrder;
|
||||
import com.op.mes.domain.dto.SplitOrderDTO;
|
||||
import com.op.mes.domain.vo.LineAndShiftVo;
|
||||
|
||||
/**
|
||||
* 订单Service接口
|
||||
*
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-13
|
||||
*/
|
||||
public interface IProOrderService {
|
||||
/**
|
||||
* 查询订单
|
||||
*
|
||||
* @param id 订单主键
|
||||
* @return 订单
|
||||
*/
|
||||
public ProOrder selectProOrderById(String id);
|
||||
|
||||
/**
|
||||
* 查询订单列表
|
||||
*
|
||||
* @param proOrder 订单
|
||||
* @return 订单集合
|
||||
*/
|
||||
public List<ProOrder> selectProOrderList(ProOrder proOrder);
|
||||
|
||||
/**
|
||||
* 新增订单
|
||||
*
|
||||
* @param proOrder 订单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProOrder(ProOrder proOrder);
|
||||
|
||||
/**
|
||||
* 修改订单
|
||||
*
|
||||
* @param proOrder 订单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProOrder(ProOrder proOrder);
|
||||
|
||||
/**
|
||||
* 批量删除订单
|
||||
*
|
||||
* @param ids 需要删除的订单主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除订单信息
|
||||
*
|
||||
* @param id 订单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderById(String id);
|
||||
|
||||
/**
|
||||
* 获取线体
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public LineAndShiftVo getProdLineShift();
|
||||
|
||||
/**
|
||||
* 查询订单
|
||||
*
|
||||
* @param id 订单主键
|
||||
* @return 订单
|
||||
*/
|
||||
public ProOrder selectProOrderById(String id);
|
||||
|
||||
/**
|
||||
* 查询订单列表
|
||||
*
|
||||
* @param proOrder 订单
|
||||
* @return 订单集合
|
||||
*/
|
||||
public List<ProOrder> selectProOrderList(ProOrder proOrder);
|
||||
|
||||
/**
|
||||
* 新增订单
|
||||
*
|
||||
* @param proOrder 订单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProOrder(ProOrder proOrder);
|
||||
|
||||
/**
|
||||
* 修改订单
|
||||
*
|
||||
* @param proOrder 订单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProOrder(ProOrder proOrder);
|
||||
|
||||
/**
|
||||
* 批量删除订单
|
||||
*
|
||||
* @param ids 需要删除的订单主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除订单信息
|
||||
*
|
||||
* @param id 订单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderById(String id);
|
||||
|
||||
/**
|
||||
* 获取换算值
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public List<Convert> getConvert();
|
||||
|
||||
/**
|
||||
* 提交拆分订单接口
|
||||
*
|
||||
* @param splitOrderDTO
|
||||
* @return
|
||||
*/
|
||||
public AjaxResult subSplitOrder(SplitOrderDTO splitOrderDTO);
|
||||
|
||||
/**
|
||||
* 获取工单信息列表
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
public AjaxResult getWorkOrderList(String id);
|
||||
|
||||
/**
|
||||
* 获取当前订单信息列表
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
public AjaxResult getOrderList(String id);
|
||||
}
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
package com.op.mes.service;
|
||||
|
||||
import com.op.mes.domain.ProOrderWorkorderBatch;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产工单批次Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
public interface IProOrderWorkorderBatchService {
|
||||
/**
|
||||
* 查询生产工单批次
|
||||
*
|
||||
* @param workorderId 生产工单批次主键
|
||||
* @return 生产工单批次
|
||||
*/
|
||||
public ProOrderWorkorderBatch selectProOrderWorkorderBatchByWorkorderId(String workorderId);
|
||||
|
||||
/**
|
||||
* 查询生产工单批次列表
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 生产工单批次集合
|
||||
*/
|
||||
public List<ProOrderWorkorderBatch> selectProOrderWorkorderBatchList(ProOrderWorkorderBatch proOrderWorkorderBatch);
|
||||
|
||||
/**
|
||||
* 新增生产工单批次
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProOrderWorkorderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch);
|
||||
|
||||
/**
|
||||
* 修改生产工单批次
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProOrderWorkorderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch);
|
||||
|
||||
/**
|
||||
* 批量删除生产工单批次
|
||||
*
|
||||
* @param workorderIds 需要删除的生产工单批次主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderBatchByWorkorderIds(String[] workorderIds);
|
||||
|
||||
/**
|
||||
* 删除生产工单批次信息
|
||||
*
|
||||
* @param workorderId 生产工单批次主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderBatchByWorkorderId(String workorderId);
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
package com.op.mes.service;
|
||||
|
||||
|
||||
import com.op.mes.domain.ProOrderWorkorder;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产工单Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
public interface IProOrderWorkorderService {
|
||||
/**
|
||||
* 查询生产工单
|
||||
*
|
||||
* @param workorderId 生产工单主键
|
||||
* @return 生产工单
|
||||
*/
|
||||
public ProOrderWorkorder selectProOrderWorkorderByWorkorderId(String workorderId);
|
||||
|
||||
/**
|
||||
* 查询生产工单列表
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 生产工单集合
|
||||
*/
|
||||
public List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
/**
|
||||
* 新增生产工单
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
/**
|
||||
* 修改生产工单
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
/**
|
||||
* 批量删除生产工单
|
||||
*
|
||||
* @param workorderIds 需要删除的生产工单主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderByWorkorderIds(String[] workorderIds);
|
||||
|
||||
/**
|
||||
* 删除生产工单信息
|
||||
*
|
||||
* @param workorderId 生产工单主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProOrderWorkorderByWorkorderId(String workorderId);
|
||||
}
|
||||
@ -0,0 +1,90 @@
|
||||
package com.op.mes.service.impl;
|
||||
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.mes.domain.ProOrderWorkorderBatch;
|
||||
import com.op.mes.mapper.ProOrderWorkorderBatchMapper;
|
||||
import com.op.mes.service.IProOrderWorkorderBatchService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产工单批次Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
@Service
|
||||
public class ProOrderWorkorderBatchServiceImpl implements IProOrderWorkorderBatchService {
|
||||
@Autowired
|
||||
private ProOrderWorkorderBatchMapper proOrderWorkorderBatchMapper;
|
||||
|
||||
/**
|
||||
* 查询生产工单批次
|
||||
*
|
||||
* @param workorderId 生产工单批次主键
|
||||
* @return 生产工单批次
|
||||
*/
|
||||
@Override
|
||||
public ProOrderWorkorderBatch selectProOrderWorkorderBatchByWorkorderId(String workorderId) {
|
||||
return proOrderWorkorderBatchMapper.selectProOrderWorkorderBatchByWorkorderId(workorderId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产工单批次列表
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 生产工单批次
|
||||
*/
|
||||
@Override
|
||||
public List<ProOrderWorkorderBatch> selectProOrderWorkorderBatchList(ProOrderWorkorderBatch proOrderWorkorderBatch) {
|
||||
return proOrderWorkorderBatchMapper.selectProOrderWorkorderBatchList(proOrderWorkorderBatch);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产工单批次
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertProOrderWorkorderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) {
|
||||
proOrderWorkorderBatch.setCreateTime(DateUtils.getNowDate());
|
||||
return proOrderWorkorderBatchMapper.insertProOrderWorkorderBatch(proOrderWorkorderBatch);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产工单批次
|
||||
*
|
||||
* @param proOrderWorkorderBatch 生产工单批次
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateProOrderWorkorderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) {
|
||||
proOrderWorkorderBatch.setUpdateTime(DateUtils.getNowDate());
|
||||
return proOrderWorkorderBatchMapper.updateProOrderWorkorderBatch(proOrderWorkorderBatch);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除生产工单批次
|
||||
*
|
||||
* @param workorderIds 需要删除的生产工单批次主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteProOrderWorkorderBatchByWorkorderIds(String[] workorderIds) {
|
||||
return proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(workorderIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除生产工单批次信息
|
||||
*
|
||||
* @param workorderId 生产工单批次主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteProOrderWorkorderBatchByWorkorderId(String workorderId) {
|
||||
return proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderId(workorderId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.op.mes.service.impl;
|
||||
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.mes.domain.ProOrderWorkorder;
|
||||
import com.op.mes.mapper.ProOrderWorkorderMapper;
|
||||
import com.op.mes.service.IProOrderWorkorderService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 生产工单Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
@Service
|
||||
public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
||||
@Autowired
|
||||
private ProOrderWorkorderMapper proOrderWorkorderMapper;
|
||||
|
||||
/**
|
||||
* 查询生产工单
|
||||
*
|
||||
* @param workorderId 生产工单主键
|
||||
* @return 生产工单
|
||||
*/
|
||||
@Override
|
||||
public ProOrderWorkorder selectProOrderWorkorderByWorkorderId(String workorderId) {
|
||||
return proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(workorderId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产工单列表
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 生产工单
|
||||
*/
|
||||
@Override
|
||||
public List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder) {
|
||||
return proOrderWorkorderMapper.selectProOrderWorkorderList(proOrderWorkorder);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产工单
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
|
||||
proOrderWorkorder.setCreateTime(DateUtils.getNowDate());
|
||||
return proOrderWorkorderMapper.insertProOrderWorkorder(proOrderWorkorder);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产工单
|
||||
*
|
||||
* @param proOrderWorkorder 生产工单
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
|
||||
proOrderWorkorder.setUpdateTime(DateUtils.getNowDate());
|
||||
return proOrderWorkorderMapper.updateProOrderWorkorder(proOrderWorkorder);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除生产工单
|
||||
*
|
||||
* @param workorderIds 需要删除的生产工单主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteProOrderWorkorderByWorkorderIds(String[] workorderIds) {
|
||||
return proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除生产工单信息
|
||||
*
|
||||
* @param workorderId 生产工单主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteProOrderWorkorderByWorkorderId(String workorderId) {
|
||||
return proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderId(workorderId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,123 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.mes.mapper.ProOrderWorkorderBatchMapper">
|
||||
|
||||
<resultMap type="ProOrderWorkorderBatch" id="ProOrderWorkorderBatchResult">
|
||||
<result property="batchId" column="batch_id" />
|
||||
<result property="workorderId" column="workorder_id" />
|
||||
<result property="batchCode" column="batch_code" />
|
||||
<result property="batchQuantity" column="batch_quantity" />
|
||||
<result property="status" column="status" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="attr4" column="attr4" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="prodType" column="prod_type" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectProOrderWorkorderBatchVo">
|
||||
select batch_id, workorder_id, batch_code, batch_quantity, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, prod_type, factory_code from pro_order_workorder_batch
|
||||
</sql>
|
||||
|
||||
<select id="selectProOrderWorkorderBatchList" parameterType="ProOrderWorkorderBatch" resultMap="ProOrderWorkorderBatchResult">
|
||||
<include refid="selectProOrderWorkorderBatchVo"/>
|
||||
<where>
|
||||
<if test="batchId != null and batchId != ''"> and batch_id = #{batchId}</if>
|
||||
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
|
||||
<if test="batchQuantity != null "> and batch_quantity = #{batchQuantity}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
|
||||
<if test="prodType != null and prodType != ''"> and prod_type = #{prodType}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectProOrderWorkorderBatchByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderBatchResult">
|
||||
<include refid="selectProOrderWorkorderBatchVo"/>
|
||||
where workorder_id = #{workorderId}
|
||||
</select>
|
||||
|
||||
<insert id="insertProOrderWorkorderBatch" parameterType="ProOrderWorkorderBatch">
|
||||
insert into pro_order_workorder_batch
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="batchId != null and batchId != ''">batch_id,</if>
|
||||
<if test="workorderId != null">workorder_id,</if>
|
||||
<if test="batchCode != null">batch_code,</if>
|
||||
<if test="batchQuantity != null">batch_quantity,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
<if test="attr2 != null">attr2,</if>
|
||||
<if test="attr3 != null">attr3,</if>
|
||||
<if test="attr4 != null">attr4,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="prodType != null">prod_type,</if>
|
||||
<if test="factoryCode != null">factory_code,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="batchId != null and batchId != ''">#{batchId},</if>
|
||||
<if test="workorderId != null">#{workorderId},</if>
|
||||
<if test="batchCode != null">#{batchCode},</if>
|
||||
<if test="batchQuantity != null">#{batchQuantity},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="attr4 != null">#{attr4},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="prodType != null">#{prodType},</if>
|
||||
<if test="factoryCode != null">#{factoryCode},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateProOrderWorkorderBatch" parameterType="ProOrderWorkorderBatch">
|
||||
update pro_order_workorder_batch
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="batchId != null and batchId != ''">batch_id = #{batchId},</if>
|
||||
<if test="batchCode != null">batch_code = #{batchCode},</if>
|
||||
<if test="batchQuantity != null">batch_quantity = #{batchQuantity},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||
<if test="attr3 != null">attr3 = #{attr3},</if>
|
||||
<if test="attr4 != null">attr4 = #{attr4},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="prodType != null">prod_type = #{prodType},</if>
|
||||
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
|
||||
</trim>
|
||||
where workorder_id = #{workorderId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteProOrderWorkorderBatchByWorkorderId" parameterType="String">
|
||||
delete from pro_order_workorder_batch where workorder_id = #{workorderId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteProOrderWorkorderBatchByWorkorderIds" parameterType="String">
|
||||
delete from pro_order_workorder_batch where workorder_id in
|
||||
<foreach item="workorderId" collection="array" open="(" separator="," close=")">
|
||||
#{workorderId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,203 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.mes.mapper.ProOrderWorkorderMapper">
|
||||
|
||||
<resultMap type="ProOrderWorkorder" id="ProOrderWorkorderResult">
|
||||
<result property="workorderId" column="workorder_id" />
|
||||
<result property="workorderCode" column="workorder_code" />
|
||||
<result property="workorderName" column="workorder_name" />
|
||||
<result property="orderId" column="order_id" />
|
||||
<result property="orderCode" column="order_code" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="productCode" column="product_code" />
|
||||
<result property="productName" column="product_name" />
|
||||
<result property="productSpc" column="product_spc" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="quantityProduced" column="quantity_produced" />
|
||||
<result property="quantitySplit" column="quantity_split" />
|
||||
<result property="routeCode" column="route_code" />
|
||||
<result property="prodLineCode" column="prod_line_code" />
|
||||
<result property="productDate" column="product_date" />
|
||||
<result property="shiftId" column="shift_id" />
|
||||
<result property="parentOrder" column="parent_order" />
|
||||
<result property="ancestors" column="ancestors" />
|
||||
<result property="status" column="status" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="attr4" column="attr4" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="prodType" column="prod_type" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectProOrderWorkorderVo">
|
||||
select workorder_id, workorder_code, workorder_name, order_id, order_code, product_id, product_code, product_name, product_spc, unit, quantity_produced, quantity_split, route_code, prod_line_code, product_date, shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, prod_type, factory_code from pro_order_workorder
|
||||
</sql>
|
||||
|
||||
<select id="selectProOrderWorkorderList" parameterType="ProOrderWorkorder" resultMap="ProOrderWorkorderResult">
|
||||
<include refid="selectProOrderWorkorderVo"/>
|
||||
<where>
|
||||
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
|
||||
<if test="workorderName != null and workorderName != ''"> and workorder_name like concat('%', #{workorderName}, '%')</if>
|
||||
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
|
||||
<if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
|
||||
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
|
||||
<if test="productSpc != null and productSpc != ''"> and product_spc = #{productSpc}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="quantityProduced != null "> and quantity_produced = #{quantityProduced}</if>
|
||||
<if test="quantitySplit != null "> and quantity_split = #{quantitySplit}</if>
|
||||
<if test="routeCode != null and routeCode != ''"> and route_code = #{routeCode}</if>
|
||||
<if test="prodLineCode != null and prodLineCode != ''"> and prod_line_code = #{prodLineCode}</if>
|
||||
<if test="productDate != null "> and product_date = #{productDate}</if>
|
||||
<if test="shiftId != null and shiftId != ''"> and shift_id = #{shiftId}</if>
|
||||
<if test="parentOrder != null and parentOrder != ''"> and parent_order = #{parentOrder}</if>
|
||||
<if test="ancestors != null and ancestors != ''"> and ancestors = #{ancestors}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
|
||||
<if test="prodType != null and prodType != ''"> and prod_type = #{prodType}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectProOrderWorkorderByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderResult">
|
||||
<include refid="selectProOrderWorkorderVo"/>
|
||||
where workorder_id = #{workorderId}
|
||||
</select>
|
||||
<select id="selectFirWorkOrder" parameterType="String" resultMap="ProOrderWorkorderResult">
|
||||
SELECT pow.*
|
||||
FROM pro_order_workorder pow LEFT JOIN pro_order po
|
||||
ON pow.order_id = po.id
|
||||
WHERE po.id = #{id}
|
||||
</select>
|
||||
<select id="selectChildWorkOrder" parameterType="String" resultMap="ProOrderWorkorderResult">
|
||||
<include refid="selectProOrderWorkorderVo"/>
|
||||
WHERE parent_order = #{workorderCode}
|
||||
</select>
|
||||
|
||||
<insert id="insertProOrderWorkorder" parameterType="ProOrderWorkorder">
|
||||
insert into pro_order_workorder
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="workorderId != null">workorder_id,</if>
|
||||
<if test="workorderCode != null and workorderCode != ''">workorder_code,</if>
|
||||
<if test="workorderName != null and workorderName != ''">workorder_name,</if>
|
||||
<if test="orderId != null and orderId != ''">order_id,</if>
|
||||
<if test="orderCode != null">order_code,</if>
|
||||
<if test="productId != null">product_id,</if>
|
||||
<if test="productCode != null and productCode != ''">product_code,</if>
|
||||
<if test="productName != null and productName != ''">product_name,</if>
|
||||
<if test="productSpc != null">product_spc,</if>
|
||||
<if test="unit != null and unit != ''">unit,</if>
|
||||
<if test="quantityProduced != null">quantity_produced,</if>
|
||||
<if test="quantitySplit != null">quantity_split,</if>
|
||||
<if test="routeCode != null">route_code,</if>
|
||||
<if test="prodLineCode != null">prod_line_code,</if>
|
||||
<if test="productDate != null">product_date,</if>
|
||||
<if test="shiftId != null">shift_id,</if>
|
||||
<if test="parentOrder != null">parent_order,</if>
|
||||
<if test="ancestors != null">ancestors,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
<if test="attr2 != null">attr2,</if>
|
||||
<if test="attr3 != null">attr3,</if>
|
||||
<if test="attr4 != null">attr4,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="prodType != null">prod_type,</if>
|
||||
<if test="factoryCode != null">factory_code,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="workorderId != null">#{workorderId},</if>
|
||||
<if test="workorderCode != null and workorderCode != ''">#{workorderCode},</if>
|
||||
<if test="workorderName != null and workorderName != ''">#{workorderName},</if>
|
||||
<if test="orderId != null and orderId != ''">#{orderId},</if>
|
||||
<if test="orderCode != null">#{orderCode},</if>
|
||||
<if test="productId != null">#{productId},</if>
|
||||
<if test="productCode != null and productCode != ''">#{productCode},</if>
|
||||
<if test="productName != null and productName != ''">#{productName},</if>
|
||||
<if test="productSpc != null">#{productSpc},</if>
|
||||
<if test="unit != null and unit != ''">#{unit},</if>
|
||||
<if test="quantityProduced != null">#{quantityProduced},</if>
|
||||
<if test="quantitySplit != null">#{quantitySplit},</if>
|
||||
<if test="routeCode != null">#{routeCode},</if>
|
||||
<if test="prodLineCode != null">#{prodLineCode},</if>
|
||||
<if test="productDate != null">#{productDate},</if>
|
||||
<if test="shiftId != null">#{shiftId},</if>
|
||||
<if test="parentOrder != null">#{parentOrder},</if>
|
||||
<if test="ancestors != null">#{ancestors},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="attr4 != null">#{attr4},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="prodType != null">#{prodType},</if>
|
||||
<if test="factoryCode != null">#{factoryCode},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateProOrderWorkorder" parameterType="ProOrderWorkorder">
|
||||
update pro_order_workorder
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="workorderCode != null and workorderCode != ''">workorder_code = #{workorderCode},</if>
|
||||
<if test="workorderName != null and workorderName != ''">workorder_name = #{workorderName},</if>
|
||||
<if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
|
||||
<if test="orderCode != null">order_code = #{orderCode},</if>
|
||||
<if test="productId != null">product_id = #{productId},</if>
|
||||
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
|
||||
<if test="productName != null and productName != ''">product_name = #{productName},</if>
|
||||
<if test="productSpc != null">product_spc = #{productSpc},</if>
|
||||
<if test="unit != null and unit != ''">unit = #{unit},</if>
|
||||
<if test="quantityProduced != null">quantity_produced = #{quantityProduced},</if>
|
||||
<if test="quantitySplit != null">quantity_split = #{quantitySplit},</if>
|
||||
<if test="routeCode != null">route_code = #{routeCode},</if>
|
||||
<if test="prodLineCode != null">prod_line_code = #{prodLineCode},</if>
|
||||
<if test="productDate != null">product_date = #{productDate},</if>
|
||||
<if test="shiftId != null">shift_id = #{shiftId},</if>
|
||||
<if test="parentOrder != null">parent_order = #{parentOrder},</if>
|
||||
<if test="ancestors != null">ancestors = #{ancestors},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||
<if test="attr3 != null">attr3 = #{attr3},</if>
|
||||
<if test="attr4 != null">attr4 = #{attr4},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="prodType != null">prod_type = #{prodType},</if>
|
||||
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
|
||||
</trim>
|
||||
where workorder_id = #{workorderId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteProOrderWorkorderByWorkorderId" parameterType="String">
|
||||
delete from pro_order_workorder where workorder_id = #{workorderId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteProOrderWorkorderByWorkorderIds" parameterType="String">
|
||||
delete from pro_order_workorder where workorder_id in
|
||||
<foreach item="workorderId" collection="array" open="(" separator="," close=")">
|
||||
#{workorderId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue