diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 5ad3da6..a3f367b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/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;
     }
 
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 4a0f756..d132855 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1756,13 +1756,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();
@@ -1785,22 +1785,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>中
@@ -1845,7 +1847,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
@@ -1865,13 +1867,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);
@@ -1880,7 +1882,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
         return packBean;
-    }
+    }*/
 
     /**
      * 根据条件查询dataAuth