diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index 7594492..31953ee 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -49,6 +49,10 @@ public class BfMethod extends BaseBean { @ApiParam(value ="功能描述") private String methodDescription; + @Column(name="IS_DESIGN") + @ApiParam(value ="是否进行功能设计") + private Integer isDesign; + @Transient @ApiParam(value ="表单功能自定义按钮") private List bfButtonList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index f0746fc..a8b116a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -114,4 +114,12 @@ public class WmsPart extends BaseBean { @Column(name="IN_LOCATE_NO") @ApiParam(value ="默认入库库位") private String inLocateNo; + + @Column(name="PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + public String prodCfgTypeCode; + + @Column(name="PROD_CFG_TYPE_NAME") + @ApiParam("项目名称") + public String prodCfgTypeName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 1c3da68..4dc9db4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : PO条码表 @@ -90,4 +87,32 @@ public class WmsPoSn extends BaseBean { @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; + + @ApiParam(value = "供应商名称") + @Transient + public String vendorNameRdd; + + @ApiParam(value = "项目名称") + @Transient + public String prodCfgTypeName; + + @ApiParam(value = "标签编号") + @Transient + public String labelNo; + + @ApiParam(value = "送货批号") + @Transient + public String lotNo; + + @Transient + @ApiParam(value = "生产日期") + public String dateCode; + + @Transient + @ApiParam(value = "订单号") + public String refSrc; + + @Transient + @ApiParam(value = "条码") + public String sn; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java new file mode 100644 index 0000000..e89962c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 产品项目 + * @Reference : + * @Author : jessica + * @CreateDate : 2019-06-10 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PROD_CFG_TYPE") +@Api("项目信息") +public class WmsProdCfgType extends BaseBean { + + @Column(name="PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + public String prodCfgTypeCode; + + @Column(name="PROD_CFG_TYPE_NAME") + @ApiParam("项目名称") + public String prodCfgTypeName; + +} 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 8f88bd1..78e805f 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 @@ -188,6 +188,14 @@ public class WmsStockSn extends BaseBean { @Transient public Boolean isAdd; + @ApiParam(value = "项目名称") + @Transient + public String prodCfgTypeName; + + @ApiParam(value = "标签编号") + @Transient + public String labelNo; + public WmsStockSn(){} public WmsStockSn(String partNo){