test merge dev

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

@@ -991,6 +991,51 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * Mes  对象结构是否展示
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CFG_IS_SHOW {
+
+        SHOW(1, "是"),
+        NO_SHOW(2, "否");
+
+        private int value;
+        private String description;
+
+        OBJECT_CFG_IS_SHOW(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * Mes  客户订单来源

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

@@ -718,7 +718,7 @@ public class MesPcnEnumUtil {
         DEFECTED(20, "不合格"),
         SCRAPED(30, "报废"),
         DISMANTLED(40, "已拆解"),
-        PRE_CHECK(50, "待检测");
+        PRE_CHECK(5, "待检测");
 
         private int value;
         private String description;

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

@@ -300,6 +300,63 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS_KANBAN {
+        TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
+        RECEIVING(20, "RECEIVING", "收货中"),
+        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
+        COMPLETED(40, "COMPLETED", "已完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        REC_STATUS_KANBAN(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 订单明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1650,6 +1707,42 @@ public class WmsEnumUtil {
      * 质检业务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        INSPECTION_FREE(10, "免检"),
+        PENDING_QUALITY_INSPECTION(20, "待质检"),
+        QUALITY_INSPECTION_COMPLETED(30, "质检完成");
+
+        private int value;
+        private String description;
+
+        QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 质检业务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_STATUS {
         CREATE(10, "新建"),
         FINISH(20, "处理中"),
@@ -8482,12 +8575,86 @@ public class WmsEnumUtil {
         private String description;
         int value;
 
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
         RFID_OPERATE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
         }
 
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static RFID_OPERATE_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 频次
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FREQUENCY {
+        ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"),
+        STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"),
+        TASK_GENERATE(30, "AMP", "AMP");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FREQUENCY(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
         public int getValue() {
             return value;
         }
@@ -8499,5 +8666,47 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+         public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static FREQUENCY codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

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

@@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     @ApiParam("是否保存 1存 2不存")
     private Integer isSave;
 
+    @Column(name = "SHOW_SEQ")
+    @ApiParam("显示顺序")
+    private Integer showSeq;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam("是否显示")
+    private Integer isShow;
+
     @Transient
     @ApiParam("是否存储名")
     private String isSaveName;

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

@@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
     @ApiParam("是否执行 1=是 2=否")
     private Integer isActive;
 
+    @Column(name = "STEP_DISPLAY_NAME")
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

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

@@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable {
     @ApiParam("工步参数值")
     private String paramValue;
 
+    @Column(name = "STEP_DISPLAY_NAME")
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java

@@ -60,6 +60,9 @@ public class PaintWorkOrderSnModel extends BaseBean {
     @ApiParam("父阶物料名称")
     private String parentPartName;
 
+    @ApiParam("实际包装数量")
+    private Integer compQty;
+
     private List<ProdPackModel> prodPackageList;
 
     private String partNameRdd;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java

@@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("产品条码")
     public String productSn;
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     // 包装主表--包装编号
     @ApiParam("一检箱条码")
     public String packageNo;
@@ -33,6 +36,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("箱条码状态")
     public Integer printStatus;
 
+    @ApiParam("打印状态")
+    public String printStatusDesc;
+
     // 涂装客户标签打印
     @ApiParam("客户标签")
     public String custSn;
@@ -43,7 +49,7 @@ public class ProdPackModel implements Serializable {
 
     // 涂装客户标签打印
     @ApiParam("更新时间")
-    public String modifyDateTime;
+    public String modifyDatetime;
 
     @ApiParam("工单号")
     public String workOrderNo;
@@ -57,18 +63,18 @@ public class ProdPackModel implements Serializable {
     public ProdPackModel() {
     }
 
-    public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
+    public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) {
-        this.productSn = productSn;
+        this.serialNumber = serialNumber;
         this.packageNo = packageNo;
         this.createDatetime = createDatetime;
         this.printStatus = printStatus;
     }
 
-    public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
+    public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) {
-        this.productSn = productSn;
+        this.serialNumber = serialNumber;
         this.packageNo = packageNo;
         this.custSn = custSn;
-        this.processCode = processCode;
+        this.printStatus = printStatus;
-        this.modifyDateTime = modifyDateTime;
+        this.modifyDatetime = modifyDatetime;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java

@@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable {
 
     //getWaitQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) {
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable {
         this.finsihQty = finsihQty;
         this.qty = qty;
         this.orderNo = orderNo;
-        this.pptCode=pptCode;
+        this.pptCode = pptCode;
+        this.produceCategoryCode = produceCategoryCode;
     }
+
     //getAlreadyQueueOrderModelNoSn
-    public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {
         this.id = id;
         this.queueSeq = queueSeq;
@@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.workType = workType;
         this.orderNo = orderNo;
-        this.serialNumber=serialNumber;
+        this.serialNumber = serialNumber;
     }
 
     //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
@@ -251,7 +253,7 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) {
+    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java

@@ -73,6 +73,9 @@ public class StepModel implements Serializable {
     @ApiParam("参数代码")
     private String paramCode;
 
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     /**
      * 工作单元代码
      */
@@ -83,7 +86,7 @@ public class StepModel implements Serializable {
     }
 
     public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
-                     String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) {
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -93,6 +96,7 @@ public class StepModel implements Serializable {
         this.processCode = processCode;
         this.stepSeq = stepSeq;
         this.paramCode = paramCode;
+        this.stepDisplayName = stepDisplayName;
         this.workCellCode = workCellCode;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -954,6 +954,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
         }
+        if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(

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

@@ -16,6 +16,7 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 盘点单冻结信息
@@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
+    /**
+     * 差异类型：10：盘平，20：盘亏，30盘赢
+     */
+    @Transient
+    @ApiParam("差异集合")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
+    public List<Integer> differenceTypeList;
+
     public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;

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

@@ -284,6 +284,13 @@ public class WmsPart extends BaseBean {
     public Integer isRecycle;
 
 
+    @Column(name = "FREQUENCY")
+    @ApiParam(value = "频次", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer frequency;
+
+
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
     }

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

@@ -499,6 +499,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "检测结果ID")
     private Long summaryId;
 
+    @Transient
+    @ApiParam(value = "颜色")
+    private String color;
+
     public WmsStockSn() {
     }
 
@@ -745,7 +749,7 @@ public class WmsStockSn extends BaseBean {
                       String shippingFlag, String workCenterCode, Integer snType,
                       String packagePartNo, Integer useCount, Integer seqNo,
                       String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
-                      String prodCfgTypeName, String custNameRdd, String workOrderCode) {
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) {
         this.organizeCode = organizeCode;
         this.id = id;
         this.sn = sn;
@@ -792,6 +796,7 @@ public class WmsStockSn extends BaseBean {
         this.prodCfgTypeName = prodCfgTypeName;
         this.custNameRdd = custNameRdd;
         this.workOrderCode = workOrderCode;
+        this.color = color;
     }
 
 

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

@@ -100,30 +100,29 @@ public class WmsTractics extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String tracticsEndTime;
 
-    @Column(name="LEV1_STRATEGY")
+    @Column(name="LEV1_STRATEGY_PUT")
     @ApiParam(value ="1级策略上架")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE")
-    private Integer lev1Strategy;
+    private Integer lev1StrategyPut;
 
-//    @Column(name="LEV1_STRATEGY")
+    @Column(name="LEV1_STRATEGY_PICKING")
-    @Transient
     @ApiParam(value ="1级策略拣货")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE")
     private Integer lev1StrategyPicking;
 
-    @Column(name="LEV2_STRATEGY")
+    @Column(name="LEV2_STRATEGY_PUT")
     @ApiParam(value ="2级策略")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO")
-    private Integer lev2Strategy;
+    private Integer lev2StrategyPut;
 
-    @Column(name="LEV3_STRATEGY")
+    @Column(name="LEV3_STRATEGY_PUT")
     @ApiParam(value ="3级策略")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE")
-    private Integer lev3Strategy;
+    private Integer lev3StrategyPut;
 
 //    public String getIev1StrategyPicking (String lev1StrategyPicking) {
 //        return this.lev1Strategy = lev1StrategyPicking;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-07-09 9:50 上午
+ * @Modify:
+ **/
+@Data
+@Api("静态盘点查询输出实体类")
+public class WmsReceiptKanbanDto {
+
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @ApiParam(value = "频次")
+    private String frequency;
+
+    @ApiParam(value = "供应商名称")
+    private String verdorName;
+
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+
+    @ApiParam(value = "道口")
+    private String dock;
+
+    @ApiParam(value = "项目")
+    private String prodCfgTypeCode;
+
+    @ApiParam(value = "窗口时间")
+    private String planDate;
+
+    @ApiParam(value = "开始收货时间")
+    private String earliestReceTime;
+
+    @ApiParam(value = "结束收货时间")
+    private String latestReceTime;
+
+    @ApiParam(value = "收货状态")
+    private String receStatus;
+
+    @ApiParam(value = "质检状态")
+    private String qcStatus;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+}

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

@@ -1757,13 +1757,13 @@ public class WmsHqlPack {
      * @param groupDataAuth
      * @return
      */
-    public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
+    /*public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
 
-        /*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
+        *//*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
 
             String key = map.getKey();
             List<WmsDataAuth> valueList = map.getValue();
@@ -1786,22 +1786,24 @@ public class WmsHqlPack {
                     packMutilConditionHql(mapList, "PART_NO", "partNo", result);
                 }
             }
-        }*/
+        }*//*
 
         //转换封装后的hql
-        /*String packedHql = result.getPackedHql();
+        *//*String packedHql = result.getPackedHql();
         if(packedHql.startsWith(" or")){
             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
             System.out.println(packedHql);
         }
 
-        result.setWhereAppend(packedHql);*/
+        result.setWhereAppend(packedHql);*//*
         // 通用数据拼接
         WmsDataAuth wmsDataAuth = new WmsDataAuth();
         wmsDataAuth.setOrganizeCode(organizeCode);
         getStringBuilderPack(wmsDataAuth, result);
         return result;
-    }
+    }*/
+
+
 
     /**
      * 把 List<Map> 中的一组数据重新封装到List<String>中
@@ -1846,7 +1848,7 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
+    /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
         DdlPackBean packBean = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
@@ -1866,13 +1868,13 @@ public class WmsHqlPack {
             }
         }
         //转换封装后的hql
-        /*String packedHql = packBean.getPackedHql();
+        *//*String packedHql = packBean.getPackedHql();
         if(packedHql.startsWith(" or")){
             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
             System.out.println(packedHql);
         }
 
-        packBean.setWhereAppend(packedHql);*/
+        packBean.setWhereAppend(packedHql);*//*
         DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
@@ -1881,7 +1883,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
         return packBean;
-    }
+    }*/
 
     /**
      * 根据条件查询dataAuth