Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil {
         LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
 //        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
@@ -1320,7 +1321,7 @@ public class BlockFormEnumUtil {
         public static PROPERTY_TYPE valueOfClassPath(String classPath) {
             PROPERTY_TYPE tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].classPath == classPath) {
+                if (values()[i].classPath.equals(classPath)) {
                     tmp = values()[i];
                 }
             }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -24,6 +24,9 @@ public class SessionUser implements Serializable {
     @ApiParam("用户ID")
     private Long userId;
 
+    @ApiParam("设备ID")
+    private String deviceId;
+
     @ApiParam("用户工号")
     private String userCode;
 

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

@@ -36,7 +36,7 @@ public class WmsPackSn extends BaseBean {
     @ApiParam(value = "物料编码")
     private String partNo;
 
-    @Column(name = "PART_NAME")
+    @Column(name = "PART_NAME_ADD")
     @ApiParam(value = "物料名称")
     private String partNameAdd;
 

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

@@ -24,4 +24,6 @@ public class IQ {
 
     public  String ACTHMS="";
 
+    public  String WERKS="";
+
 }

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

@@ -24,4 +24,6 @@ public class OQ {
 
     public  String ACTHMS="";
 
+    public  String WERKS="";
+
 }

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

@@ -122,6 +122,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
@@ -875,7 +876,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
 
@@ -2172,6 +2173,7 @@ public class WmsHqlPack {
         // 物料编码支持多选
         DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
         // 存储区
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
 
@@ -2185,6 +2187,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
         DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
 
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
+
         //数量大于0
         DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);