到货检验列表

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

@@ -108,11 +108,16 @@ public class ContractProductVo extends ContractProduct {
     private String claimTime;
 
     /**
-     * 合同到账时间
+     * 客户ID
      */
     private Long buyCorporationId;
 
     /**
+     * 供应商ID
+     */
+    private Long sellCorporationId;
+
+    /**
      * 交接单时间
      */
     private Date sampleTime;
@@ -146,4 +151,9 @@ public class ContractProductVo extends ContractProduct {
      * 结论
      */
     private String summary;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyName;
 }

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

@@ -9,6 +9,7 @@ import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.sale.entity.contract.po.Contract;
@@ -16,6 +17,7 @@ import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.mapper.contract.ContractProductMapper;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -65,6 +67,8 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
     @Autowired
     private CustomerService customerService;
 
+    @Autowired
+    private SupplierInfoService supplierInfoService;
 
     /**
      * 分页
@@ -200,6 +204,10 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
             customerService.attributeAssign(list, ContractProductVo::getBuyCorporationId, (item, customer) -> {
                 item.setCustomerName(customer.getName());
             });
+            // 供应商名称
+            supplierInfoService.attributeAssign(list, ContractProductVo::getSellCorporationId, (item, supplier) -> {
+                item.setSupplyName(supplier.getName());
+            });
         }
         return page;
     }

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

@@ -77,7 +77,7 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
      */
     @Override
     public EhsdQuality detail(Long id) {
-        EhsdQuality quality = this.getById(id);
+        EhsdQuality quality = this.getOne(Wrappers.<EhsdQuality>query().lambda().eq(EhsdQuality::getBusinessId,id));
         if(ObjectUtils.isEmpty(quality)){
             throw new ServiceException("质检单不存在");
         }
@@ -100,7 +100,11 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
     @LogicIgnore(tableName = {""},alias = {""})
     public void submit(EhsdQualityDto ehsdQualityDto) {
         if(ObjectUtils.isEmpty(ehsdQualityDto.getId())){//添加
-            ehsdQualityDto.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(),null));
+//            ehsdQualityDto.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(),null));
+            EhsdQuality quality = this.getOne(Wrappers.<EhsdQuality>query().lambda().eq(EhsdQuality::getBusinessId,ehsdQualityDto.getBusinessId()));
+            if(ObjectUtils.isNotEmpty(quality)){
+                throw new ServiceException("当前合同已有质检单，请勿重新添加");
+            }
             this.save(ehsdQualityDto);
         }else{//修改
             this.updateById(ehsdQualityDto);