diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index ba4164f..0d04f5e 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -487,15 +487,19 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
 
         // 根据value返回枚举类型,主要在switch中使用
         public static ORGANIZATION_INIT_DATA getByValue(String value) {
-            for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) {
-                if (mesInsertExcel.getValue().equals(value)) {
-                    return mesInsertExcel;
+            for (ORGANIZATION_INIT_DATA organizationInitData : values()) {
+                if (organizationInitData.getValue().equals(value)) {
+                    return organizationInitData;
                 }
             }
             return null;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
index d7a6052..6eea3a5 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@@ -155,18 +155,24 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getStartTimeStart(),
-                mesWorkOrder.getStartTimeEnd(),
-                "startTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getEndTimeStart(),
-                mesWorkOrder.getEndTimeEnd(),
-                "endTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getCreateDateTimeStart(),
-                mesWorkOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
+        if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getStartTimeStart(),
+                    mesWorkOrder.getStartTimeEnd(),
+                    "startTime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getEndTimeStart(),
+                    mesWorkOrder.getEndTimeEnd(),
+                    "endTime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getCreateDateTimeStart(),
+                    mesWorkOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
@@ -290,32 +296,35 @@ public class MesHqlPack {
      */
     public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
         DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getCreateDateTimeStart(),
-                mesProduceSn.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getOutWorkCenterTimeStart(),
-                mesProduceSn.getOutWorkCenterTimeEnd(),
-                "outWorkCenterTime", packBean, true);
-
+        if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesProduceSn.getCreateDateTimeStart(),
+                    mesProduceSn.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesProduceSn.getOutWorkCenterTimeStart(),
+                    mesProduceSn.getOutWorkCenterTimeEnd(),
+                    "outWorkCenterTime", packBean, true);
+        }
         return packBean;
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 6b938ee..b9eb3ec 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -84,18 +84,24 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesPlanOrder.getStartTimeStart(),
-                mesPlanOrder.getStartTimeEnd(),
-                "startTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesPlanOrder.getEndTimeStart(),
-                mesPlanOrder.getEndTimeEnd(),
-                "endTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesPlanOrder.getCreateDateTimeStart(),
-                mesPlanOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
+        if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesPlanOrder.getStartTimeStart(),
+                    mesPlanOrder.getStartTimeEnd(),
+                    "startTime", packBean, true);
+        }
+        if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesPlanOrder.getEndTimeStart(),
+                    mesPlanOrder.getEndTimeEnd(),
+                    "endTime", packBean, true);
+        }
+        if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesPlanOrder.getCreateDateTimeStart(),
+                    mesPlanOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
 
         // 排序
         DdlPreparedPack.getOrderDefault(mesPlanOrder);
@@ -180,18 +186,24 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getStartTimeStart(),
-                mesWorkOrder.getStartTimeEnd(),
-                "startTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getEndTimeStart(),
-                mesWorkOrder.getEndTimeEnd(),
-                "endTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getCreateDateTimeStart(),
-                mesWorkOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
+        if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getStartTimeStart(),
+                    mesWorkOrder.getStartTimeEnd(),
+                    "startTime", packBean, true);
+        }
+        if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getEndTimeStart(),
+                    mesWorkOrder.getEndTimeEnd(),
+                    "endTime", packBean, true);
+        }
+        if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getCreateDateTimeStart(),
+                    mesWorkOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
@@ -1713,14 +1725,18 @@ public class MesHqlPack {
         if (mesCustOrder.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
         }
-        DdlPreparedPack.timeBuilder(
-                mesCustOrder.getOrderTimeStart(),
-                mesCustOrder.getOrderTimeEnd(),
-                "orderDate", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesCustOrder.getCreateDateTimeStart(),
-                mesCustOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
+        if (!StringUtils.isEmpty(mesCustOrder.getOrderTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getOrderTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesCustOrder.getOrderTimeStart(),
+                    mesCustOrder.getOrderTimeEnd(),
+                    "orderDate", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesCustOrder.getCreateDateTimeStart(),
+                    mesCustOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         return packBean;
     }
 
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
index dc572b6..9330c69 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
@@ -21,4 +21,7 @@ public class WmsCSOrderMasterModel implements Serializable {
 
     @ApiParam("工厂代码")
     public String  organizeCode;
+
+    @ApiParam("确认框")
+    public  Boolean confirm;
 }