1.添加申购单据明细查询接口

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -12,11 +12,8 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
-import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
-import com.glxp.api.entity.inout.PurReceiveDetailEntity;
-import com.glxp.api.entity.inout.PurReceiveEntity;
 import com.glxp.api.entity.purchase.*;
 import com.glxp.api.req.purchase.PostPurApplyRequest;
 import com.glxp.api.req.purchase.PurApplyDetailRequest;
@@ -25,7 +22,7 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.purchase.PurApplyResponse;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 import com.glxp.api.service.auth.CustomerService;
-import com.glxp.api.service.basic.*;
+import com.glxp.api.service.basic.IBasicBusTypeChangeService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.purchase.*;
@@ -429,6 +426,19 @@ public class PurApplyController {
 
     }
 
+    /**
+     * 查询申购单明细列表
+     *
+     * @param purApplyDetailRequest
+     * @return
+     */
+    @GetMapping("/purchase/apply/getDetailList")
+    public BaseResponse getDetailList(PurApplyDetailRequest purApplyDetailRequest) {
+        List<PurOrderDetailResponse> list = purApplyDetailService.getDetailList(purApplyDetailRequest);
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
     /**
      * 新增申购单
      */

src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java

@@ -1,9 +1,7 @@
 package com.glxp.api.dao.purchase;
 
 
-
 import com.glxp.api.entity.purchase.PurApplyDetailEntity;
-import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.req.purchase.PurApplyDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 import org.apache.ibatis.annotations.Mapper;
@@ -28,4 +26,6 @@ public interface PurApplyDetailDao {
 
     boolean insertPurApplyDetailEntity(@Param("datas") List<PurApplyDetailEntity> purApplyDetailEntityList);
 
+    List<PurOrderDetailResponse> selectPurApplyDetailList(PurApplyDetailRequest purApplyDetailRequest);
+
 }

src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java

@@ -3,9 +3,6 @@ package com.glxp.api.req.purchase;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * @author anthony.ywj
  * @date 2022-10-12
@@ -16,20 +13,58 @@ public class PurApplyDetailRequest extends ListPageRequest {
 
     private Long id;
 
-
+    /**
+     * 关联申购单主键
+     */
     private String orderIdFk;
 
+    /**
+     * 申购单号
+     */
+    private String billNo;
 
+    /**
+     * 物资编号
+     */
     private Long productId;
 
-
+    /**
+     * 物资名称
+     */
     private String productName;
 
-
+    /**
+     * 申购数量
+     */
     private Long count;
 
-
+    /**
+     * 供应商ID
+     */
     private String supId;
 
+    /**
+     * 规格型号
+     */
+    private String spec;
 
+    /**
+     * 注册证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 开始时间
+     */
+    private String startDate;
+
+    /**
+     * 截止席间
+     */
+    private String endDate;
 }

src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java

@@ -47,4 +47,6 @@ public class PurOrderDetailResponse {
     private String supId;
 
     private String supName;
+
+    private String billNo;
 }

src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java

@@ -1,9 +1,7 @@
 package com.glxp.api.service.purchase;
 
 
-
 import com.glxp.api.entity.purchase.PurApplyDetailEntity;
-import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.req.purchase.PurApplyDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 
@@ -30,4 +28,11 @@ public interface PurApplyDetailService {
 
     boolean insertPurApplyDetailEntity(List<PurApplyDetailEntity> purApplyDetailEntityList);
 
+    /**
+     * 查询申购单据明细列表
+     *
+     * @param purApplyDetailRequest
+     * @return
+     */
+    List<PurOrderDetailResponse> getDetailList(PurApplyDetailRequest purApplyDetailRequest);
 }

src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java

@@ -87,5 +87,16 @@ public class PurApplyDetailImplService implements PurApplyDetailService {
         return purApplyDetailDao.insertPurApplyDetailEntity(purApplyDetailEntityList);
     }
 
+    @Override
+    public List<PurOrderDetailResponse> getDetailList(PurApplyDetailRequest purApplyDetailRequest) {
+        if (null == purApplyDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null == purApplyDetailRequest.getPage() && null != purApplyDetailRequest.getLimit()) {
+            PageHelper.offsetPage((purApplyDetailRequest.getPage() - 1) * purApplyDetailRequest.getLimit(), purApplyDetailRequest.getLimit());
+        }
+        return purApplyDetailDao.selectPurApplyDetailList(purApplyDetailRequest);
+    }
+
 
 }

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

@@ -113,4 +113,47 @@
         </foreach>
     </insert>
 
+    <select id="selectPurApplyDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
+        SELECT
+        pur_apply_detail.*,
+        pur_apply.billNo,
+        basic_products.ggxh spec,
+        basic_products.measname,
+        basic_products.manufactory,
+        basic_products.ylqxzcrbarmc,
+        basic_corp.`name` supName
+        FROM
+        pur_apply_detail
+        INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
+        INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+        INNER JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
+        left join pur_apply on pur_apply.id = pur_apply_detail.orderIdFk
+        <where>
+            <if test="billNo != null and billNo != ''">
+                AND pur_apply.billNo like concat('%', #{billNo}, '%')
+            </if>
+            <if test="productId != null">
+                AND productId like concat('%', #{productId}, '%')
+            </if>
+            <if test="productName != null and productName != ''">
+                AND productName like concat('%', #{productName}, '%')
+            </if>
+            <if test="spec != null and spec != ''">
+                AND basic_products.ggxh like concat('%', #{spec}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND pur_apply_detail.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="manufactory != null and manufactory != ''">
+                AND basic_products.manufactory like concat('%', #{manufactory}, '%')
+            </if>
+            <if test="startDate != null and startDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d')>= #{startDate}]]>
+            </if>
+            <if test="endDate != null and endDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d') <= #{endDate}]]>
+            </if>
+        </where>
+        GROUP BY basic_products.uuid
+    </select>
 </mapper>