Merge branch 'test' into ext-dev

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

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

@@ -2390,7 +2390,8 @@ public class WmsEnumUtil {
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
         CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
         INITIALIZE_SN("INITIALIZE_SN", "库存初始化"),
-        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号");
+        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"),
+        PRINT_PACKAGE_NO_SERIAN("PRINT_PACKAGE_NO_SERIAN", "包装编号序列化");
 
         private String code;
         private String description;

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

@@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -13,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -118,4 +118,8 @@ public class WmsBomTotal extends BaseBean {
     @Transient
     @ApiParam(value = "状态")
     private Integer status;
+
+    @Transient
+    @ApiParam(value = "异常信息")
+    private String errorMsg;
 }

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

@@ -567,6 +567,9 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("泊位")
     private String zdoc;
     
+    @ApiParam("打印类型")
+    private Integer printType;
+
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
         this.sn = sn;