From 6b9c7b3ced7545d011570072ddd885abcce8f864 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 23 Oct 2019 15:28:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90VDA=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=E3=80=91=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 12 ++++++++---- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index a1832ae..85d93c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -107,6 +107,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("是否范围内") public Integer isScope; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @@ -163,9 +167,9 @@ public class WmsCSFactTrans extends BaseBean { this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; - + } - - - + + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 5addb05..bcbb261 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -101,6 +101,10 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description") public Integer transStatus; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam(value = "实盘数量", example = "1") public Double factQty; From d5a45176d07855ed5fad0f433fc5fb22d18db211 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 17:24:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?LAC=20=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E6=8C=87=E4=BB=A4=E9=9B=86=E7=B1=BB=E5=9E=8B=20?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java index 431e878..c08c908 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="LAC_INSTRUCTION_TYPE") +@Table(name="LAC_COMMAND_STACK_TYPE") @Api(value="指令集类型",description = "指令集类型") public class LacCommandStackType extends BaseBean { diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java index 688f8ec..32a5f3c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -28,15 +28,15 @@ import javax.persistence.Table; @Api(value="任务类型",description = "任务类型") public class LacTaskType extends BaseBean { - @Column(name="TASK_NAME") + @Column(name="TYPE_NAME") @ApiParam(value ="类型名称") - private String taskName; + private String typeName; - @Column(name="TASK_REF_NUM") + @Column(name="TYPE_REF_NUM") @ApiParam(value ="适配器使用数量") - private Integer taskRefNum; + private Integer typeRefNum; - @Column(name="TASK_DESCRIPTION") + @Column(name="TYPE_DESCRIPTION") @ApiParam(value ="类型描述") - private String taskDescription; + private String typeDescription; }