【坤泰-采购收货】包装关系

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :容器类型
@@ -30,7 +31,6 @@ import javax.persistence.Table;
 @Api("物料包装关系")
 public class WmsPartPackage extends BaseBean {
     private static final long serialVersionUID = 4849044986767609345L;
-    @Column(name = "PART_NO",unique = true)
     @ApiParam(value = "物料编码")
     private String partNo;
 
@@ -48,15 +48,15 @@ public class WmsPartPackage extends BaseBean {
 
     @Column(name = "IS_DEFAULT")
     @ApiParam(value = "是否默认包规")
-    private String isDefault;
+    private Integer isDefault;
 
     @Column(name = "IS_MIXED")
     @ApiParam(value = "是否混包")
-    private String isMixed;
+    private Integer isMixed;
 
     @Column(name = "IS_PRINT")
     @ApiParam(value = "是否打印包装清单")
-    private String isPrint;
+    private Integer isPrint;
 
     @Column(name = "TEMPLATE_NO")
     @ApiParam(value = "包装清单模板")
@@ -65,4 +65,8 @@ public class WmsPartPackage extends BaseBean {
     @Column(name = "POCKET_TYPE")
     @ApiParam(value = "容器类型")
     private String pocketType;
+
+    @ApiParam(value = "包装规格名称")
+    @Transient
+    private String specName;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java

@@ -22,6 +22,8 @@ public class PartPackagDto{
     @ApiParam(value = "物料编码")
     private String partNo;
     @ApiParam(value = "工厂代码")
+    private String organizeCode;
+    @ApiParam(value = "包装关系列表")
     private List<WmsPartPackage> partPackages;
 
 }