成品销售出库修改

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -1,4 +1,4 @@
-package com.op.quality.Controller;
+package com.op.quality.controller;
 
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.domain.R;
@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName : quaController

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java

@@ -0,0 +1,402 @@
+package com.op.wms.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 成品销售出库对象 wms_sell_out_embryo
+ * 
+ * @author Open Platform
+ * @date 2023-09-04
+ */
+public class WmsSellOutEmbryo extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** ID */
+	private String id;
+
+	/** 交货单号 */
+	@Excel(name = "交货单号")
+	private String deliveryOrder;
+
+	/** 项次 */
+	@Excel(name = "项次")
+	private String itemNumber;
+
+	/** 工厂编码 */
+	@Excel(name = "工厂编码")
+	private String factoryCode;
+
+	/** 仓库编码 */
+	@Excel(name = "仓库编码")
+	private String whCode;
+
+	/** 库区编码 */
+	@Excel(name = "库区编码")
+	private String waCode;
+
+	/** 库位编码 */
+	@Excel(name = "库位编码")
+	private String wlCode;
+
+	/** 出库地点 */
+	@Excel(name = "出库地点")
+	private String deliveryPlace;
+
+	/** 产品名称 */
+	@Excel(name = "产品名称")
+	private String productName;
+
+	/** 产品编码 */
+	@Excel(name = "产品编码")
+	private String productCode;
+
+	/** 产品分类 */
+	@Excel(name = "产品分类")
+	private String productSort;
+
+	/** 规格型号 */
+	@Excel(name = "规格型号")
+	private String specification;
+
+	/** 单位 */
+	@Excel(name = "单位")
+	private String unitOfMeasure;
+
+	/** 批号 */
+	@Excel(name = "批次号")
+	private String lotNumber;
+
+	/** 计划出库数量 */
+	@Excel(name = "计划出库数量")
+	private Long planQuantity;
+
+	/** 出库数量 */
+	@Excel(name = "出库数量")
+	private Long outQuantity;
+
+	/** 出库状态 */
+	@Excel(name = "出库状态")
+	private String status;
+
+	/** 过账SAP状态 */
+	@Excel(name = "过账SAP状态")
+	private String sapStatus;
+
+	/** 过账SAP凭证 */
+	@Excel(name = "过账SAP凭证")
+	private String sapProof;
+
+	/** 过账SAP返回信息 */
+	@Excel(name = "过账SAP返回信息")
+	private String sapMessage;
+
+	/** 出库时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date outDate;
+
+	/** 预留字段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;
+
+	/** 预留字段5 */
+	@Excel(name = "预留字段5")
+	private String attr5;
+
+	/** 预留字段6 */
+	@Excel(name = "预留字段6")
+	private String attr6;
+
+	/** 预留字段7 */
+	@Excel(name = "预留字段7")
+	private String attr7;
+
+	/** 预留字段8 */
+	@Excel(name = "预留字段8")
+	private String attr8;
+
+	/** 预留字段9 */
+	@Excel(name = "预留字段9")
+	private String attr9;
+
+	/** 预留字段10 */
+	@Excel(name = "预留字段10")
+	private String attr10;
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+	public void setDeliveryOrder(String deliveryOrder) {
+		this.deliveryOrder = deliveryOrder;
+	}
+
+	public String getDeliveryOrder() {
+		return deliveryOrder;
+	}
+	public void setItemNumber(String itemNumber) {
+		this.itemNumber = itemNumber;
+	}
+
+	public String getItemNumber() {
+		return itemNumber;
+	}
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+	public void setWhCode(String whCode) {
+		this.whCode = whCode;
+	}
+
+	public String getWhCode() {
+		return whCode;
+	}
+	public void setWaCode(String waCode) {
+		this.waCode = waCode;
+	}
+
+	public String getWaCode() {
+		return waCode;
+	}
+	public void setWlCode(String wlCode) {
+		this.wlCode = wlCode;
+	}
+
+	public String getWlCode() {
+		return wlCode;
+	}
+	public void setDeliveryPlace(String deliveryPlace) {
+		this.deliveryPlace = deliveryPlace;
+	}
+
+	public String getDeliveryPlace() {
+		return deliveryPlace;
+	}
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+	public void setProductCode(String productCode) {
+		this.productCode = productCode;
+	}
+
+	public String getProductCode() {
+		return productCode;
+	}
+	public void setProductSort(String productSort) {
+		this.productSort = productSort;
+	}
+
+	public String getProductSort() {
+		return productSort;
+	}
+	public void setSpecification(String specification) {
+		this.specification = specification;
+	}
+
+	public String getSpecification() {
+		return specification;
+	}
+	public void setUnitOfMeasure(String unitOfMeasure) {
+		this.unitOfMeasure = unitOfMeasure;
+	}
+
+	public String getUnitOfMeasure() {
+		return unitOfMeasure;
+	}
+	public void setLotNumber(String lotNumber) {
+		this.lotNumber = lotNumber;
+	}
+
+	public String getLotNumber() {
+		return lotNumber;
+	}
+	public void setPlanQuantity(Long planQuantity) {
+		this.planQuantity = planQuantity;
+	}
+
+	public Long getPlanQuantity() {
+		return planQuantity;
+	}
+	public void setOutQuantity(Long outQuantity) {
+		this.outQuantity = outQuantity;
+	}
+
+	public Long getOutQuantity() {
+		return outQuantity;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+	public void setSapStatus(String sapStatus) {
+		this.sapStatus = sapStatus;
+	}
+
+	public String getSapStatus() {
+		return sapStatus;
+	}
+	public void setSapProof(String sapProof) {
+		this.sapProof = sapProof;
+	}
+
+	public String getSapProof() {
+		return sapProof;
+	}
+	public void setSapMessage(String sapMessage) {
+		this.sapMessage = sapMessage;
+	}
+
+	public String getSapMessage() {
+		return sapMessage;
+	}
+	public void setOutDate(Date outDate) {
+		this.outDate = outDate;
+	}
+
+	public Date getOutDate() {
+		return outDate;
+	}
+	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 setAttr5(String attr5) {
+		this.attr5 = attr5;
+	}
+
+	public String getAttr5() {
+		return attr5;
+	}
+	public void setAttr6(String attr6) {
+		this.attr6 = attr6;
+	}
+
+	public String getAttr6() {
+		return attr6;
+	}
+	public void setAttr7(String attr7) {
+		this.attr7 = attr7;
+	}
+
+	public String getAttr7() {
+		return attr7;
+	}
+	public void setAttr8(String attr8) {
+		this.attr8 = attr8;
+	}
+
+	public String getAttr8() {
+		return attr8;
+	}
+	public void setAttr9(String attr9) {
+		this.attr9 = attr9;
+	}
+
+	public String getAttr9() {
+		return attr9;
+	}
+	public void setAttr10(String attr10) {
+		this.attr10 = attr10;
+	}
+
+	public String getAttr10() {
+		return attr10;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+			.append("id", getId())
+			.append("deliveryOrder", getDeliveryOrder())
+			.append("itemNumber", getItemNumber())
+			.append("factoryCode", getFactoryCode())
+			.append("whCode", getWhCode())
+			.append("waCode", getWaCode())
+			.append("wlCode", getWlCode())
+			.append("deliveryPlace", getDeliveryPlace())
+			.append("productName", getProductName())
+			.append("productCode", getProductCode())
+			.append("productSort", getProductSort())
+			.append("specification", getSpecification())
+			.append("unitOfMeasure", getUnitOfMeasure())
+			.append("lotNumber", getLotNumber())
+			.append("planQuantity", getPlanQuantity())
+			.append("outQuantity", getOutQuantity())
+			.append("status", getStatus())
+			.append("sapStatus", getSapStatus())
+			.append("sapProof", getSapProof())
+			.append("sapMessage", getSapMessage())
+			.append("outDate", getOutDate())
+			.append("attr1", getAttr1())
+			.append("attr2", getAttr2())
+			.append("attr3", getAttr3())
+			.append("attr4", getAttr4())
+			.append("attr5", getAttr5())
+			.append("attr6", getAttr6())
+			.append("attr7", getAttr7())
+			.append("attr8", getAttr8())
+			.append("attr9", getAttr9())
+			.append("attr10", getAttr10())
+			.append("createBy", getCreateBy())
+			.append("createTime", getCreateTime())
+			.append("updateBy", getUpdateBy())
+			.append("updateTime", getUpdateTime())
+			.append("remark", getRemark())
+			.toString();
+	}
+}

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutTray.java

