销售合同打印

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

@@ -42,11 +42,21 @@ public class ContractPdfInfoVo {
     private String currency;
 
     /**
+     * 卖方公司Id
+     */
+    private Long sellCorporationId;
+
+    /**
      * 卖方公司英文名称
      */
     private String sellCorporationNameEn;
 
     /**
+     * 卖方公司名称
+     */
+    private String sellCorporationName;
+
+    /**
      * 卖方联系人名称
      */
     private String sellContactName;
@@ -78,6 +88,10 @@ public class ContractPdfInfoVo {
 
 
     /**
+     * 买方公司ID
+     */
+    private Long buyCorporationId;
+    /**
      * 买方公司名称
      */
     private String buyCorporationName;
@@ -175,6 +189,11 @@ public class ContractPdfInfoVo {
      */
     private String beneficiaryAddress;
 
+    /**
+     * 预付比例
+     */
+    private String advanceRatio;
+
     @Getter
     @Setter
     public static class ProductInfo {
@@ -209,6 +228,24 @@ public class ContractPdfInfoVo {
          */
         private BigDecimal amount;
 
+
+        /**
+         * 产品备注
+         */
+        private String productRemark;
+
+        /**
+         * 产品规格
+         */
+        private String productSpec;
+
+        /**
+         * 装箱方式
+         */
+        private String packMethod;
+
+
+
     }
 
 }

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

@@ -76,4 +76,9 @@ public class EhsdPurchaseVo extends EhsdPurchase {
      * 账户
      */
     private String accountOpening;
+
+    /**
+     * 流程Id
+     */
+    private Long flowId;
 }

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

@@ -36,6 +36,7 @@ import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
+import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
@@ -1170,7 +1171,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (corporation == null) {
             throw new ServiceException("卖方公司信息为空");
         }
+        contractPdfInfoVo.setSellCorporationId(contract.getSellCorporationId());
         contractPdfInfoVo.setSellCorporationNameEn(corporation.getNameEn());
+        contractPdfInfoVo.setSellCorporationName(corporation.getName());
         contractPdfInfoVo.setSellContactName(contract.getSellContactName());
         contractPdfInfoVo.setSellContactNumber(contract.getSellContactNumber());
     }
@@ -1183,6 +1186,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (customer == null) {
             throw new ServiceException("买方公司信息为空");
         }
+        contractPdfInfoVo.setBuyCorporationId(contract.getBuyCorporationId());
         contractPdfInfoVo.setBuyCorporationName(customer.getName());
         contractPdfInfoVo.setBuyContactName(contract.getBuyContactName());
         contractPdfInfoVo.setBuyContactNumber(contract.getBuyContactNumber());
@@ -1225,6 +1229,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         contractPdfInfoVo.setDeliveryTime(contract.getDeliveryTime());
         contractPdfInfoVo.setTransportMethod(contract.getTransportMethod());
         contractPdfInfoVo.setShroffAccountId(contract.getShroffAccountId());
+        contractPdfInfoVo.setAdvanceRatio(contract.getAdvanceRatio());
     }
 
     /**
@@ -1242,13 +1247,28 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             return;
         }
 
+        List<Long> pids = contractProductList.stream().map(ContractProduct::getProductId).collect(Collectors.toList());
+        Map<Long, ProductInfo> productInfoMap = productInfoService.mapKEntity(ProductInfo::getId, q -> q.in(ProductInfo::getId, pids));
+
         List<ContractPdfInfoVo.ProductInfo> productInfoList = contractProductList.stream().map(item -> {
+            ProductInfo productInfo = productInfoMap.get(item.getProductId());
+
             ContractPdfInfoVo.ProductInfo productIndo = new ContractPdfInfoVo.ProductInfo();
             productIndo.setProductId(item.getProductId());
             productIndo.setProductQuantity(item.getQuantity());
             productIndo.setProductPrice(item.getPrice());
             productIndo.setAmount(item.getAmount());
             productIndo.setProductName(item.getProductName());
+
+            if(ObjectUtil.isNotEmpty(productInfo)) {
+                productIndo.setProductRemark(productInfo.getRemark());
+                productIndo.setProductSpec(productInfo.getSpec());
+                JSONObject ehsdJson = JSONObject.parseObject(productInfo.getEhsdJson());
+                if (ObjectUtil.isNotEmpty(ehsdJson)) {
+                    productIndo.setPackMethod(ehsdJson.getString("packMethod"));
+                }
+            }
+
             return productIndo;
         }).collect(Collectors.toList());
 

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

@@ -9,6 +9,7 @@ import com.fjhx.area.utils.CustomizeAreaUtil;
 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.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
@@ -18,6 +19,7 @@ import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
 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;
@@ -58,6 +60,8 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     private SupplierInfoService supplierInfoService;
     @Autowired
     private CorporationService corporationService;
+    @Autowired
+    private FlowExampleService flowExampleService;
 
     /**
      * 分页
@@ -79,6 +83,10 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             wrapper.keyword(dto.getKeyword(), new SqlField("t2.name"), new SqlField("t1.`code`"));
         }
         Page<EhsdPurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<EhsdPurchaseVo> records = page.getRecords();
+        //  赋值流程id
+        flowExampleService.setFlowId(records, EhsdPurchaseVo::setFlowId);
+
         return page;
     }