采购合同明细

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractShipment.java

@@ -59,4 +59,10 @@ public class ContractShipment extends BasePo {
     @TableField(exist = false)
     private String productCnName;
 
+    /**
+     * 产品名称
+     */
+    @TableField(exist = false)
+    private String productName;
+
 }

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

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.purchase.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -7,6 +8,7 @@ import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -46,4 +48,15 @@ public class EhsdPurchaseArrival extends BasePo {
      */
     private String remark;
 
+    /**
+     * 产品名称
+     */
+    @TableField(exist = false)
+    private String productName;
+    /**
+     * 产品编号
+     */
+    @TableField(exist = false)
+    private String productCode;
+
 }

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

@@ -28,4 +28,9 @@ public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
      * 币种
      */
     private String currency;
+
+    /**
+     * 产品定义
+     */
+    private Integer definition;
 }

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

@@ -523,6 +523,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         List<ContractProduct> contractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, id));
         productInfoService.attributeAssign(contractProductList, ContractProduct::getProductId, (item, product) -> {
             item.setProductCnName(product.getName());
+            item.setProductName(product.getName());
             item.setProductCode(product.getCode());
             item.setProductUnit(product.getUnit());
         });
@@ -534,6 +535,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         List<ContractShipment> contractShipmentList = contractShipmentService.list(q -> q.eq(ContractShipment::getContractId, id));
         productInfoService.attributeAssign(contractShipmentList, ContractShipment::getProductId, (item, product) -> {
             item.setProductCnName(product.getName());
+            item.setProductName(product.getName());
             item.setProductCode(product.getCode());
         });
         result.setContractShipmentList(contractShipmentList);

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

@@ -10,20 +10,26 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.flow.service.flow.FlowExampleService;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
 import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
 import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseSelectDto;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseArrival;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.fjhx.sale.mapper.purchase.EhsdPurchaseMapper;
 import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackDetailService;
+import com.fjhx.sale.service.purchase.EhsdPurchaseArrivalService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProjectService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseService;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
@@ -62,6 +68,12 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     private CorporationService corporationService;
     @Autowired
     private FlowExampleService flowExampleService;
+    @Autowired
+    private EhsdPurchaseProjectService ehsdPurchaseProjectService;
+    @Autowired
+    private EhsdPurchaseArrivalService ehsdPurchaseArrivalService;
+    @Autowired
+    private ProductInfoService productInfoService;
 
     /**
      * 分页
@@ -96,9 +108,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         EhsdPurchaseVo result = BeanUtil.toBean(ehsdPurchase, EhsdPurchaseVo.class);
 
         List<Long> ids = new ArrayList<>();
-        ids.add(result.getBuyCountryId());
-        ids.add(result.getBuyProvinceId());
-        ids.add(result.getBuyCityId());
+//        ids.add(result.getBuyCountryId());
+//        ids.add(result.getBuyProvinceId());
+//        ids.add(result.getBuyCityId());
         ids.add(result.getSellCountryId());
         ids.add(result.getSellProvinceId());
         ids.add(result.getSellCityId());
@@ -108,9 +120,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         result.setSellProvinceName(areaMapByIds.get(result.getSellProvinceId()));
         result.setSellCityName(areaMapByIds.get(result.getSellCityId()));
         //赋值买方地址
-        result.setBuyCountryName(areaMapByIds.get(result.getBuyCountryId()));
-        result.setBuyProvinceName(areaMapByIds.get(result.getBuyProvinceId()));
-        result.setBuyCityName(areaMapByIds.get(result.getBuyCityId()));
+//        result.setBuyCountryName(areaMapByIds.get(result.getBuyCountryId()));
+//        result.setBuyProvinceName(areaMapByIds.get(result.getBuyProvinceId()));
+//        result.setBuyCityName(areaMapByIds.get(result.getBuyCityId()));
 
         //赋值卖方名称
         SupplierInfo supplierInfo = supplierInfoService.getById(result.getSellCorporationId());
@@ -132,6 +144,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
                 q.eq(EhsdPurchaseProduct::getPurchaseId, ehsdPurchase.getId())
         );
         List<EhsdPurchaseProductVo> ehsdPurchaseProductVos = BeanUtil.copyToList(ehsdPurchaseProductList, EhsdPurchaseProductVo.class);
+        productInfoService.attributeAssign(ehsdPurchaseProductVos, EhsdPurchaseProductVo::getProductId, (item, product) -> {
+            item.setDefinition(product.getDefinition());
+        });
         result.setEhsdPurchaseProductList(ehsdPurchaseProductVos);
         //赋值出货明细
         List<Long> cpIds = ehsdPurchaseProductVos.stream().map(EhsdPurchaseProductVo::getDataResourceId).collect(Collectors.toList());
@@ -145,6 +160,18 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             packDetailProductVos.forEach(item -> item.setShipmentTime(packDetail.getShipmentTime()));
         }
         result.setPackDetailProductList(packDetailProductVos);
+
+
+        //赋值其他收费项目
+        List<EhsdPurchaseProject> ehsdPurchaseProjects = ehsdPurchaseProjectService.list(q -> q.eq(EhsdPurchaseProject::getPurchaseId, id));
+        result.setPurchaseProjectList(ehsdPurchaseProjects);
+        //赋值到货信息
+        List<EhsdPurchaseArrival> ehsdPurchaseArrivalList = ehsdPurchaseArrivalService.list(q -> q.eq(EhsdPurchaseArrival::getPurchaseId, id));
+        productInfoService.attributeAssign(ehsdPurchaseArrivalList, EhsdPurchaseArrival::getProductId, (item, product) -> {
+            item.setProductName(product.getName());
+            item.setProductCode(product.getCode());
+        });
+        result.setPurchaseArrivalList(ehsdPurchaseArrivalList);
         return result;
     }