字段调整

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContractLift.java

@@ -103,9 +103,9 @@ public class TqContractLift extends BaseEntity
     @Excel(name = "付款方式", dictType="contract_payment_method",i18nCode = "lift.paymentMethod", sort= 23)
     private String paymentMethod;
 
-    /** 预计排产日期 */
+    /** 预计排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计排产日期", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "lift.expectedProductionScheduleDate", sort= 24)
+    @Excel(name = "预计排产交期", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "lift.expectedProductionScheduleDate", sort= 24)
     private Date expectedProductionScheduleDate;
 
     /** 希望排产日期 */
@@ -113,9 +113,9 @@ public class TqContractLift extends BaseEntity
     @Excel(name = "希望排产日期", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "lift.hopeToScheduleProductionDate", sort= 25)
     private Date hopeToScheduleProductionDate;
 
-    /** 实际排产日期 */
+    /** 排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "实际排产日期", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "lift.actualProductionScheduleDate", sort= 26)
+    @Excel(name = "排产交期", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "lift.actualProductionScheduleDate", sort= 26)
     private Date actualProductionScheduleDate;
 
     /** 排产日期 */
@@ -141,8 +141,8 @@ public class TqContractLift extends BaseEntity
     @Excel(name = "港口",i18nCode = "lift.port", sort= 31)
     private String port;
 
-    /** 生产订单状态 */
-    @Excel(name = "生产订单状态",i18nCode = "lift.productionOrderStatus", dictType="production_order_status",sort= 32)
+    /** 项目状态 */
+    @Excel(name = "项目状态",i18nCode = "lift.productionOrderStatus", dictType="production_order_status",sort= 32)
     private String productionOrderStatus;
 
     /** 评审折扣 */

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContractLiftHistory.java

@@ -130,9 +130,9 @@ public class TqContractLiftHistory extends BaseEntity
     @Excel(name = "报价折扣")
     private String quotationDiscount;
 
-    /** 预计排产日期 */
+    /** 预计排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计排产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "预计排产交期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expectedProductionScheduleDate;
 
     /** 希望排产日期 */
