diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 6a11b45..5baff68 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1913,6 +1913,35 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        PO_SN("PO_SN", "PO条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 可选项类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2191,4 +2220,37 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TYPE {
+        BOX(10 , "BOX", "BOX（盒）"),
+        CARTON(20 , "CARTON", "CARTON（箱）"),
+        PALLET(30 , "PALLET", "PALLET（栈板）"),
+        CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+
+        private String code;
+        private String description;
+        int value;
+
+        PACKAGE_TYPE(int value , String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index 1730e20..b99f4ec 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -75,6 +75,12 @@ public class WmsActionResponseBean<Obj> {
     public Boolean isDetailsBtnDisabled = true;
 
     /**
+     * 默认为true，如果这个值为true就禁用按钮否则可用，
+     */
+    @ApiParam(value = "输入框是否禁用")
+    public Boolean isInputBtnDisabled = false;
+
+    /**
      * 与 toSelected 属性配合使用，
      * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
      */
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
index b1ae594..e7610a3 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
@@ -46,7 +46,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PASS_QTY")
     @ApiParam("合格数量")
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 898c921..b474e3b 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
@@ -32,7 +32,6 @@ public class WmsHqlPack {
 
     /**
      * 封装公用查询参数
-     *
      * @param bean   实体对象
      * @param hqlStr 查询语句
      * @return 封装完成的查询语句
@@ -664,7 +663,6 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询打印机队列信息封装类
-     *
      * @param wmsSnPrint 打印机队列信息
      * @return 打印机队列信息
      */
@@ -687,7 +685,6 @@ public class WmsHqlPack {
 
     /**
      * 盘点库位 条件封装
-     *
      * @param wmsCSLocate
      * @return
      */
@@ -704,7 +701,6 @@ public class WmsHqlPack {
 
     /**
      * 盘点物料 条件封装
-     *
      * @param wmsCSPart
      * @return
      */
@@ -722,7 +718,6 @@ public class WmsHqlPack {
 
     /**
      * 盘点存储区 条件封装
-     *
      * @param wmsCSZone
      * @return
      */
@@ -739,7 +734,6 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询责任区分配信息封装类
-     *
      * @param wmsAreaOwner 责任区分配信息
      * @return 责任区分配信息
      */
@@ -766,7 +760,6 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询责任区分配信息封装类
-     *
      * @param wmsTempOrderLock 责任区分配信息
      * @return 责任区分配信息
      */
@@ -885,7 +878,6 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单主表唯一性查询
-     *
      * @param wmsMoveMaster
      * @return
      */
@@ -903,7 +895,6 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单主表分页查询
-     *
      * @param wmsMoveMaster
      * @return
      */
@@ -920,7 +911,6 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单明细表分页查询
-     *
      * @param wmsMoveDetails
      * @return
      */
@@ -951,7 +941,6 @@ public class WmsHqlPack {
 
     /**
      * 内部单据：库存移动单条码信息分页查询
-     *
      * @param wmsMoveSn
      * @return
      */
@@ -1175,7 +1164,6 @@ public class WmsHqlPack {
 
     /**
      * 作业流程分页查询
-     *
      * @return
      */
     public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) {
@@ -1191,7 +1179,6 @@ public class WmsHqlPack {
 
     /**
      * 作业流程明细分页查询
-     *
      * @return
      */
     public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) {
@@ -1241,7 +1228,6 @@ public class WmsHqlPack {
 
     /**
      * 作业记录 查询条件封装
-     *
      * @param wmsActionLog
      * @return
      */
@@ -1270,7 +1256,6 @@ public class WmsHqlPack {
 
     /**
      * 作业记录明细 查询条件封装
-     *
      * @param wmsActionLogDetails
      * @return
      */
@@ -1386,7 +1371,6 @@ public class WmsHqlPack {
 
     /**
      * 根据权限数据拼查询任务详情sql
-     *
      * @param groupDataAuth
      * @return
      */
@@ -1425,7 +1409,6 @@ public class WmsHqlPack {
 
     /**
      * 给定字段动态in sql
-     *
      * @param columnName
      * @param vals
      * @return
@@ -1440,7 +1423,6 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询dataAuth
-     *
      * @param wmsDataAuth
      * @return
      */
@@ -1461,7 +1443,6 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询任务明细信息
-     *
      * @param taskDetails
      * @return
      */
@@ -1509,7 +1490,6 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询系统配置信息
-     *
      * @param wmsConfig
      * @return
      */