1.添加采购计划和采购单明细接口

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

@@ -1,29 +1,28 @@
 package com.glxp.api.controller.purchase;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.RepeatSubmit;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
-import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.entity.purchase.PurApplyEntity;
-import com.glxp.api.constant.ConstantType;
+import com.glxp.api.entity.purchase.PurOrderDetailEntity;
-import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.purchase.PurOrderEntity;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.purchase.PurPlanDetailEntity;
-import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.req.purchase.PostPurOrderRequest;
-import com.glxp.api.entity.purchase.*;
+import com.glxp.api.req.purchase.PurOrderDetailRequest;
-import com.glxp.api.req.purchase.*;
+import com.glxp.api.req.purchase.PurOrderRequest;
+import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 import com.glxp.api.res.purchase.PurOrderResponse;
-import com.glxp.api.res.purchase.PurPlanResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
-import com.glxp.api.service.purchase.*;
+import com.glxp.api.service.purchase.PurOrderDetailService;
-import com.glxp.api.util.CustomUtil;
+import com.glxp.api.service.purchase.PurOrderService;
+import com.glxp.api.service.purchase.PurPlanDetailService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
 import lombok.RequiredArgsConstructor;
@@ -33,8 +32,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotEmpty;
-import java.math.BigDecimal;
+import java.util.ArrayList;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -238,6 +239,19 @@ public class PurOrderController {
 
     }
 
