Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -69,10 +69,6 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String vendorEmail;
 
-    @ApiParam(value = "标题")
-    @Transient
-    public String title;
-
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -147,6 +147,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("批次")
+    public String lotNo;
     @Transient
     @ApiParam("实际批次")
     private String actualLot;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -175,6 +175,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号")
     public String partNo;
 
+    @ApiParam(value = "标题")
+    @Transient
+    public String title;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java

@@ -42,6 +42,10 @@ public class WmsVendorPart extends BaseBean {
     @ApiParam(value = "供应商物料号")
     private String vendorPartNo;
 
+    @Column(name = "MAX_AMOUNT")
+    @ApiParam(value = "供应商月提供最大数量")
+    private Double maxAmount;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;