以大代小出库插入记录

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -173,4 +174,10 @@ public class LeaseApplyDetails implements Serializable {
     private String maStatus;
     @ApiModelProperty(value="预领数量-已领数量的差值")
     private Integer nums;
+
+    @ApiModelProperty(value="租赁单价")
+    private BigDecimal leasePrice;
+
+    @ApiModelProperty(value="代替规格id")
+    private Integer replaceTypeId;
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TreeNode.java

@@ -36,6 +36,8 @@ public class TreeNode {
 
     private String manageType;
 
+    private String isReplace;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children = new ArrayList<>();
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml

@@ -120,11 +120,11 @@
     insert into lease_apply_details (parennt_id, type_id, pre_num,
       al_num, `status`, create_by,
       create_time, update_by, update_time,
-      remark, company_id)
+      remark, company_id,type_name,model_name,lease_price,replace_type_id)
     values (#{parenntId,jdbcType=INTEGER}, #{typeId,jdbcType=INTEGER}, #{preNum,jdbcType=FLOAT},
       #{alNum,jdbcType=FLOAT}, #{status,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
       NOW(), #{updateBy,jdbcType=VARCHAR}, NOW(),
-      #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER})
+      #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},#{typeName},#{typeModelName},#{leasePrice},#{replaceTypeId})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true">
     <!--@mbg.generated-->

sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml

@@ -242,6 +242,18 @@
            <if test="carCode!= null">
                car_code,
            </if>
+           <if test="typeName!= null">
+               type_name,
+           </if>
+           <if test="modelName!= null">
+               model_name,
+           </if>
+           <if test="leasePrice!= null">
+               lease_price,
+           </if>
+           <if test="replaceTypeId!= null">
+               replace_type_id,
+           </if>
            create_time,
            update_time
        </trim>
@@ -276,6 +288,18 @@
            <if test="carCode!= null">
                #{carCode},
            </if>
+           <if test="typeName!= null">
+               #{typeName},
+           </if>
+           <if test="model_name!= null">
+               #{model_name},
+           </if>
+           <if test="leasePrice!= null">
+               #{leasePrice},
+           </if>
+           <if test="replaceTypeId!= null">
+               #{replaceTypeId},
+           </if>
            NOW(),
            NOW()
        </trim>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml

@@ -111,7 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             IFNULL(mt.num, 0)
             END as num,
             mt.model_code AS modelCode,
-            mt.manage_type AS manageType
+            mt.manage_type AS manageType,
+            mt.is_replace as isReplace
         FROM ma_type mt
         left join (SELECT mt.type_id,
                     mt2.type_name AS             typeName,