优化生产制单
This commit is contained in:
parent
cce6c32bad
commit
af97c2824f
|
|
@ -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());
|
||||
|
|
|
|||
Loading…
Reference in New Issue