厂家规格型号添加及机具仓储状态查询修改

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java

@@ -203,6 +203,12 @@ public class MaType extends BaseEntity {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<MaType> children = new ArrayList<>();
 
+    /**
+     * 厂家规格型号
+     */
+    @ApiModelProperty(value = "厂家规格型号")
+    private String facModel;
+
     
 
     public Long getTypeId() {
@@ -550,4 +556,12 @@ public class MaType extends BaseEntity {
     public void setFinalPrice(String finalPrice) {
         this.finalPrice = finalPrice;
     }
+
+    public String getFacModel() {
+        return facModel;
+    }
+
+    public void setFacModel(String facModel) {
+        this.facModel = facModel;
+    }
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml

@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPlan != null">is_plan,</if>
             <if test="isAncuo != null">is_ancuo,</if>
             <if test="remark != null">remark,</if>
+            <if test="facModel != null">fac_model,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">#{typeName},</if>
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPlan != null">#{isPlan},</if>
             <if test="isAncuo != null">#{isAncuo},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="facModel != null">#{facModel},</if>
         </trim>
     </insert>
 
@@ -154,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isAncuo != null">is_ancuo = #{isAncuo},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="facModel != null">fac_model = #{facModel},</if>
         </trim>
         where type_id = #{typeId}
     </update>
@@ -273,13 +276,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="selectMaTypeByTypeId" resultMap="MaTypeResult">
-        select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.manage_type,
+        select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id,m.unit_name, m.manage_type,
                m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
-               su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName, mpi.prop_name,
+               su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName,mpi.prop_id as propId, mpi.prop_name as propName,
                m.del_flag, m.create_by, m.create_time,
-               m.remark, m.company_id
+               m.remark, m.company_id,m.fac_model as facModel
         from ma_type m
                      left join ma_prop_set mps on m.type_id = mps.type_id
                      left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
@@ -334,7 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
         mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
         su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
-        m.remark, m.company_id
+        m.remark, m.company_id,m.fac_model as facModel
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id
         left join ma_prop_info mpi on mps.prop_id = mpi.prop_id

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

@@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                             GROUP BY mt.type_id) AS subquery4 ON subquery4.type_id = mt.type_id
                  LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
         WHERE mt.`level` = 4
+        and mt.del_flag = '0'
         <if test="typeName != null and typeName != ''">
             and mt2.type_name like concat('%',#{typeName},'%')
         </if>