验货

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -156,4 +156,9 @@ public class ContractProductVo extends ContractProduct {
      * 供应商名称
      */
     private String supplyName;
+
+    /**
+     * 供应商ID
+     */
+    private Long supplyId;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/quality/po/EhsdQuality.java

@@ -47,6 +47,11 @@ public class EhsdQuality extends BasePo {
     private Long supplyId;
 
     /**
+     * 供应商名称
+     */
+    private String supplyName;
+
+    /**
      * 质检时间
      */
     private Date inspectionDate;
@@ -57,6 +62,11 @@ public class EhsdQuality extends BasePo {
     private String referenceSample;
 
     /**
+     * 产品
+     */
+    private String productName;
+
+    /**
      * 订单数量
      */
     private BigDecimal orderQuantity;

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

@@ -221,6 +221,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
             // 供应商名称
             corporationService.attributeAssign(list, ContractProductVo::getSellCorporationId, (item, supplier) -> {
                 item.setSupplyName(supplier.getName());
+                item.setSupplyId(item.getId());
             });
             if(CollectionUtils.isNotEmpty(qualityMap)){
                 list.forEach(i -> i.setQualityStatus(qualityMap.getOrDefault(i.getId(),null)));

hx-sale/src/main/java/com/fjhx/sale/service/quality/impl/EhsdQualityServiceImpl.java

@@ -84,8 +84,8 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
         if(ObjectUtils.isEmpty(quality)){
             throw new ServiceException("质检单不存在");
         }
-        quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda()));
-        quality.setEhsdQualityMarkingDetails(ehsdQualityMarkingDetailService.list(Wrappers.<EhsdQualityMarkingDetail>query().lambda()));
+        quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda().eq(EhsdQualityAql::getQualityId,id)));
+        quality.setEhsdQualityMarkingDetails(ehsdQualityMarkingDetailService.list(Wrappers.<EhsdQualityMarkingDetail>query().lambda().eq(EhsdQualityMarkingDetail::getQualityId,id)));
         quality.setEhsdQualityProblemList(ehsdQualityProblemService.list(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,id)));
         quality.setEhsdQualitySiteTestList(ehsdQualitySiteTestService.list(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,id)));
         quality.setEhsdQualityPackList(ehsdQualityPackService.list(Wrappers.<EhsdQualityPack>query().lambda().eq(EhsdQualityPack::getQualityId,id)));