@@ -0,0 +1,254 @@
+package com.op.wms.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 成品销售出库关联托盘箱码对象 wms_sell_out_tray
+ * 
+ * @author Open Platform
+ * @date 2023-09-04
+ */
+public class WmsSellOutTray extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** ID */
+	private String id;
+
+	/** 交货单号 */
+	@Excel(name = "交货单号")
+	private String deliveryOrder;
+
+	/** 工厂编码 */
+	@Excel(name = "工厂编码")
+	private String factoryCode;
+
+	/** 仓库编码 */
+	@Excel(name = "仓库编码")
+	private String whCode;
+
+	/** 库区编码 */
+	@Excel(name = "库区编码")
+	private String waCode;
+
+	/** 库位编码 */
+	@Excel(name = "库位编码")
+	private String wlCode;
+
+	/** 产品名称 */
+	@Excel(name = "产品名称")
+	private String productName;
+
+	/** 产品编码 */
+	@Excel(name = "产品编码")
+	private String productCode;
+
+	/** 产品分类 */
+	@Excel(name = "产品分类")
+	private String productSort;
+
+	/** 托盘号 */
+	@Excel(name = "托盘号")
+	private String sn;
+
+	/** 箱码 */
+	@Excel(name = "箱码")
+	private String barcode;
+
+	/** 预留字段1 */
+	@Excel(name = "批次号")
+	private String lotNumber;
+
+	/** 预留字段2 */
+	@Excel(name = "预留字段2")
+	private String userDefined2;
+
+	/** 预留字段3 */
+	@Excel(name = "预留字段3")
+	private String userDefined3;
+
+	/** 预留字段4 */
+	@Excel(name = "预留字段4")
+	private String userDefined4;
+
+	/** 预留字段5 */
+	@Excel(name = "预留字段5")
+	private String userDefined5;
+
+	/** 预留字段6 */
+	@Excel(name = "预留字段6")
+	private String userDefined6;
+
+	/** 预留字段7 */
+	@Excel(name = "预留字段7")
+	private String userDefined7;
+
+	/** 预留字段8 */
+	@Excel(name = "预留字段8")
+	private String userDefined8;
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+	public void setDeliveryOrder(String deliveryOrder) {
+		this.deliveryOrder = deliveryOrder;
+	}
+
+	public String getDeliveryOrder() {
+		return deliveryOrder;
+	}
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+	public void setWhCode(String whCode) {
+		this.whCode = whCode;
+	}
+
+	public String getWhCode() {
+		return whCode;
+	}
+	public void setWaCode(String waCode) {
+		this.waCode = waCode;
+	}
+
+	public String getWaCode() {
+		return waCode;
+	}
+	public void setWlCode(String wlCode) {
+		this.wlCode = wlCode;
+	}
+
+	public String getWlCode() {
+		return wlCode;
+	}
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+	public void setProductCode(String productCode) {
+		this.productCode = productCode;
+	}
+
+	public String getProductCode() {
+		return productCode;
+	}
+	public void setProductSort(String productSort) {
+		this.productSort = productSort;
+	}
+
+	public String getProductSort() {
+		return productSort;
+	}
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+
+	public String getSn() {
+		return sn;
+	}
+	public void setBarcode(String barcode) {
+		this.barcode = barcode;
+	}
+
+	public String getBarcode() {
+		return barcode;
+	}
+	public void setLotNumber(String lotNumber) {
+		this.lotNumber = lotNumber;
+	}
+
+	public String getLotNumber() {
+		return lotNumber;
+	}
+	public void setUserDefined2(String userDefined2) {
+		this.userDefined2 = userDefined2;
+	}
+
+	public String getUserDefined2() {
+		return userDefined2;
+	}
+	public void setUserDefined3(String userDefined3) {
+		this.userDefined3 = userDefined3;
+	}
+
+	public String getUserDefined3() {
+		return userDefined3;
+	}
+	public void setUserDefined4(String userDefined4) {
+		this.userDefined4 = userDefined4;
+	}
+
+	public String getUserDefined4() {
+		return userDefined4;
+	}
+	public void setUserDefined5(String userDefined5) {
+		this.userDefined5 = userDefined5;
+	}
+
+	public String getUserDefined5() {
+		return userDefined5;
+	}
+	public void setUserDefined6(String userDefined6) {
+		this.userDefined6 = userDefined6;
+	}
+
+	public String getUserDefined6() {
+		return userDefined6;
+	}
+	public void setUserDefined7(String userDefined7) {
+		this.userDefined7 = userDefined7;
+	}
+
+	public String getUserDefined7() {
+		return userDefined7;
+	}
+	public void setUserDefined8(String userDefined8) {
+		this.userDefined8 = userDefined8;
+	}
+
+	public String getUserDefined8() {
+		return userDefined8;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+			.append("id", getId())
+			.append("deliveryOrder", getDeliveryOrder())
+			.append("factoryCode", getFactoryCode())
+			.append("whCode", getWhCode())
+			.append("waCode", getWaCode())
+			.append("wlCode", getWlCode())
+			.append("productName", getProductName())
+			.append("productCode", getProductCode())
+			.append("productSort", getProductSort())
+			.append("sn", getSn())
+			.append("barcode", getBarcode())
+			.append("lotNumber", getLotNumber())
+			.append("userDefined2", getUserDefined2())
+			.append("userDefined3", getUserDefined3())
+			.append("userDefined4", getUserDefined4())
+			.append("userDefined5", getUserDefined5())
+			.append("userDefined6", getUserDefined6())
+			.append("userDefined7", getUserDefined7())
+			.append("userDefined8", getUserDefined8())
+			.append("createBy", getCreateBy())
+			.append("createTime", getCreateTime())
+			.append("updateBy", getUpdateBy())
+			.append("updateTime", getUpdateTime())
+			.toString();
+	}
+}