diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
index 633a068..b4fff69 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("操作类型")
     private Integer operateType;
 
+    @Transient
+    @ApiParam("下线时间开始")
+    private String outWorkCenterTimeStart;
+
+    @Transient
+    @ApiParam("下线时间截止")
+    private String outWorkCenterTimeEnd;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -178,9 +186,12 @@ public class MesProduceSn extends BaseBean implements Serializable {
                 ", workOrderNo='" + workOrderNo + '\'' +
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
-                ", snType='" + snType + '\'' +
+                ", snType=" + snType +
                 ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
+                ", operateType=" + operateType +
+                ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
+                ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
                 '}';
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java
similarity index 82%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java
rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java
index 874ed08..7a2c56b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java
@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model;
+package cn.estsh.i3plus.pojo.mes.pcn.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java
similarity index 92%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java
rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java
index bb2620a..5f65795 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model;
+package cn.estsh.i3plus.pojo.mes.pcn.model;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java
similarity index 93%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java
rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java
index 42dbbea..d3e47e4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java
@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model;
+package cn.estsh.i3plus.pojo.mes.pcn.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
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 82ef884..032919c 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
@@ -280,4 +280,74 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 按条件分页查询产品条码补打印数据
+     * @param mesProduceSn
+     * @return
+     */
+    public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
+        DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
+        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
+        }
+
+        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
+        }
+
+        if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+        }
+
+        if (!org.springframework.util.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);
+
+        return packBean;
+    }
+
+    /**
+     * 按条件分页查询包装条码补打印数据
+     * @param mesPackage
+     * @return
+     */
+    public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
+
+        DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
+        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        }
+
+        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackLevel())) {
+            DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
+        }
+
+        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackageNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        }
+
+        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesPackage.getCreateDateTimeStart(),
+                mesPackage.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        return packBean;
+    }
+
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index 7e72209..9a81548 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -129,15 +129,6 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
-    @Transient
-    @ApiParam("下线时间开始")
-    private String outWorkCenterTimeStart;
-
-    @Transient
-    @ApiParam("下线时间截止")
-    private String outWorkCenterTimeEnd;
-
-
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -184,11 +175,10 @@ public class MesProduceSn extends BaseBean {
                 ", workOrderNo='" + workOrderNo + '\'' +
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
-                ", snType='" + snType + '\'' +
+                ", snType=" + snType +
                 ", tray='" + tray + '\'' +
+                ", operateType=" + operateType +
                 ", resultMsg='" + resultMsg + '\'' +
-                ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
-                ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
                 '}';
     }
 }
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 d39ad15..70087fd 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
@@ -1923,73 +1923,4 @@ public class MesHqlPack {
         return packBean;
     }
 
-    /**
-     * 按条件分页查询产品条码补打印数据
-     * @param mesProduceSn
-     * @return
-     */
-    public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
-        DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode());
-        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
-        }
-
-        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
-        }
-
-        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
-        }
-
-        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);
-
-        return packBean;
-    }
-
-    /**
-     * 按条件分页查询包装条码补打印数据
-     * @param mesPackage
-     * @return
-     */
-    public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
-
-        DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode());
-        if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
-        }
-
-        if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
-            DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
-        }
-
-        if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
-            DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
-        }
-
-        if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
-        }
-
-        // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesPackage.getCreateDateTimeStart(),
-                mesPackage.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
-
-        return packBean;
-    }
-
 }