采购到货添加到货记录以及 到货数量

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/dto/ArrivalDetailDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.purchase.entity.arrival.dto;
-
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 到货明细单新增编辑入参实体
- *
- * @author 
- * @since 2023-04-07
- */
-@Getter
-@Setter
-public class ArrivalDetailDto extends ArrivalDetail {
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/dto/ArrivalDetailSelectDto.java

@@ -1,27 +0,0 @@
-package com.fjhx.purchase.entity.arrival.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 到货明细单列表查询入参实体
- *
- * @author 
- * @since 2023-04-07
- */
-@Getter
-@Setter
-public class ArrivalDetailSelectDto extends BaseSelectDto {
-    /**
-     * 质检状态
-     */
-    private String status;
-
-    /**
-     * 到货明细单ID
-     */
-    private List<Long> ids;
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/dto/ArrivalDto.java

@@ -1,21 +0,0 @@
-package com.fjhx.purchase.entity.arrival.dto;
-
-import com.fjhx.purchase.entity.arrival.po.Arrival;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 到货新增编辑入参实体
- *
- * @author
- * @since 2023-04-07
- */
-@Getter
-@Setter
-public class ArrivalDto extends Arrival {
-
-    /**
-     * 发货id
-     */
-    private Long deliverGoodsId;
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/dto/ArrivalSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.purchase.entity.arrival.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 到货列表查询入参实体
- *
- * @author 
- * @since 2023-04-07
- */
-@Getter
-@Setter
-public class ArrivalSelectDto extends BaseSelectDto {
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/enums/ArrivalDetailStatusEnum.java

@@ -1,51 +0,0 @@
-package com.fjhx.purchase.entity.arrival.enums;
-
-import org.apache.commons.collections4.MapUtils;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 到货质检状态枚举
- * 质检状态 0未质检 10部分质检 20全部质检
- */
-public enum ArrivalDetailStatusEnum {
-    STATUS_0(0, "未质检"),
-    STATUS_10(10, "部分质检"),
-    STATUS_20(20,"全部质检"),
-    ;
-    private int key;
-
-    private String value;
-
-    private static Map<Integer, String> map = new LinkedHashMap<>();
-
-    ArrivalDetailStatusEnum(int key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static Map<Integer, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
-            return map;
-        }
-        for (ArrivalDetailStatusEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    public int getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/po/Arrival.java

@@ -1,60 +0,0 @@
-package com.fjhx.purchase.entity.arrival.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * <p>
- * 到货
- * </p>
- *
- * @author
- * @since 2023-04-07
- */
-@Getter
-@Setter
-@TableName("arrival")
-public class Arrival extends BasePo {
-
-    /**
-     * 采购编码
-     */
-    private String code;
-
-    /**
-     * 供应商ID
-     */
-    private Long supplyId;
-
-    /**
-     * 采购单ID
-     */
-    private Long purchaseId;
-
-    /**
-     * 状态 备用字段
-     */
-    private Integer status;
-
-    /**
-     * 到货明细列表
-     */
-    @TableField(exist = false)
-    private List<ArrivalDetail> arrivalDetailList;
-
-    /**
-     * 到货状态
-     */
-    @TableField(exist = false)
-    private Integer arrivalStatus;
-
-    /**
-     * 维多利亚扩展
-     */
-    private String victoriatouristJson;
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/po/ArrivalDetail.java

@@ -1,58 +0,0 @@
-package com.fjhx.purchase.entity.arrival.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 到货明细单
- * </p>
- *
- * @author
- * @since 2023-04-07
- */
-@Getter
-@Setter
-@TableName("arrival_detail")
-public class ArrivalDetail extends BasePo {
-
-    /**
-     * 关联ID  产品ID/货品ID
-     */
-    private Long bussinessId;
-
-    /**
-     * 到货主表ID
-     */
-    private Long arrivalId;
-
-    /**
-     * 采购明细ID
-     */
-    private Long purchaseDetailId;
-
-    /**
-     * 到货数量
-     */
-    private BigDecimal count;
-
-    /**
-     * 质检状态 0未质检 10部分质检 20全部质检
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 发货明细id
-     */
-    private Long deliverGoodsDetailsId;
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/vo/ArrivalDetailVo.java

@@ -1,98 +0,0 @@
-package com.fjhx.purchase.entity.arrival.vo;
-
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/**
- * 到货明细单列表查询返回值实体
- *
- * @author 
- * @since 2023-04-07
- */
-@Getter
-@Setter
-public class ArrivalDetailVo extends ArrivalDetail {
-
-    /**
-     * 到货单编码
-     */
-    private String code;
-
-    /**
-     * 供应商ID
-     */
-    private Long supplyId;
-
-    /**
-     * 供应商名称
-     */
-    private String supplyName;
-
-    /**
-     * 货品类型
-     */
-    private String productType;
-
-    /**
-     * 所属分类id
-     */
-    private Long productCategoryId;
-
-    /**
-     * 所属分类
-     */
-    private String productCategory;
-
-    /**
-     * 货品编码
-     */
-    private String productCode;
-
-    /**
-     * 货品名称
-     */
-    private String productName;
-
-    /**
-     * 单位
-     */
-    private String productUnit;
-
-    /**
-     * 货品规格型号
-     */
-    private String productSpec;
-
-    /**
-     * 合格数量
-     */
-    private BigDecimal qualifiedCount;
-
-    /**
-     * 不合格数量
-     */
-    private BigDecimal noQualifiedCount;
-
-    /**
-     * 质检总数
-     */
-    private BigDecimal sumQualityCount;
-
-    /**
-     * 发货物流单号
-     */
-    private String logisticsCode;
-
-    /**
-     * 货品编码
-     */
-    private String productCustomCode;
-
-    /**
-     * 定义 1产品 2物料
-     */
-    private Integer productDefinition;
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/vo/ArrivalVo.java

@@ -1,26 +0,0 @@
-package com.fjhx.purchase.entity.arrival.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fjhx.purchase.entity.arrival.po.Arrival;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 到货列表查询返回值实体
- *
- * @author 
- * @since 2023-04-07
- */
-@Getter
-@Setter
-public class ArrivalVo extends Arrival {
-
-    /**
-     * 到货明细列表
-     */
-    private List<ArrivalDetailVo> arrivalDetailVoList;
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchaseDetailVo.java

@@ -1,10 +1,7 @@
 package com.fjhx.purchase.entity.purchase.vo;
 
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.deliver.DeliverGoodsDetailsPo;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.quality.po.QualityDetail;
-import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import lombok.Getter;
 import lombok.Setter;
@@ -74,7 +71,7 @@ public class PurchaseDetailVo extends PurchaseDetail {
     /**
      * 到货记录列表
      */
-    private List<ArrivalDetailVo> arrivalDetailList;
+//    private List<ArrivalDetailVo> arrivalDetailList;
     /**
      * 采购退货数量
      */

hx-purchase/src/main/java/com/fjhx/purchase/service/quality/impl/QualityServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.quality.dto.QualityDto;
 import com.fjhx.purchase.entity.quality.dto.QualitySelectDto;
 import com.fjhx.purchase.entity.quality.po.Quality;
@@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -66,7 +64,7 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
         this.save(quality);
         List<QualityDetail> qualityDetailList = quality.getQualityDetailList();
         if (CollectionUtils.isNotEmpty(qualityDetailList)) {
-            List<ArrivalDetail> upAll = new ArrayList<>();
+//            List<ArrivalDetail> upAll = new ArrayList<>();
             for (QualityDetail q : qualityDetailList) {
                 if (q.getQualifiedCount().compareTo(BigDecimal.ZERO) == 0
                         && q.getNoQualifiedCount().compareTo(BigDecimal.ZERO) == 0) {
@@ -78,14 +76,14 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
                 //查询到货数量
 //                ArrivalDetail arrivalDetail = arrivalDetailService.getById(q.getArrivalDetailId());
                 BigDecimal sum = qualityCount.add(q.getQualifiedCount().add(q.getNoQualifiedCount()));
-                ArrivalDetail up = new ArrivalDetail();
-                up.setId(q.getArrivalDetailId());
+//                ArrivalDetail up = new ArrivalDetail();
+//                up.setId(q.getArrivalDetailId());
 //                if(sum.compareTo(arrivalDetail.getCount())>-1){//如果质检数量大于等于到货数量
 //                    up.setStatus(ArrivalDetailStatusEnum.STATUS_20.getKey());
 //                }else{
 //                    up.setStatus(ArrivalDetailStatusEnum.STATUS_10.getKey());
 //                }
-                upAll.add(up);
+//                upAll.add(up);
             }
 //            arrivalDetailService.updateBatchById(upAll);
             qualityDetailService.saveBatch(qualityDetailList);

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/po/ArrivalDetail.java

@@ -45,4 +45,9 @@ public class ArrivalDetail extends BasePo {
      */
     private String remark;
 
+    /**
+     * 采购单ID
+     */
+    private Long purchaseId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProduct.java

@@ -101,13 +101,6 @@ public class EhsdPurchaseProduct extends BasePo {
     private Long oldPurchaseProductId;
 
     /**
-     * 合同来源-超采数量
-     */
-    private BigDecimal exceedQuantity;
-
-    private BigDecimal arrivalQuantity;
-
-    /**
      * 合同id
      */
     private Long contractId;

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProductVo.java

@@ -86,4 +86,6 @@ public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
     private String saleCode;
 
     private String productColor;
+
+    private BigDecimal arrivalQuantity;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.purchase.vo;
 
+import com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo;
 import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
@@ -96,4 +97,9 @@ public class EhsdPurchaseVo extends EhsdPurchase {
     private String sellCorporationFax;
 
     private String companyName;
+
+    /**
+     * 到货明细记录
+     */
+    private List<ArrivalDetailVo> arrivalDetailList;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/arrival/ArrivalDetailMapper.java

@@ -2,6 +2,12 @@ package com.fjhx.sale.mapper.arrival;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.sale.entity.arrival.po.ArrivalDetail;
+import com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -12,6 +18,9 @@ import com.fjhx.sale.entity.arrival.po.ArrivalDetail;
  * @author
  * @since 2024-02-01
  */
+@Mapper
 public interface ArrivalDetailMapper extends BaseMapper<ArrivalDetail> {
 
+    List<ArrivalDetailVo> getList(@Param("ew") IWrapper<ArrivalDetail> wrapper);
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/ArrivalDetailService.java

@@ -14,4 +14,5 @@ import com.ruoyi.common.core.service.BaseService;
  */
 public interface ArrivalDetailService extends BaseService<ArrivalDetail> {
 
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalServiceImpl.java

@@ -125,6 +125,8 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             EhsdPurchaseProduct ehsdPurchaseProduct = pdMap.get(arrivalDetail.getPurchaseDetailId());
             arrivalDetail.setProductId(ehsdPurchaseProduct.getProductId());
 
+            arrivalDetail.setPurchaseId(dto.getPurchaseId());
+
             //更新到货数量
             purchaseProductService.update(q -> q
                     .eq(EhsdPurchaseProduct::getId, ehsdPurchaseProduct.getId())

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -49,9 +49,7 @@ import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.enums.ProductAvailableRecordType;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.pay.po.Pay;
-import com.fjhx.purchase.entity.quality.po.QualityDetail;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.mapper.subscribe.SubscribeDetailMapper;
 import com.fjhx.purchase.service.pay.PayDetailService;
@@ -1894,44 +1892,44 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         return vo;
     }
 
-    /**
-     * 赋值合格率
-     */
-    private void setPassRate(PayDecisionAidVo vo, List<ArrivalDetail> arrivalDetails) {
-        List<PayDecisionAidVo.PurchaseInfo> purchaseInfoList = vo.getPurchaseInfoList();
-
-        if (arrivalDetails.size() == 0) {
-            return;
-        }
-
-        // 到货明细通过采购明细id分组
-        Map<Long, List<ArrivalDetail>> arrivalDetailMap = arrivalDetails.stream().collect(Collectors.groupingBy(
-                ArrivalDetail::getPurchaseDetailId
-        ));
-
-        // 通过到货明细查询质检记录
-        List<Long> arrivalDetailsIdList = arrivalDetails.stream().map(BaseIdPo::getId).collect(Collectors.toList());
-        List<QualityDetail> list = qualityDetailService.list(q -> q.in(QualityDetail::getArrivalDetailId, arrivalDetailsIdList));
-
-
-        for (PayDecisionAidVo.PurchaseInfo purchaseInfo : purchaseInfoList) {
-
-            List<ArrivalDetail> arrivalDetailsList = arrivalDetailMap.get(purchaseInfo.getPurchaseDetailsId());
-
-            purchaseInfo.setQualifiedCount(BigDecimal.ZERO);
-            purchaseInfo.setNoQualifiedCount(BigDecimal.ZERO);
-
-            List<Long> itemArrivalDetailsIdList = arrivalDetailsList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
-            for (QualityDetail qualityDetail : list) {
-                if (!itemArrivalDetailsIdList.contains(qualityDetail.getArrivalDetailId())) {
-                    continue;
-                }
-                purchaseInfo.setQualifiedCount(purchaseInfo.getQualifiedCount().add(qualityDetail.getQualifiedCount()));
-                purchaseInfo.setNoQualifiedCount(purchaseInfo.getNoQualifiedCount().add(qualityDetail.getNoQualifiedCount()));
-            }
-        }
-
-    }
+//    /**
+//     * 赋值合格率
+//     */
+//    private void setPassRate(PayDecisionAidVo vo, List<ArrivalDetail> arrivalDetails) {
+//        List<PayDecisionAidVo.PurchaseInfo> purchaseInfoList = vo.getPurchaseInfoList();
+//
+//        if (arrivalDetails.size() == 0) {
+//            return;
+//        }
+//
+//        // 到货明细通过采购明细id分组
+//        Map<Long, List<ArrivalDetail>> arrivalDetailMap = arrivalDetails.stream().collect(Collectors.groupingBy(
+//                ArrivalDetail::getPurchaseDetailId
+//        ));
+//
+//        // 通过到货明细查询质检记录
+//        List<Long> arrivalDetailsIdList = arrivalDetails.stream().map(BaseIdPo::getId).collect(Collectors.toList());
+//        List<QualityDetail> list = qualityDetailService.list(q -> q.in(QualityDetail::getArrivalDetailId, arrivalDetailsIdList));
+//
+//
+//        for (PayDecisionAidVo.PurchaseInfo purchaseInfo : purchaseInfoList) {
+//
+//            List<ArrivalDetail> arrivalDetailsList = arrivalDetailMap.get(purchaseInfo.getPurchaseDetailsId());
+//
+//            purchaseInfo.setQualifiedCount(BigDecimal.ZERO);
+//            purchaseInfo.setNoQualifiedCount(BigDecimal.ZERO);
+//
+//            List<Long> itemArrivalDetailsIdList = arrivalDetailsList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
+//            for (QualityDetail qualityDetail : list) {
+//                if (!itemArrivalDetailsIdList.contains(qualityDetail.getArrivalDetailId())) {
+//                    continue;
+//                }
+//                purchaseInfo.setQualifiedCount(purchaseInfo.getQualifiedCount().add(qualityDetail.getQualifiedCount()));
+//                purchaseInfo.setNoQualifiedCount(purchaseInfo.getNoQualifiedCount().add(qualityDetail.getNoQualifiedCount()));
+//            }
+//        }
+//
+//    }
 
 
     /**

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -43,6 +43,8 @@ import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.pay.PayService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
+import com.fjhx.sale.entity.arrival.po.ArrivalDetail;
+import com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
@@ -58,6 +60,7 @@ import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseDocumentaryVo;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
+import com.fjhx.sale.mapper.arrival.ArrivalDetailMapper;
 import com.fjhx.sale.mapper.purchase.EhsdPurchaseMapper;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.pack.PackDetailProductService;
@@ -98,11 +101,9 @@ import java.util.stream.Collectors;
  * ehsd采购表 服务实现类
  * </p>
  *
- * @author
  * @since 2023-05-17
  */
 @Service
-//@DS(SourceConstant.SALE)
 public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, EhsdPurchase> implements EhsdPurchaseService, GetDocumentaryBusinessTemplate {
 
     @Autowired
@@ -147,6 +148,8 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     private SubscribeDetailMapper subscribeDetailMapper;
     @Autowired
     private StockWaitService stockWaitService;
+    @Autowired
+    private ArrivalDetailMapper arrivalDetailMapper;
 
     /**
      * 分页
@@ -350,6 +353,12 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             result.setGrossProfitInfoList(grossProfitInfoList);
         }
 
+        //赋值到货明细
+        List<ArrivalDetailVo> arrivalDetailVos = arrivalDetailMapper.getList(IWrapper.<ArrivalDetail>getWrapper()
+                .eq("ad.purchase_id", result.getId())
+        );
+        result.setArrivalDetailList(arrivalDetailVos);
+
         return result;
     }
 

hx-sale/src/main/resources/mapper/arrival/ArrivalDetailMapper.xml

@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.arrival.ArrivalDetailMapper">
+    <select id="getList" resultType="com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo">
+        SELECT ad.*,
+               a.`code`       AS arrivalCode,
+               pi.`name`      AS productName,
+               pi.custom_code AS productCode,
+               pi.length      AS productLength,
+               pi.width       AS productWidth,
+               pi.height      AS productHright,
+               pi.color       AS productColor
+        FROM arrival_detail ad
+                 JOIN arrival a ON ad.arrival_id = a.id
+                 LEFT JOIN product_info pi ON ad.product_id = pi.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -108,9 +108,12 @@
         GROUP BY epp.product_id
     </select>
     <select id="getList" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo">
-        SELECT ep.`code` AS purchaseCode,
+        SELECT ep.`code`                               AS purchaseCode,
                ep.create_time,
-               epp.*
+               epp.*,
+               (SELECT IFNULL(sum(swd.receipt_quantity), 0)
+                FROM stock_wait_details swd
+                WHERE swd.purchase_detail_id = epp.id) AS arrivalQuantity
         FROM ehsd_purchase_product epp
                  LEFT JOIN ehsd_purchase ep ON epp.purchase_id = ep.id
             ${ew.customSqlSegment}