diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index 378d263..be65d70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -18,6 +18,8 @@ public class ProductSnModel implements Serializable { private static final long serialVersionUID = 7137684552464509466L; + @ApiParam("包装条码") + private String packageNo; @ApiParam("客户零件号") private String customerPartNo; @@ -53,7 +55,13 @@ public class ProductSnModel implements Serializable { private String qcStatusName; - public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) { + + + public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo, + String qrCode, String workCenterName, String processName, + String workCellName, String createDatetime, + String createUser, Integer qcStatus) { + this.packageNo = packageNo; this.customerPartNo = customerPartNo; this.serialNumber = serialNumber; this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index b27a164..7095697 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -18,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -212,6 +212,10 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "接收时间") private String rcTime; + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 2d6b4ba..343a961 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -297,6 +297,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "jis料架号") private String queueGroupNo; + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + @Transient @ApiParam(value = "工厂名称") public String organizeName;