采购合同pdf

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseController.java

@@ -103,4 +103,12 @@ public class EhsdPurchaseController {
         return ehsdPurchaseService.getProductPriceInfo(dto);
     }
 
+    /**
+     * 采购pdf
+     */
+    @PostMapping("/getPurchaseDtoPdfInfo")
+    private void getPurchaseDtoPdfInfo(@RequestBody EhsdPurchaseDto dto) {
+        //
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.contract.vo;
 
+import com.fjhx.sale.entity.contract.po.ContractProject;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -85,9 +86,18 @@ public class ContractPdfInfoVo {
     private BigDecimal totalAmount;
 
     /**
+     * 收费项目
+     */
+    List<ContractProject> contractProjectList;
+
+    /**
      * 产品信息
      */
     private List<ProductInfo> productInfoList;
+    /**
+     * 模板内容
+     */
+    private String templateContent;
 
 
 //    /**

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

@@ -79,4 +79,9 @@ public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
      * 产品高
      */
     private BigDecimal productHeight;
+
+    /**
+     * 销售订单号
+     */
+    private String saleCode;
 }

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

@@ -79,4 +79,19 @@ public class EhsdPurchaseVo extends EhsdPurchase {
 	 * 付款总金额
 	 */
 	private BigDecimal sumPayMoney;
+
+	/**
+	 * 创建人名称
+	 */
+	private String createUserName;
+
+	/**
+	 * 创建人手机
+	 */
+	private String createUserPhone;
+
+	/**
+	 * 卖方传真
+	 */
+	private String sellCorporationFax;
 }

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

@@ -1934,6 +1934,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 //        contractPdfInfoVo.setAdvanceRatio(contract.getAdvanceRatio());
         contractPdfInfoVo.setPaymentMethod(contract.getPaymentMethod());
 
+        contractPdfInfoVo.setTemplateContent(contract.getTemplateContent());
+
 
         //赋值创建人名称
         Map<Long, SysUser> nickNameMapByIds = UserUtil.getMapByIds(Arrays.asList(contract.getCreateUser()));
@@ -1942,6 +1944,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             contractPdfInfoVo.setCreateUserName(sysUser.getNickName());//联系人名称
             contractPdfInfoVo.setCreateUserPhone(sysUser.getPhonenumber());//联系方式
         }
+
+        //赋值收费项目
+        List<ContractProject> contractProjectList = contractProjectService.list(q -> q.eq(ContractProject::getContractId, contract.getId()));
+        contractPdfInfoVo.setContractProjectList(contractProjectList);
     }
 
     /**

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

@@ -30,11 +30,13 @@ import com.fjhx.purchase.entity.pay.vo.PayDetailVo;
 import com.fjhx.purchase.entity.pay.vo.PayVo;
 import com.fjhx.purchase.entity.purchase.bo.PurchaseDocumentaryBo;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
+import com.fjhx.purchase.entity.subscribe.po.Subscribe;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 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.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
@@ -66,6 +68,7 @@ import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.supply.service.supplier.SupplierPriceService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -134,6 +137,8 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     private SupplierPriceService supplierPriceService;
     @Autowired
     private ContractService contractService;
+    @Autowired
+    private SubscribeService subscribeService;
 
     /**
      * 分页
@@ -195,10 +200,21 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         EhsdPurchase ehsdPurchase = this.getById(id);
         EhsdPurchaseVo result = BeanUtil.toBean(ehsdPurchase, EhsdPurchaseVo.class);
 
+        //赋值销售订单号
+        String saleCode = "";
+        if (Objects.equals(result.getDataResource(), 0)) {
+            Subscribe subscribe = subscribeService.getById(result.getDataResourceId());
+            if (ObjectUtil.isNotEmpty(subscribe)) {
+                saleCode = subscribe.getCode();
+            }
+        } else {
+            Contract contract = contractService.getById(result.getDataResourceId());
+            if (ObjectUtil.isNotEmpty(contract)) {
+                saleCode = contract.getCode();
+            }
+        }
+
         List<Long> ids = new ArrayList<>();
-//        ids.add(result.getBuyCountryId());
-//        ids.add(result.getBuyProvinceId());
-//        ids.add(result.getBuyCityId());
         ids.add(result.getSellCountryId());
         ids.add(result.getSellProvinceId());
         ids.add(result.getSellCityId());
@@ -207,15 +223,17 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         result.setSellCountryName(areaMapByIds.get(result.getSellCountryId()));
         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()));
 
         //赋值卖方名称
         SupplierInfo supplierInfo = supplierInfoService.getById(result.getSellCorporationId());
         if (ObjectUtils.isNotEmpty(supplierInfo)) {
             result.setSellCorporationName(supplierInfo.getName());
+            result.setSellCorporationName(supplierInfo.getName());
+            result.setSellContactName(supplierInfo.getContactPerson());
+            result.setSellContactNumber(supplierInfo.getContactNumber());
+            result.setSellCorporationFax(supplierInfo.getFax());
+            ;
+            result.setAddress(supplierInfo.getAreaDetail());
         }
         //赋值卖方（供应商）银行信息
         result.setOpeningBank(supplierInfo.getOpeningBank());//开户银行
@@ -242,6 +260,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             for (EhsdPurchaseProductVo ehsdPurchaseProductVo : ehsdPurchaseProductVos) {
                 List<EhsdPurchaseProductMountings> ehsdPurchaseProductMountings = eppMap.get(ehsdPurchaseProductVo.getId());
                 ehsdPurchaseProductVo.setPurchaseProductMountingsList(ehsdPurchaseProductMountings);
+
+                //赋值销售订单号
+                ehsdPurchaseProductVo.setSaleCode(saleCode);
             }
         }
 
@@ -310,13 +331,14 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         //赋值其他收费项目
         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);
+
+        //赋值创建人名称
+        Map<Long, SysUser> nickNameMapByIds = UserUtil.getMapByIds(Arrays.asList(result.getCreateUser()));
+        SysUser sysUser = nickNameMapByIds.get(result.getCreateUser());
+        if (ObjectUtil.isNotEmpty(sysUser)) {
+            result.setCreateUserName(sysUser.getNickName());
+            result.setCreateUserPhone(sysUser.getPhonenumber());
+        }
 
         //赋值历史毛利图信息
         IWrapper<Contract> wrapper = IWrapper.<Contract>getWrapper().eq("t1.contractId", result.getDataResourceId());

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/po/SupplierInfo.java

@@ -113,4 +113,9 @@ public class SupplierInfo extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 传真
+     */
+    private String fax;
+
 }