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

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 盘点调差范围信息
@@ -39,4 +40,24 @@ public class WmsCSAdjustRange extends BaseBean {
     @Column(name="IS_ADJUST")
     @ApiParam(value = "调整标识", example = "1")
     public Integer isAdjust;
+
+    @Transient
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Transient
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Transient
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Transient
+    @ApiParam("单位")
+    public String unit;
 }

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

@@ -38,6 +38,6 @@ public class WmsUnit extends BaseBean {
 
     @Column(name = "UNIT_PRECISION")
     @ApiParam(value = "单位精度")
-    private String unitPrecision;
+    private Integer unitPrecision;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1435,7 +1435,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
 //        String data = String.join(",", roleIds);
         DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
-        getStringBuilderPack(new WmsDataAuth(), result);
+        getStringBuilderPack(dataAuth, result);
         return result;
     }