到货详情同产品质检信息异常问题处理

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

@@ -18,4 +18,6 @@ public class QualityDetailVo extends QualityDetail {
      * 质检人名称
      */
     private String createUserName;
+
+    private Long purchaseDetailId;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -349,11 +349,11 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
         UserUtil.assignmentNickName(qualityInfoByPurchaseId, QualityDetailVo::getCreateUser, QualityDetailVo::setCreateUserName);
 
         if (ObjectUtil.isNotEmpty(qualityInfoByPurchaseId)) {
-            Map<Long, List<QualityDetailVo>> qualityDetailsMap = qualityInfoByPurchaseId.stream().collect(Collectors.groupingBy(QualityDetail::getBussinessId));
+            Map<Long, List<QualityDetailVo>> qualityDetailsMap = qualityInfoByPurchaseId.stream().collect(Collectors.groupingBy(QualityDetailVo::getPurchaseDetailId));
 
             for (PurchaseDetailVo purchaseDetailVo : purchaseDetailVoList) {
                 //根据产品id获取质检信息
-                List<QualityDetailVo> qualityDetails = qualityDetailsMap.get(purchaseDetailVo.getBussinessId());
+                List<QualityDetailVo> qualityDetails = qualityDetailsMap.get(purchaseDetailVo.getId());
                 if (ObjectUtil.isEmpty(qualityDetails)) {
                     purchaseDetailVo.setQualifiedCount(BigDecimal.ZERO);
                     purchaseDetailVo.setNoQualifiedCount(BigDecimal.ZERO);

hx-victoriatourist/src/main/resources/mapper/deliver/DeliverGoodsMapper.xml

@@ -34,12 +34,14 @@
              qd.qualified_quantity  qualifiedCount,
              qd.disqualification_quantity  noQualifiedCount,
              qd.create_user,
-             qd.create_time
+             qd.create_time,
+            ard.purchase_detail_id AS purchaseDetailId
         FROM
             bytesailing_wms.stock_wait sw
-                JOIN bytesailing_wms.arrival_stock_records asr ON asr.stock_wait_id = sw.id and asr.del_flag = 0
-                JOIN bytesailing_wms.arrival_stock_records_details asrd ON asrd.arrival_stock_records_id = asr.id and asrd.del_flag = 0
+                JOIN bytesailing_wms.stock_wait_details swd ON swd.stock_wait_id = sw.id AND swd.del_flag = 0
+                JOIN bytesailing_wms.arrival_stock_records_details asrd ON asrd.business_details_id = swd.id
                 JOIN bytesailing_victoriatourist.quality_details qd ON qd.arrival_stock_records_details_id = asrd.id and qd.del_flag = 0
+                JOIN bytesailing_purchase.arrival_detail ard ON swd.business_details_id = ard.id AND ard.del_flag = 0
         WHERE
             sw.business_id = #{id}
           and sw.del_flag = 0