Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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 {
 

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;
 }

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;
-      
+
     }
-    
-    
-    
+
+
+
 }

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;