diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
index 15051d5..19bbed9 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
@@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean {
     @ApiParam("产线")
     private String workCenterCode;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
     @Column(name = "PARENT_PART_NO")
     @ApiParam("产品物料编码")
     private String parentPartNo;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
index 4c34404..ca904d5 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
@@ -99,8 +99,17 @@ public class MesPackage extends BaseBean {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
 
+    @Transient
+    @ApiParam("包装层级名称")
+    private String packLevelName;
 
+    @Transient
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
 
     public MesPackage() {
     }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
index d3864d0..883c12a 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PACKAGE_DETAIL")
-@Api("包装规格")
+@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 
     @Column(name = "PACKAGE_NO")
@@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "PART_NO")
-    @ApiParam("产品条码")
+    @ApiParam("物料编号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam("产品条码")
+    @ApiParam("物料名称")
     private String partNameRdd;
 
     @Column(name = "PACKAGE_NO2")
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
index 9a979a9..abc6f92 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
@@ -58,10 +58,28 @@ public class ProdPackageModel {
     @ApiParam("包装规格")
     private String packSpec;
 
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
     @ApiParam("工单集合")
     private List<MesWorkOrder> workOrderList;
 
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @ApiParam("包装层级名称")
+    private String packLevelName;
+
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index f6a4b95..36b3bf6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -95,4 +95,20 @@ public class MesPackage extends BaseBean {
     @ApiParam("封箱状态")
     private String sealStatus;
 
+    @Transient
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @Transient
+    @ApiParam("包装层级名称")
+    private String packLevelName;
+
+    @Transient
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
index a6594ad..95483c1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@@ -23,8 +23,8 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
-@Api("包装规格")
+@Table(name = "MES_PACKAGE_DETAIL")
+@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 
     @Column(name = "PACKAGE_NO")
@@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "PART_NO")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index 654dbd2..6342635 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
@@ -175,6 +175,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("年度")
     public String year;
 
+    @Column(name = "IS_CONSIGNMENT")
+    @ApiParam("是否寄售")
+    public Integer isConsignment = 2;
+
+    @Column(name = "PRIOR_RC")
+    @ApiParam("是否预收货")
+    public Integer priorRC = 2;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;
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 f98e0a0..773ae39 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
@@ -329,4 +329,37 @@ public class WmsStockSn extends BaseBean {
         this.lotNo = lotNo;
         this.qty = qty;
     }
+
+    public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
+                      String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
+                      String qualityDate, String custNo, String lotCheckRule, String sn2d,
+                      String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) {
+        this.sn = sn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.locateNo = locateNo;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+        this.vendorNo = vendorNo;
+        this.vendorNameRdd = vendorNameRdd;
+        this.qualityDate = qualityDate;
+        this.qualityDay = qualityDay;
+        this.custNo = custNo;
+        this.lotCheckRule = lotCheckRule;
+        this.sn2d = sn2d;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+    }
 }
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 41a0b9e..75b3400 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
@@ -208,6 +208,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
+        DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
 
         //  查询计划时间在指定范围的单号，查询这些单号的数据
         if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {