From 2f2c843006db7eab87a8ef535af31de89205ca14 Mon Sep 17 00:00:00 2001
From: 1111 <changjiang.gao@estsh.com>
Date: Mon, 11 Nov 2019 20:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0-=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E3=80=91=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java   | 12 ++++++++----
 .../java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java     |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java
index 2b66b42..e7dc3ca 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java
index 812dda1..c94219e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java
+++ b/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;
 
 }