Merge remote-tracking branch 'origin/master'

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsController.java

@@ -61,7 +61,7 @@ public class DocumentsController {
     }
 
     /**
-     * 生成pdf---商业发票和装箱单
+     * 生成pdf---商业发票、装箱单、代理委托书
      */
     @GetMapping("/generateInvoiceAPackPdf")
     public Map<String,Object> generateInvoicePdf(@RequestParam("id")Long id) {

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.sale.service.documents.impl;
 
 import cn.hutool.core.lang.func.Func;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,6 +16,7 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.sale.entity.contract.po.Contract;
+import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.documents.po.DocumentsPdf;
@@ -24,6 +26,7 @@ import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailGoods;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.mapper.documents.DocumentsMapper;
+import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.documents.DocumentsPdfService;
 import com.fjhx.sale.service.documents.DocumentsProductService;
@@ -91,6 +94,9 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
     @Autowired
     private ProductInfoService productInfoService;
 
+    @Autowired
+    private ContractProjectService contractProjectService;
+
     private static final SimpleDateFormat sdf = new SimpleDateFormat("dd/MMM/yyyy", Locale.ENGLISH);
 
     /**
@@ -184,8 +190,11 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         if(ObjectUtil.isEmpty(contract)){
             throw new ServiceException("该单证合同不存在");
         }
+        //查询合同
         ContractVo contractVo = BeanUtil.toBean(contract, ContractVo.class);
         setContractArea(contractVo);
+        //查询收费项目
+        List<ContractProject> contractProjectList = contractProjectService.list(Wrappers.<ContractProject>query().lambda().eq(ContractProject::getContractId,contractVo.getId()));
         //查询买方
         Customer customer = customerService.getById(contractVo.getBuyCorporationId());
         //查询卖方
@@ -237,6 +246,8 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         map.put("sumPackQuantity",sumPackQuantity);//总箱数
         map.put("customer",customer);//买方信息
         map.put("corporation",corporation);//卖方信息
+        map.put("contractProjectList",contractProjectList);//卖方信息
+
 //        map.put("packDetailGoodsList",packDetailGoodsList);//装箱商品明细
         return map;
     }
@@ -323,11 +334,11 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
             //件数（运单和装箱单一致）
             data.put("sumPackQuantity", sumPackQuantity);
             //毛重（千克）
-            data.put("sumRoughWeight", packingWeightMap.get("sumRoughWeight"));
+            data.put("sumRoughWeight", dataMap.get("sumRoughWeight"));
             //净重（千克）
-            data.put("sumNetWeight", packingWeightMap.get("sumNetWeight"));
+            data.put("sumNetWeight", dataMap.get("sumNetWeight"));
             //总体积 立方米
-            data.put("sumBomVolume", packingWeightMap.get("sumBomVolume"));
+            data.put("sumBomVolume", dataMap.get("sumBomVolume"));
             //成交方式
             data.put("tradeModeName", contract.getPaymentMethod());
             //运费

hx-sale/src/main/resources/mapper/documents/DocumentsPdfMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.sale.mapper.documents.DocumentsPdfMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.documents.vo.DocumentsPdfVo">
+        select
+            dp.id,
+            dp.document_id,
+            dp.contract_code,
+            dp.data_type,
+            dp.content,
+            dp.create_user,
+            dp.create_time,
+            dp.update_user,
+            dp.update_time
+        from documents_pdf dp
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>