Merge branch 'dev' into dev2.0

src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java

@@ -1,6 +1,5 @@
 package com.glxp.api.req.inv;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -64,6 +63,8 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest {
 
     private Integer repairType;
 
+    private Integer type;
+
 
 
 

src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml

@@ -71,6 +71,9 @@
       <if test="level != null">
         AND t.level = #{level}
       </if>
+      <if test="type != null">
+        AND t.type = #{type}
+      </if>
       <if test="repairType != null">
         AND t.repairType = #{repairType}
       </if>

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -121,6 +121,7 @@
         SELECT pur_apply_detail.*,
                pur_apply.billNo,
                basic_products.ggxh spec,
+               basic_products.nameCode,
                basic_products.measname,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -139,6 +139,7 @@
     <select id="selectDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
         SELECT pur_order_detail.*,
                pur_order.billNo,
+               basic_products.nameCode,
                basic_products.ggxh spec,
                basic_products.measname,
                basic_products.manufactory,

src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml

@@ -137,6 +137,7 @@
         pur_plan.billNo,
         basic_products.ggxh spec,
         basic_products.measname,
+        basic_products.nameCode,
         basic_products.manufactory,
         basic_products.ylqxzcrbarmc,
         basic_corp.`name` supName
@@ -174,4 +175,4 @@
               and pur_plan.status=3
         </where>
     </select>
-</mapper>
+</mapper>