解决冲突

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/MesEnumUtil.java

@@ -1243,11 +1243,12 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
 
-        PERSON(10, "person", "人"),
+        PERSON(10, "person", "人员"),
-        EQUIPMENT(20, "equipment", "机"),
+        EQUIPMENT(20, "equipment", "设备"),
-        MATERIAL(30, "material", "料"),
+        MATERIAL(30, "material", "物料"),
-        ROUTE(40, "route", "法"),
+        ROUTE(40, "route", "工艺"),
-        ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
+        ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
+        MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
 
         private int value;
         private String code;

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

@@ -403,11 +403,13 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
 
-        PERSON(10, "people", "人"),
+        PERSON(10, "people", "人员"),
         EQUIPMENT(20, "equipments", "设备"),
         MATERIAL(30, "materials", "物料"),
         ROUTE(40, "routes", "工艺"),
-        ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
+        ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
+        MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
+
 
         private int value;
         private String code;

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;
+        }
     }
 
     /**

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java

@@ -39,7 +39,5 @@ public class MesProdRouteCfg extends BaseBean {
     @ApiParam("流程代码")
     private String routeCode;
 
-    @Column(name = "ROUTE_TYPE")
+
-    @ApiParam("流程类型 10-扫描类型 20-监控类型")
-    private Integer routeType;
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java

@@ -35,12 +35,13 @@ public class MesRoute extends BaseBean {
     @ApiParam("流程名称")
     private String routeName;
 
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
+
     @Column(name = "POSITION")
     @ApiParam("GOJS位置")
     private String position;
 
 
-    @Column(name = "ROUTE_TYPE")
-    @ApiParam("流程类型 10-扫描类型 20-监控类型")
-    private Integer routeType;
 }

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/bean/WmsRouting.java

@@ -53,10 +53,18 @@ public class WmsRouting extends BaseBean {
 
     @Column(name = "FOR_PRODUCT")
     @ApiParam(value = "适用产品")
-    private Integer forProduct;
     
      
+    private Integer forProduct;
+
+	@Transient
+	@ApiParam(value = "补货规则列表")
+	List<WmsRoutingRule> replenishList;
+	@Transient
+	@ApiParam(value = "推动规则列表补")
+	List<WmsRoutingRule> promotionList;
 
-    public WmsRouting(){}
+	public WmsRouting() {
+	}
 
 }

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

@@ -2391,7 +2391,8 @@ public class WmsHqlPack {
      
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+       // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
+        DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
         getStringBuilderPack(wmsRouting, result);
 
         return result;
@@ -2402,14 +2403,36 @@ public class WmsHqlPack {
 
      
         DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
-//        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+        DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result);
   
+        DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result);
+        DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", 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;
+    }
+
+    /**
      * 接口映射分页查询条件
      *
      * @param wmsPrinterConfigure