From af97c2824f79548a8f163e7ba049d3aa7e8f7bd8 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Wed, 23 Oct 2024 23:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/service/saleorder/SaleOrderServiceImpl.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index 0999ae7..b700597 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -326,7 +326,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                         Long saleContractId = generateSaleContract(saleOrder,entrys);
 
                         String htmlContent = generateHtmlContent(saleContractId);
-                        String fileName = StrUtil.format(pdfPath+"\\销售合约_{}",
+                        String fileName = StrUtil.format(pdfPath+"/销售合约_{}",
                                 new Date().getTime());
 
                         String templatePath = fileName + ".html";
@@ -422,14 +422,14 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         CustomerDO customer = customerService.getCustomer(saleContract.getCustomerId());
         Context context = new Context();
         context.setVariable("title", "销售合约");
-        context.setVariable("partyACompany", saleContract.getPartyA());
         context.setVariable("contractNo", saleContract.getBillno());
+        context.setVariable("partyACompany", saleContract.getPartyA());
         context.setVariable("partyAAddress", customer.getCompanyAddress());
+        context.setVariable("partyBCompany", partyb);
+        context.setVariable("partyBAddress", partybAddress);
         context.setVariable("bizDate", DateUtil.date(saleContract.getBizdate()).toDateStr());
         context.setVariable("customerNo", customer.getNumber());
         context.setVariable("headUserName", saleContract.getHead());
-        context.setVariable("partyBCompany", partyb);
-        context.setVariable("partyBAddress", partybAddress);
         context.setVariable("phone", saleContract.getPhone());
         context.setVariable("fax", saleContract.getFax());
         context.setVariable("clerk", saleContract.getClerk());