新增合同明细接口

sd-business/src/main/java/com/sd/business/controller/purchase/PurchaseBomController.java

@@ -1,7 +1,9 @@
 package com.sd.business.controller.purchase;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.purchase.dto.PurchaseBomDetailsSelectDto;
 import com.sd.business.entity.purchase.dto.PurchaseBomSelectDto;
+import com.sd.business.entity.purchase.vo.PurchaseBomDetailsVo;
 import com.sd.business.entity.purchase.vo.PurchaseBomSelectVo;
 import com.sd.business.service.purchase.PurchaseBomService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,4 +29,12 @@ public class PurchaseBomController {
         return purchaseBomService.getPage(dto);
     }
 
+    /**
+     * 采购合同 bom分页
+     */
+    @PostMapping("/purchaseDetailsPage")
+    public Page<PurchaseBomDetailsVo> purchaseDetailsPage(@RequestBody PurchaseBomDetailsSelectDto dto) {
+        return purchaseBomService.getDetailsPage(dto);
+    }
+
 }

sd-business/src/main/java/com/sd/business/mapper/purchase/PurchaseBomMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.purchase.po.PurchaseBom;
-import com.sd.business.entity.purchase.vo.PurchaseBomInfoVo;
-import com.sd.business.entity.purchase.vo.PurchaseBomSelectVo;
-import com.sd.business.entity.purchase.vo.PurchaseBomVo;
-import com.sd.business.entity.purchase.vo.PurchaseInTransitBomVo;
+import com.sd.business.entity.purchase.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -63,4 +60,12 @@ public interface PurchaseBomMapper extends BaseMapper<PurchaseBom> {
      * @return
      */
     Date getPurchaseBomDeliveryDate(@Param("ew") IWrapper<PurchaseBom> wrapper);
+
+    /**
+     * 采购合同 bom分页
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Page<PurchaseBomDetailsVo> getDetailsPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PurchaseBomDetailsVo> wrapper);
 }

sd-business/src/main/java/com/sd/business/service/purchase/PurchaseBomService.java

@@ -3,13 +3,11 @@ package com.sd.business.service.purchase;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.purchase.dto.PurchaseBoardSelectDto;
+import com.sd.business.entity.purchase.dto.PurchaseBomDetailsSelectDto;
 import com.sd.business.entity.purchase.dto.PurchaseBomSelectDto;
 import com.sd.business.entity.purchase.dto.PurchaseInTransitBomSelectDto;
 import com.sd.business.entity.purchase.po.PurchaseBom;
-import com.sd.business.entity.purchase.vo.PurchaseBomBoardVo;
-import com.sd.business.entity.purchase.vo.PurchaseBomSelectVo;
-import com.sd.business.entity.purchase.vo.PurchaseBomVo;
-import com.sd.business.entity.purchase.vo.PurchaseInTransitBomVo;
+import com.sd.business.entity.purchase.vo.*;
 
 
 /**
@@ -50,4 +48,11 @@ public interface PurchaseBomService extends BaseService<PurchaseBom> {
      * @return
      */
     Page<PurchaseBomBoardVo> getPurchaseBoardPage(PurchaseBoardSelectDto dto);
+
+    /**
+     * 获取采购bom明细分页
+     * @param dto
+     * @return
+     */
+    Page<PurchaseBomDetailsVo> getDetailsPage(PurchaseBomDetailsSelectDto dto);
 }

sd-business/src/main/java/com/sd/business/service/purchase/impl/PurchaseBomServiceImpl.java

@@ -14,6 +14,7 @@ import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.bom.vo.BomSpecVo;
 import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.entity.purchase.dto.PurchaseBoardSelectDto;
+import com.sd.business.entity.purchase.dto.PurchaseBomDetailsSelectDto;
 import com.sd.business.entity.purchase.dto.PurchaseBomSelectDto;
 import com.sd.business.entity.purchase.dto.PurchaseInTransitBomSelectDto;
 import com.sd.business.entity.purchase.po.Purchase;
@@ -231,4 +232,14 @@ public class PurchaseBomServiceImpl extends ServiceImpl<PurchaseBomMapper, Purch
         page.setRecords(list);
         return page;
     }
+
+    @Override
+    public Page<PurchaseBomDetailsVo> getDetailsPage(PurchaseBomDetailsSelectDto dto) {
+        IWrapper<PurchaseBomDetailsVo> wrapper = IWrapper.getWrapper();;
+        wrapper.like("p", Purchase::getCode, dto.getPurchaseCode());
+        wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
+        wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
+        wrapper.orderByDesc("p", Purchase::getId);
+        return this.baseMapper.getDetailsPage(dto.getPage(), wrapper);
+    }
 }

sd-business/src/main/resources/mapper/purchase/PurchaseBomMapper.xml

@@ -108,4 +108,24 @@
             ${ew.customSqlSegment}
     </select>
 
+
+    <select id="getDetailsPage" resultType="com.sd.business.entity.purchase.vo.PurchaseBomDetailsVo">
+        select
+            p.code purchaseCode,
+            bs.code bomSpecCode,
+            bs.name bomSpecName,
+            bs.length,
+            bs.width,
+            bs.height,
+            pb.purchase_quantity,
+            pb.arrival_quantity,
+            (pb.purchase_quantity - pb.arrival_quantity) inTransitQuantity,
+            pb.return_quantity
+        from
+            purchase_bom pb
+            LEFT JOIN purchase p on pb.purchase_id = p.id
+            LEFT JOIN bom_spec bs on pb.bom_spec_id = bs.id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>