Merge remote-tracking branch 'origin/dev' into dev

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

@@ -21,85 +21,85 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_LOCATE")
+@Table(name = "WMS_LOCATE")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="库位表",description = "库位表")
+@Api(value = "库位表", description = "库位表")
 public class WmsLocate extends BaseBean {
 
-    @Column(name="LOCATE_NO")
+    @Column(name = "LOCATE_NO")
-    @ApiParam(value ="库位代码")
+    @ApiParam(value = "库位代码")
     private String locateNo;
 
-    @Column(name="LOCATE_NAME")
+    @Column(name = "LOCATE_NAME")
-    @ApiParam(value ="库位名称")
+    @ApiParam(value = "库位名称")
     private String locateName;
 
     /**
      * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位
      */
-    @Column(name="LOCATE_TYPE")
+    @Column(name = "LOCATE_TYPE")
-    @ApiParam(value ="库位类型")
+    @ApiParam(value = "库位类型")
     private Integer locateType;
 
-    @Column(name="WH_NO")
+    @Column(name = "WH_NO")
-    @ApiParam(value ="仓库代码")
+    @ApiParam(value = "仓库代码")
     private String whNo;
 
-    @Column(name="ZONE_NO")
+    @Column(name = "ZONE_NO")
-    @ApiParam(value ="存储区代码")
+    @ApiParam(value = "存储区代码")
     private String zoneNo;
 
-    @Column(name="X")
+    @Column(name = "X")
-    @ApiParam(value ="X", example = "-1")
+    @ApiParam(value = "X", example = "-1")
     private Integer x;
 
-    @Column(name="Y")
+    @Column(name = "Y")
-    @ApiParam(value ="Y", example = "-1")
+    @ApiParam(value = "Y", example = "-1")
     private Integer y;
 
-    @Column(name="Z")
+    @Column(name = "Z")
-    @ApiParam(value ="Z", example = "-1")
+    @ApiParam(value = "Z", example = "-1")
     private Integer z;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
-    @ApiParam(value ="序号", example = "-1")
+    @ApiParam(value = "序号", example = "-1")
     private Integer seq;
 
-    @Column(name="STATUS")
+    @Column(name = "STATUS")
-    @ApiParam(value ="库位状态", example = "-1")
+    @ApiParam(value = "库位状态", example = "-1")
     private Integer status;
 
-    @Column(name="MAX_PACKAGE_QTY")
+    @Column(name = "MAX_PACKAGE_QTY")
-    @ApiParam(value ="最大包装数量", example = "-1")
+    @ApiParam(value = "最大包装数量", example = "-1")
     private Integer maxPackageQty;
 
-    @Column(name="MAX_PART_QTY")
+    @Column(name = "MAX_PART_QTY")
-    @ApiParam(value ="最大零件数量", example = "-1")
+    @ApiParam(value = "最大零件数量", example = "-1")
-    private Integer maxPartQty;
+    private Double maxPartQty;
 
-    @Column(name="STOCK_UNIT")
+    @Column(name = "STOCK_UNIT")
-    @ApiParam(value ="存放单位")
+    @ApiParam(value = "存放单位")
     private String stockUnit;
 
-    @Column(name="LINE_CODE")
+    @Column(name = "LINE_CODE")
-    @ApiParam(value ="生产线")
+    @ApiParam(value = "生产线")
     private String lineCode;
 
-    @Column(name="BOX_QTY")
+    @Column(name = "BOX_QTY")
-    @ApiParam(value ="箱数", example = "-1")
+    @ApiParam(value = "箱数", example = "-1")
     private Integer boxQty;
 
-    @Column(name="PART_QTY")
+    @Column(name = "PART_QTY")
-    @ApiParam(value ="零件数", example = "-1")
+    @ApiParam(value = "零件数", example = "-1")
     private Double partQty;
 
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty;
     }
 
-    public Integer getMaxPartQty() {
+    public Double getMaxPartQty() {
         return this.maxPartQty == null ? 0 : this.maxPartQty;
     }