单证pdf

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

@@ -60,11 +60,11 @@ public class DocumentsController {
     }
 
     /**
-     * 生成pdf---商业发票
+     * 生成pdf---商业发票和装箱单
      */
-    @GetMapping("/generateInvoicePdf")
+    @GetMapping("/generateInvoiceAPackPdf")
     public Map<String,Object> generateInvoicePdf(@RequestParam("id")Long id) {
-        return documentsService.generateInvoicePdf(id);
+        return documentsService.generateInvoiceAPackPdf(id);
     }
 
 }

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

@@ -205,6 +205,11 @@ public class Contract extends BasePo {
     private Integer settlementStatus;
 
     /**
+     * 交期
+     */
+    private String deliveryTime;
+
+    /**
      * 汇率json
      * List<ContractCurrencyRate> 转 json
      * {@link com.fjhx.sale.entity.contract.bo.ContractCurrencyRate}

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

@@ -49,5 +49,5 @@ public interface DocumentsService extends BaseService<Documents> {
      * 生成PDF
      * @return
      */
-    Map<String,Object> generateInvoicePdf(Long id);
+    Map<String,Object> generateInvoiceAPackPdf(Long id);
 }

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

@@ -156,7 +156,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
      * @return
      */
     @Override
-    public Map<String, Object> generateInvoicePdf(Long id) {
+    public Map<String, Object> generateInvoiceAPackPdf(Long id) {
         Map<String,Object> map = new HashMap<>();
         //查询单证
         Documents documents = this.getById(id);
@@ -191,6 +191,10 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
             packDetailList = packDetailService.list(Wrappers.<PackDetail>query().lambda().in(PackDetail::getId, Arrays.asList(packShipment.getPackDetailIds())));
             List<Long> packDetailIds = packDetailList.stream().map(PackDetail::getId).collect(Collectors.toList());
             packDetailGoodsList = packDetailGoodsService.list(Wrappers.<PackDetailGoods>query().lambda().in(PackDetailGoods::getPackDetailId,packDetailIds));
+            Map<Long,List<PackDetailGoods>> packGoodMap = packDetailGoodsList.stream().collect(Collectors.groupingBy(PackDetailGoods::getPackDetailId));
+            for(PackDetail p:packDetailList){
+                p.setPackDetailGoodsList(packGoodMap.getOrDefault(p.getId(),null));
+            }
             sumRoughWeight = packDetailList.stream().map(PackDetail::getRoughWeight).reduce(BigDecimal.ZERO,BigDecimal::add);
             sumNetWeight = packDetailList.stream().map(PackDetail::getNetWeight).reduce(BigDecimal.ZERO,BigDecimal::add);
             sumBomVolume = packDetailList.stream().map(PackDetail::getBomVolume).reduce(BigDecimal.ZERO,BigDecimal::add);
@@ -205,7 +209,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         map.put("sumBomVolume",sumBomVolume);//总体积
         map.put("customer",customer);//买方信息
         map.put("corporation",corporation);//卖方信息
-        map.put("packDetailGoodsList",packDetailGoodsList);//装箱商品明细
+//        map.put("packDetailGoodsList",packDetailGoodsList);//装箱商品明细
         return map;
     }
 }