From 854cb4e10653c95b8527b5e5e6b7c6298a26445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 Jun 2019 15:23:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E7=89=A9=E6=96=99=E8=A1=A8=E4=B8=AD=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 8 +++++ .../estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java | 41 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java 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/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; + +} From 767758f7a257ab3f378ea34b8c740865c4d7f048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 Jun 2019 18:04:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?PO=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 33 +++++++++++++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++ 2 files changed, 37 insertions(+), 4 deletions(-) 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/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){ From 8c4d74db52fc6f05f742056f8b5334c97e32fc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 10 Jun 2019 18:37:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E6=98=AF=E5=90=A6=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java | 4 ++++ 1 file changed, 4 insertions(+) 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;