@@ -140,9 +140,9 @@ public class TqContractLiftHistory extends BaseEntity
     @Excel(name = "希望排产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date hopeToScheduleProductionDate;
 
-    /** 实际排产日期 */
+    /** 排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "实际排产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "排产交期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date actualProductionScheduleDate;
 
     /** 排产日期 */
@@ -176,8 +176,8 @@ public class TqContractLiftHistory extends BaseEntity
     @Excel(name = "港口")
     private String port;
 
-    /** 生产订单状态 */
-    @Excel(name = "生产订单状态")
+    /** 项目状态 */
+    @Excel(name = "项目状态")
     private String productionOrderStatus;
 
     /** 评审折扣 */

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/bo/contract/TqContractLift4OrderNoBo.java

@@ -134,9 +134,9 @@ public class TqContractLift4OrderNoBo extends BaseEntity
     @Excel(name = "报价折扣")
     private String quotationDiscount;
 
-    /** 预计排产日期 */
+    /** 预计排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计排产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "预计排产交期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expectedProductionScheduleDate;
 
     /** 希望排产日期 */
@@ -144,9 +144,9 @@ public class TqContractLift4OrderNoBo extends BaseEntity
     @Excel(name = "希望排产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date hopeToScheduleProductionDate;
 
-    /** 实际排产日期 */
+    /** 排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "实际排产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "排产交期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date actualProductionScheduleDate;
 
     /** 排产日期 */
@@ -180,8 +180,8 @@ public class TqContractLift4OrderNoBo extends BaseEntity
     @Excel(name = "港口")
     private String port;
 
-    /** 生产订单状态 */
-    @Excel(name = "生产订单状态")
+    /** 项目状态 */
+    @Excel(name = "项目状态")
     private String productionOrderStatus;
 
     /** 评审折扣 */

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/bo/contract/TqContractLiftBo.java

@@ -130,9 +130,9 @@ public class TqContractLiftBo extends BaseEntity
     @Excel(name = "报价折扣")
     private String quotationDiscount;
 
-    /** 预计排产日期 */
+    /** 预计排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计排产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "预计排产交期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date[] expectedProductionScheduleDate;
 
     /** 希望排产日期 */
@@ -140,9 +140,9 @@ public class TqContractLiftBo extends BaseEntity
     @Excel(name = "希望排产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date[] hopeToScheduleProductionDate;
 
-    /** 实际排产日期 */
+    /** 排产交期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "实际排产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "排产交期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date[] actualProductionScheduleDate;
 
     /** 排产日期 */
@@ -176,8 +176,8 @@ public class TqContractLiftBo extends BaseEntity
     @Excel(name = "港口")
     private String port;
 
-    /** 生产订单状态 */
-    @Excel(name = "生产订单状态")
+    /** 项目状态 */
+    @Excel(name = "项目状态")
     private List<Long> productionOrderStatus;
 
     /** 评审折扣 */

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/impl/TqContractLiftServiceImpl.java

@@ -108,7 +108,7 @@ public class TqContractLiftServiceImpl implements ITqContractLiftService
      **/
     @Override
     public int updateTqContractLiftBatch(List<TqContractLift> tqContractLiftList){
-        //根据实际排产日期查询汇率
+        //根据排产交期查询汇率
         List<ContractCurrencyTime> scheduleList = tqContractLiftList.stream().filter(tqContractLift -> tqContractLift.getActualProductionScheduleDate() != null) // Filter out null signing dates
                 .map(tqContractLift -> new ContractCurrencyTime(
                         Long.parseLong(tqContractLift.getCurrencyId()), tqContractLift.getActualProductionScheduleDate()

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/impl/TqContractServiceImpl.java

@@ -338,7 +338,7 @@ public class TqContractServiceImpl implements ITqContractService
       * @Date 9:13 2024/8/21
       **/
     private List<TqContractLift>  attachTqContractLift(TqContractDto tqContractDto, List<TqContractLift>  tqContractLiftList){
-        //根据实际排产日期查询汇率
+        //根据排产交期查询汇率
         List<ContractCurrencyTime> scheduleList = tqContractLiftList.stream().filter(tqContractLift -> tqContractLift.getActualProductionScheduleDate() != null) // Filter out null signing dates
                 .map(tqContractLift -> new ContractCurrencyTime(
                         Long.parseLong(tqContractLift.getCurrencyId()), tqContractLift.getActualProductionScheduleDate()

ruoyi-ui-vue2/src/views/contract/lift/index.vue

@@ -95,7 +95,7 @@
         <!--终端客户18  v-hasRole="['system_manager', 'sales_director']" -->
         <Column :label="$t('contract.endCustomers')" prop="endCustomersName" show-search :searchParams="queryParams" v-if="checkPermi(['user:contract:lift:endCustomers'])"/>
 
-        <!--预计排产日期19-->
+        <!--预计排产交期19-->
         <Column :label="$t('lift.expectedProductionScheduleDate')" :searchParams="queryParams" :showSearch="true" v-if="checkPermi(['user:contract:lift:expectedProductionScheduleDate'])"
                 sortable="custom" prop="expectedProductionScheduleDate" search-type="dateRange"  width="250"/>
         <!--评审折扣20-->
@@ -230,7 +230,7 @@
         <!--希望排产日期-->
         <Column :label="$t('lift.hopeToScheduleProductionDate')" :searchParams="queryParams" :showSearch="true" prop="hopeToScheduleProductionDate" v-if="checkPermi(['user:contract:lift:hopeToScheduleProductionDate'])"
                 sortable="custom" search-type="dateRange" width="250"/>
-        <!--实际排产日期-->
+        <!--排产交期-->
         <Column :label="$t('lift.actualProductionScheduleDate')" :searchParams="queryParams" :showSearch="true" prop="actualProductionScheduleDate" v-if="checkPermi(['user:contract:lift:actualProductionScheduleDate'])"
                 sortable="custom" search-type="dateRange" width="250"/>
 
@@ -239,7 +239,7 @@
                 search-type="dateRange" width="250" sortable="custom"/>
 
 
-        <!--生产订单状态-->
+        <!--项目状态-->
         <Column :label="$t('lift.productionOrderStatus')" :searchParams="queryParams" :showSearch="true" prop="productionOrderStatus" searchType="select" v-if="checkPermi(['user:contract:lift:productionOrderStatus'])"
                 selectMore   :searchDict="dict.type.production_order_status"/>
 
@@ -320,11 +320,11 @@
           </Column >
           <!--报价折扣14-->
           <InputNumberColumn  :label="$t('lift.quotationDiscount')"  prop="quotationDiscount" :step="0.0001"  :precision="4"  :min="0" :max="100" v-if="checkPermi(['user:contract:lift:quotationDiscountEdit'])"/>
-          <!--预计排产日期19-->
+          <!--预计排产交期19-->
           <DatePickSelectColumn  :label="$t('lift.expectedProductionScheduleDate')"  v-if="checkPermi(['user:contract:lift:expectedProductionScheduleDateEdit'])" prop="expectedProductionScheduleDate"  width="250"></DatePickSelectColumn>
           <!--希望排产日期-->
           <DatePickSelectColumn  :label="$t('lift.hopeToScheduleProductionDate')"  prop="hopeToScheduleProductionDate" v-if="checkPermi(['user:contract:lift:hopeToScheduleProductionDateEdit'])" width="250"></DatePickSelectColumn>
-          <!--实际排产日期-->
+          <!--排产交期-->
           <DatePickSelectColumn  :label="$t('lift.actualProductionScheduleDate')"  prop="actualProductionScheduleDate" v-if="checkPermi(['user:contract:lift:actualProductionScheduleDateEdit'])" width="250"></DatePickSelectColumn>
           <!--排产日期21-->
           <DatePickSelectColumn  :label="$t('lift.productionScheduleDate')"  prop="productionScheduleDate" v-if="checkPermi(['user:contract:lift:productionScheduleDateEdit'])" width="250"></DatePickSelectColumn>
@@ -336,7 +336,7 @@
           <DatePickSelectColumn  :label="$t('lift.actualDeliveryDate')"  prop="actualDeliveryDate" v-if="checkPermi(['user:contract:lift:actualDeliveryDateEdit'])" width="250"></DatePickSelectColumn>
           <!--港口-->
           <InputColumn  :label="$t('lift.port')"  prop="port"  v-if="checkPermi(['user:contract:lift:portEdit'])"/>
-          <!--生产订单状态-->
+          <!--项目状态-->
           <DictSelectColumn  :label="$t('lift.productionOrderStatus')"  prop="productionOrderStatus" searchType="select" :searchDict="dict.type.production_order_status" v-if="checkPermi(['user:contract:lift:productionOrderStatusEdit'])"/>
           <!--评审折扣20-->
           <InputNumberColumn  :label="$t('lift.reviewDiscount')"  prop="reviewDiscount" v-if="checkPermi(['user:contract:lift:reviewDiscountEdit'])" :step="0.0001"  :precision="4"  :min="0" :max="100"/>