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

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java

@@ -99,8 +99,17 @@ public class MesPackage extends BaseBean {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
 
+    @Transient
+    @ApiParam("包装层级名称")
+    private String packLevelName;
 
+    @Transient
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
 
     public MesPackage() {
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java

@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PACKAGE_DETAIL")
-@Api("包装规格")
+@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 
     @Column(name = "PACKAGE_NO")
@@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "PART_NO")
-    @ApiParam("产品条码")
+    @ApiParam("物料编号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam("产品条码")
+    @ApiParam("物料名称")
     private String partNameRdd;
 
     @Column(name = "PACKAGE_NO2")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java

@@ -58,10 +58,28 @@ public class ProdPackageModel {
     @ApiParam("包装规格")
     private String packSpec;
 
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
     @ApiParam("工单集合")
     private List<MesWorkOrder> workOrderList;
 
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @ApiParam("包装层级名称")
+    private String packLevelName;
+
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -95,4 +95,20 @@ public class MesPackage extends BaseBean {
     @ApiParam("封箱状态")
     private String sealStatus;
 
+    @Transient
+    @ApiParam("打印状态文字")
+    private String printStrStatus;
+
+    @Transient
+    @ApiParam("客户代码名称")
+    private String custCodeName;
+
+    @Transient
+    @ApiParam("包装层级名称")
+    private String packLevelName;
+
+    @Transient
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java

@@ -23,8 +23,8 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
-@Api("包装规格")
+@Table(name = "MES_PACKAGE_DETAIL")
+@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 
     @Column(name = "PACKAGE_NO")
@@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean {
     private String packageNo;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
     @Column(name = "PART_NO")

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

@@ -175,6 +175,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("年度")
     public String year;
 
+    @Column(name = "IS_CONSIGNMENT")
+    @ApiParam("是否寄售")
+    public Integer isConsignment = 2;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;