update

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java

@@ -1,19 +1,14 @@
 package com.xjrsoft.module.dayPlan.vo;
 
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import com.xjrsoft.module.system.vo.LngFileUploadVo;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 /**
 * @title: 表单出参
 * @Author 管理员
@@ -64,21 +59,21 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("客户编码")
     private String cuCode;
     
-    
+    private String cuName;
     /**
     * 交易主体编码(天然气公司/惠贸)
     */
     @ApiModelProperty("交易主体编码(天然气公司/惠贸)")
     private Long comId;
     
-    
+    private String comName;
     /**
     * 合同-主信息主键（销售）(lng_contract)
     */
     @ApiModelProperty("合同-主信息主键（销售）(lng_contract)")
     private Long ksId;
     
-    
+    private String ksName;
     /**
     * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)
     */
@@ -99,6 +94,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("供应商")
     private String suCode;
     
+    private String suName;
     
     /**
     * 采购合同-主信息主键
@@ -106,7 +102,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("采购合同-主信息主键")
     private Long kpId;
     
-    
+    private String kpName;
     /**
     * 合同-国内采购-管道气-上载点主键
     */
@@ -120,7 +116,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("上载点")
     private String pointUpCode;
     
-    
+    private String pointUpName;
     /**
     * 自主托运(Y-是，N-否)
     */
@@ -169,6 +165,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("客户确认人")
     private Long cfmCuUserId;
     
+    private String cfmCuUserName;
     
     /**
     * 客户确认时间
@@ -183,7 +180,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("内部确认人")
     private Long cfmEmpId;
     
-    
+    private String cfmEmpName;
     /**
     * 内部确认时间
     */

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java

@@ -246,7 +246,7 @@ public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseM
      * lngFileUpload
      */
     @ApiModelProperty("lngFileUpload子表")
-    private List<LngFileUploadVo> fileList;
+    private List<LngFileUploadVo> lngFileUploadList;
 
     /**
      * 拒绝原因