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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -267,7 +267,7 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){
         DdlPackBean result = new DdlPackBean();
-
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
@@ -462,6 +462,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result);
+        DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result);
 
         getStringBuilderPack(responseCfg, result);
 

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

@@ -477,7 +477,9 @@ public class BlockSoftSwitchEnumUtil {
         STRING(20,"字符串"),
         BOOLEAN(30,"布尔"),
         MAP(40,"字典"),
-        LIST(50,"列表");
+        LIST(50,"列表"),
+        JAVA_OBJECT(60,"Java Object"),
+        JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object");
 
         private int value;
         private String description;
@@ -504,6 +506,21 @@ public class BlockSoftSwitchEnumUtil {
             }
             return tmp;
         }
+
+        public static PARAM_VALUE_TYPE valueOfValueStr(String value){
+            PARAM_VALUE_TYPE result = PARAM_VALUE_TYPE.STRING;
+            try {
+                if(StringUtils.isNotBlank(value)){
+                    for (int i = 0; i < values().length; i++) {
+                        if (values()[i].value == Integer.parseInt(value)) {
+                            return values()[i];
+                        }
+                    }
+                }
+            }catch (Exception e){
+            }
+            return result;
+        }
     }
 
     /**

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

@@ -3579,6 +3579,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static PART_ASSOCIATE_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -3635,8 +3644,8 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-    
-    
+
+
     /**
      * 物流规则 处理模式
      */

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/10/8 下午1:18
+ * @Modify:
+ **/
+@Data
+public class SuitParamModel {
+
+    /* 标签名称 */
+    private String tagName;
+    /* 标签 id 属性值  */
+    private String id;
+    /* 标签 name 属性值 */
+    private String name;
+    /* 标签唯一标识 */
+    private String pathKey;
+    /* 标签内容 */
+    private String value;
+    /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
+    private Integer type;  // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
+
+    /* 标签属性 */
+    private Map<String,String> attr;
+    /* 父节点 */
+    private SuitParamModel parent;
+    /* 标签子集 */
+    private List<SuitParamModel> childList;
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -215,6 +215,10 @@ public class BsSuitCase extends BaseBean {
     private  BsSslKey bsSslKey;
 
     @Transient
+    @ApiParam(value = "适配器套件明细")
+    private String paramXml;
+
+    @Transient
     @ApiParam(value = "适配器参数")
     private List<BsSuitCaseParam> bsSuitCaseParamList;
 

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

@@ -162,6 +162,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("类型名称")
     public String busiTypeName;
 
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java

@@ -42,4 +42,9 @@ public class GenerateSnRule {
      * 库位来源
      */
     private Integer locateSource;
+
+    /**
+     * 是否允许生成二维码
+     */
+    private Integer isSn2d;
 }

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

@@ -2376,9 +2376,9 @@ public class WmsHqlPack {
 
         return result;
     }
-    
-    
-    
+
+
+
     /**
      * 业务：库存查询封装
      *
@@ -2388,24 +2388,44 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
         DdlPackBean result = new DdlPackBean();
 
-     
+
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+
         getStringBuilderPack(wmsRouting, result);
 
         return result;
     }
-    
+
     public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
         DdlPackBean result = new DdlPackBean();
 
-     
+
         DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
 //        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+
         getStringBuilderPack(wmsRoutingRule, result);
 
         return result;
     }
+
+    /**
+     * 物料关系查询条件封装
+     *
+     * @param wmsPartRelation
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartRelation(WmsPartRelation wmsPartRelation) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringRightLikerPack(wmsPartRelation.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getPartName(), "partName", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateCode(), "associateCoded", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateNameAdd(), "associateNameAdd", result);
+        DdlPreparedPack.getNumEqualPack(wmsPartRelation.getAssociateType(), "associateType", result);
+
+        getStringBuilderPack(wmsPartRelation, result);
+
+        return result;
+    }
 }