Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -641,7 +641,8 @@ public class WmsEnumUtil {
 		VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
 		VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
         KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
-		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理");
+		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货");
 
 
         private int value;

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

@@ -32,7 +32,6 @@ import javax.persistence.Transient;
 @Api("容器类型")
 public class WmsContainerType extends BaseBean {
     private static final long serialVersionUID = 4849044986767609347L;
-    @Column(name = "CT_CODE",unique = true)
     @ApiParam(value = "容器类型代码")
     private String ctCode;