申购详情删除在途数量

sd-business/src/main/java/com/sd/business/controller/apply/ApplyBuyController.java

@@ -2,7 +2,7 @@ package com.sd.business.controller.apply;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.flow.enums.FlowStatusEnum;
-import com.sd.business.entity.apply.dto.ApplyBuyDetailSelectDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.sd.business.entity.apply.dto.ApplyBuyDto;
 import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
 import com.sd.business.entity.apply.vo.ApplyBuyVo;
@@ -42,8 +42,8 @@ public class ApplyBuyController {
      * 申购单明细
      */
     @PostMapping("/detail")
-    public ApplyBuyVo detail(@RequestBody ApplyBuyDetailSelectDto dto) {
-        return applyBuyService.detail(dto);
+    public ApplyBuyVo detail(@RequestBody BaseSelectDto dto) {
+        return applyBuyService.detail(dto.getId());
     }
 
     /**

sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyDetailSelectDto.java

@@ -1,21 +0,0 @@
-package com.sd.business.entity.apply.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 申购单详情查询入参实体
- *
- * @author
- * @since 2023-10-30
- */
-@Getter
-@Setter
-public class ApplyBuyDetailSelectDto extends BaseSelectDto {
-
-    /**
-     * 采购id
-     */
-    private Long purchaseId;
-}

sd-business/src/main/java/com/sd/business/entity/apply/vo/ApplyBuyBomVo.java

@@ -45,15 +45,4 @@ public class ApplyBuyBomVo extends ApplyBuyBom {
      * 高 cm
      */
     private BigDecimal bomSpecHeight;
-
-    /**
-     * 到货数量
-     */
-    private BigDecimal arrivalQuantity;
-
-    /**
-     * 在途数量
-     */
-    private BigDecimal inTransitQuantity;
-
 }

sd-business/src/main/java/com/sd/business/service/apply/ApplyBuyService.java

@@ -2,7 +2,6 @@ package com.sd.business.service.apply;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
-import com.sd.business.entity.apply.dto.ApplyBuyDetailSelectDto;
 import com.sd.business.entity.apply.dto.ApplyBuyDto;
 import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
 import com.sd.business.entity.apply.po.ApplyBuy;
@@ -27,7 +26,7 @@ public interface ApplyBuyService extends BaseService<ApplyBuy> {
     /**
      * 申购单明细
      */
-    ApplyBuyVo detail(ApplyBuyDetailSelectDto dto);
+    ApplyBuyVo detail(Long id);
 
     /**
      * 申购单添加

sd-business/src/main/java/com/sd/business/service/apply/impl/ApplyBuyServiceImpl.java

@@ -14,7 +14,6 @@ import com.fjhx.file.service.FileInfoService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.apply.dto.ApplyBuyDetailSelectDto;
 import com.sd.business.entity.apply.dto.ApplyBuyDto;
 import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
 import com.sd.business.entity.apply.po.ApplyBuy;
@@ -25,7 +24,6 @@ import com.sd.business.entity.apply.vo.ApplyBuyVo;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.department.constant.DepartmentConstant;
 import com.sd.business.entity.inventory.po.Inventory;
-import com.sd.business.entity.purchase.po.PurchaseBom;
 import com.sd.business.entity.warehouse.constant.WarehouseConstant;
 import com.sd.business.mapper.apply.ApplyBuyMapper;
 import com.sd.business.service.apply.ApplyBuyBomService;
@@ -106,15 +104,15 @@ public class ApplyBuyServiceImpl extends ServiceImpl<ApplyBuyMapper, ApplyBuy> i
     }
 
     @Override
-    public ApplyBuyVo detail(ApplyBuyDetailSelectDto dto) {
-        Assert.notNull(dto.getId(), "申购单id不能为空");
+    public ApplyBuyVo detail(Long id) {
+        Assert.notNull(id, "申购单id不能为空");
 
         // 申购单
-        ApplyBuy ApplyBuy = this.getById(dto.getId());
+        ApplyBuy ApplyBuy = this.getById(id);
         Assert.notNull(ApplyBuy, "没有找到申购单");
 
         // 申购明细
-        List<ApplyBuyBom> list = applyBuyBomService.list(q -> q.eq(ApplyBuyBom::getApplyBuyId, dto.getId()));
+        List<ApplyBuyBom> list = applyBuyBomService.list(q -> q.eq(ApplyBuyBom::getApplyBuyId, id));
         List<ApplyBuyBomVo> applyBuyBomList = BeanUtil.copyToList(list, ApplyBuyBomVo.class);
 
         // 赋值bom规格
@@ -128,20 +126,6 @@ public class ApplyBuyServiceImpl extends ServiceImpl<ApplyBuyMapper, ApplyBuy> i
         });
 
         // TODO 库存，在途数量，近30天消耗量，近30天入库量，安全库存 未赋值
-        // 赋值到货数量和在途数量
-        if (dto.getPurchaseId() != null) {
-            Map<Long, PurchaseBom> purchaseBomMap = purchaseBomService.mapKEntity(PurchaseBom::getBomSpecId, q -> q
-                    .eq(PurchaseBom::getPurchaseId, dto.getPurchaseId()));
-            applyBuyBomList.forEach(item -> {
-                PurchaseBom purchaseBom = purchaseBomMap.get(item.getBomSpecId());
-                if (purchaseBom != null) {
-                    item.setInTransitQuantity(purchaseBom.getPurchaseQuantity()
-                            .subtract(purchaseBom.getArrivalQuantity())
-                            .add(purchaseBom.getReturnQuantity()));
-                    item.setArrivalQuantity(purchaseBom.getArrivalQuantity());
-                }
-            });
-        }
 
         // 赋值返回值
         ApplyBuyVo result = BeanUtil.toBean(ApplyBuy, ApplyBuyVo.class);