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

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

@@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_CFG_CODE")
     @ApiParam("客户配置代码")
     private String customerCfgCode;
+
+    @Column(name = "CUSTOMER_MARK")
+    @ApiParam("客户代号")
+    private String customerMark;
+
+    @Column(name = "CUSTOMER_LATCH")
+    @ApiParam("客户抬头")
+    private String customerLatch;
 }

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

@@ -753,7 +753,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
 
     public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType,
                                  String item, String partNo, String partNameRdd, String unit, Double qty,
-                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime) {
+                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) {
         this.organizeCode = organizeCode;
         this.workOrderCode = workOrderCode;
         this.orderNo = orderNo;
@@ -768,6 +768,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.orderMasterStatus = orderMasterStatus;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.seqNo = seqNo;
     }
 
     public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) {