diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
index 1fa585d..68a98b6 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
@@ -68,6 +68,12 @@ public class LeaseOutDetails implements Serializable {
@ApiModelProperty(value = "规格名称")
private String typeName;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "以大代小规格id")
+ private Integer replaceTypeId;
+
/**
* maId
*/
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
index fd9187b..fcd349a 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
@@ -34,6 +34,15 @@ public class MaType extends BaseEntity {
@Excel(name = "名称")
private String typeName;
+ /** 规格名称 */
+ @ApiModelProperty(value = "规格名称")
+ @Excel(name = "名称")
+ private String modelName;
+
+ /** 替换类型ID */
+ @ApiModelProperty(value = "以大代小类型ID")
+ private Long replaceTypeId;
+
/** 类型ID */
@ApiModelProperty(value = "类型ID,用作组织树筛选")
private Long id;
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SelectVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SelectVo.java
index 903add8..77850ec 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SelectVo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SelectVo.java
@@ -2,6 +2,8 @@ package com.bonus.sgzb.material.domain;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* @author 10488
*/
@@ -15,4 +17,7 @@ public class SelectVo {
private String name;
private String unit;
+
+ /** 单价*/
+ private BigDecimal leasePrice;
}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
index 608e286..212162c 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
@@ -291,8 +291,8 @@
#{typeName},
-
- #{model_name},
+
+ #{modelName},
#{leasePrice},
@@ -410,8 +410,8 @@
- insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time,ck_remark)
- values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now(),#{record.remark});
+ insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price, type_name,model_name,replace_type_id, is_slt,company_id,lease_type,create_time,ck_remark)
+ values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},#{ma.typeName},#{ma.modelName},,#{ma.replaceTypeId},'0',#{record.companyId},#{record.leaseType},now(),#{record.remark});