Merge remote-tracking branch 'origin/ext-dev' into ext-dev

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0.0.1</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -73,4 +73,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @Transient
     @ApiParam("物料名称")
     private String partName;
+
+    @Transient
+    @ApiParam("收货日期")
+    private String receiptDate;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2695,6 +2695,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
+        DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java

@@ -4,15 +4,11 @@ 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.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description :
@@ -43,4 +39,12 @@ public class SwebVendorRel extends BaseBean {
     @ApiParam("供应商代码")
     @Column(name = "VENDOR_NO")
     private String vendorNo;
+
+    @ApiParam("物料代码")
+    @Column(name = "PART_NO")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    @Column(name = "PART_NAME_ADD")
+    private String partNameAdd;
 }

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

@@ -259,6 +259,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("计划交货时间")
     private String planPlanDateTime;
 
+    @Transient
+    @ApiParam(value = "收货日期时间")
+    public String receiveDateTime;
+
 
 
 
@@ -305,12 +309,13 @@ public class WmsPOMaster extends BaseBean {
     }
 
     public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
-                       String receiveTime, String vendorNo, String vendorName, String organizeCode) {
+                       String receiveTime,String receiveDate, String vendorNo, String vendorName, String organizeCode) {
         this.orderNo = orderNo;
         this.reason = reason;
         this.planDate = planDate;
         this.planTime = planTime;
         this.receiveTime = receiveTime;
+        this.receiveDate= receiveDate;
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
         this.organizeCode = organizeCode;