+    /**
+     * 查询采购订单明细列表
+     *
+     * @param purOrderDetailRequest
+     * @return
+     */
+    @GetMapping("/purchase/order/list/getDetailList")
+    public BaseResponse getDetailList(PurOrderDetailRequest purOrderDetailRequest) {
+        List<PurOrderDetailResponse> list = purOrderDetailService.getDetailList(purOrderDetailRequest);
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
     /**
      * 添加申购单到采购单里面
      */

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

@@ -1,6 +1,5 @@
 package com.glxp.api.controller.purchase;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -11,7 +10,6 @@ import com.glxp.api.constant.Constant;
 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.BasicCorpEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
@@ -21,13 +19,10 @@ import com.glxp.api.req.purchase.PurApplyDetailRequest;
 import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.req.purchase.PurPlanRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 import com.glxp.api.res.purchase.PurPlanResponse;
 import com.glxp.api.service.auth.CustomerService;
-import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.basic.IBasicBusTypeChangeService;
-import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.purchase.*;
@@ -189,7 +184,7 @@ public class PurPlanController {
         purPlanEntity.setAuditUser(userId + "");
         purPlanEntity.setAuditUser(userId + "");
         purPlanEntity.setStatus(postPurPlanRequest.getEditStatus());
-       purPlanService.update(purPlanEntity);
+        purPlanService.update(purPlanEntity);
         if (purPlanEntity.getStatus() == 3) {
             purChangeService.purPlanChange(purPlanEntity);
 //            generateDocument(purPlanEntity);
@@ -388,6 +383,19 @@ public class PurPlanController {
 
     }
 
+    /**
+     * 查询采购计划详情列表
+     *
+     * @param purPlanDetailRequest
+     * @return
+     */
+    @GetMapping("/purchase/plan/list/getDetailList")
+    public BaseResponse getDetailList(PurPlanDetailRequest purPlanDetailRequest) {
+        List<PurOrderDetailResponse> list = purPlanDetailService.getDetailList(purPlanDetailRequest);
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
     /**
      * 添加申购单到采购单里面
      */

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

@@ -3,9 +3,7 @@ package com.glxp.api.dao.purchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
-import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
-import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +24,6 @@ public interface PurOrderDetailDao extends BaseMapper<PurOrderDetailEntity> {
     boolean insertPurOrderDetailEntity(@Param("datas") List<PurOrderDetailEntity> purOrderDetailEntityList);
 
     BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
+
+    List<PurOrderDetailResponse> selectDetailList(PurOrderDetailRequest purOrderDetailRequest);
 }

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

@@ -2,8 +2,6 @@ package com.glxp.api.dao.purchase;
 
 
 import com.glxp.api.entity.basic.BasicProductsEntity;
-import com.glxp.api.entity.basic.ProductInfoEntity;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
@@ -30,4 +28,5 @@ public interface PurPlanDetailDao {
 
     BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
 
+    List<PurOrderDetailResponse> seletDetaiList(PurPlanDetailRequest purPlanDetailRequest);
 }

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

@@ -46,5 +46,34 @@ public class PurOrderDetailRequest extends ListPageRequest {
     @NotBlank(message = "供应商ID不能为空")
     private String supId;
 
+    /**
+     * 采购计划单号
+     */
+    private String billNo;
+
+    /**
+     * 规格型号
+     */
+    private String spec;
+
+    /**
+     * 开始时间
+     */
+    private String startDate;
+
+    /**
+     * 结束时间
+     */
+    private String endDate;
+
+    /**
+     * 注册/凭证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
 
 }

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

@@ -46,5 +46,34 @@ public class PurPlanDetailRequest extends ListPageRequest {
     @NotBlank(message = "供应商ID不能为空")
     private String supId;
 
+    /**
+     * 采购计划单号
+     */
+    private String billNo;
+
+    /**
+     * 规格型号
+     */
+    private String spec;
+
+    /**
+     * 开始时间
+     */
+    private String startDate;
+
+    /**
+     * 结束时间
+     */
+    private String endDate;
+
+    /**
+     * 注册/凭证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
 
 }

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

@@ -1,12 +1,9 @@
 package com.glxp.api.service.purchase;
 
 
-
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
-import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
-import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 
 import java.util.List;
@@ -34,4 +31,5 @@ public interface PurOrderDetailService {
 
     BasicProductsEntity selectIoOrderDetailBiz(long id);
 
+    List<PurOrderDetailResponse> getDetailList(PurOrderDetailRequest purOrderDetailRequest);
 }

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

@@ -1,13 +1,10 @@
 package com.glxp.api.service.purchase;
 
 
-
 import com.glxp.api.entity.basic.BasicProductsEntity;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -34,4 +31,5 @@ public interface PurPlanDetailService {
 
     BasicProductsEntity selectIoOrderDetailBiz(long id);
 
+    List<PurOrderDetailResponse> getDetailList(PurPlanDetailRequest purPlanDetailRequest);
 }

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

@@ -2,15 +2,11 @@ package com.glxp.api.service.purchase.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.PurOrderDetailDao;
-import com.glxp.api.dao.purchase.PurPlanDetailDao;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
-import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
-import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
 import com.glxp.api.service.purchase.PurOrderDetailService;
-import com.glxp.api.service.purchase.PurPlanDetailService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -92,4 +88,15 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService {
     public BasicProductsEntity selectIoOrderDetailBiz(long id) {
         return purOrderDetailDao.selectIoOrderDetailBiz(id);
     }
+
+    @Override
+    public List<PurOrderDetailResponse> getDetailList(PurOrderDetailRequest purOrderDetailRequest) {
+        if (null == purOrderDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != purOrderDetailRequest.getPage() && null != purOrderDetailRequest.getLimit()) {
+            PageHelper.offsetPage((purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(), purOrderDetailRequest.getLimit());
+        }
+        return purOrderDetailDao.selectDetailList(purOrderDetailRequest);
+    }
 }

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

@@ -3,7 +3,6 @@ package com.glxp.api.service.purchase.impl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.PurPlanDetailDao;
 import com.glxp.api.entity.basic.BasicProductsEntity;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.res.purchase.PurOrderDetailResponse;
@@ -89,4 +88,16 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService {
     public BasicProductsEntity selectIoOrderDetailBiz(long id) {
         return purPlanDetailDao.selectIoOrderDetailBiz(id);
     }
+
+    @Override
+    public List<PurOrderDetailResponse> getDetailList(PurPlanDetailRequest purPlanDetailRequest) {
+        if (null == purPlanDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != purPlanDetailRequest.getPage() && null != purPlanDetailRequest.getLimit()) {
+            PageHelper.offsetPage((purPlanDetailRequest.getPage() - 1) * purPlanDetailRequest.getLimit(), purPlanDetailRequest.getLimit());
+        }
+        return purPlanDetailDao.seletDetaiList(purPlanDetailRequest);
+    }
+
 }

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

@@ -130,4 +130,46 @@
     GROUP BY uuid
   </select>
 
+  <select id="selectDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
+    SELECT
+    pur_order_detail.*,
+    pur_order.billNo,
+    basic_products.ggxh spec,
+    basic_products.measname,
+    basic_products.manufactory,
+    basic_products.ylqxzcrbarmc,
+    basic_corp.`name` supName
+    FROM
+    pur_order_detail
+    INNER JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id
+    INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+    INNER JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId
+    left join pur_order on pur_order.id = pur_order_detail.orderIdFk
+    <where>
+      <if test="billNo != null and billNo != ''">
+        AND pur_order.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_order_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_order.createTime,'%Y-%m-%d')>= #{startDate}]]>
+      </if>
+      <if test="endDate != null and endDate !=''">
+        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
+      </if>
+    </where>
+    </select>
 </mapper>

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

@@ -130,4 +130,46 @@
         GROUP BY uuid
     </select>
 
+    <select id="seletDetaiList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
+        SELECT
+        pur_plan_detail.*,
+        pur_plan.billNo,
+        basic_products.ggxh spec,
+        basic_products.measname,
+        basic_products.manufactory,
+        basic_products.ylqxzcrbarmc,
+        basic_corp.`name` supName
+        FROM
+        pur_plan_detail
+        INNER JOIN basic_udirel ON pur_plan_detail.productId = basic_udirel.id
+        INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+        INNER JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
+        left join pur_plan on pur_plan.id = pur_plan_detail.orderIdFk
+        <where>
+            <if test="billNo != null and billNo != ''">
+                AND pur_plan.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_plan_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_plan.createTime,'%Y-%m-%d')>= #{startDate}]]>
+            </if>
+            <if test="endDate != null and endDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_plan.createTime,'%Y-%m-%d') <= #{endDate}]]>
+            </if>
+        </where>
+    </select>
 </mapper>