Browse Source

[fix] 销售管理

按照万材要求:新增导出销售出货单vantritek和销售出货单infinity模板,删除之前的两个模板
dev
liuxiaoxu 2 months ago
parent
commit
a25a7ff869
  1. 4
      ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java
  2. 4
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
  3. BIN
      ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx
  4. BIN
      ruoyi-admin/src/main/resources/static/attachments/销售出货单infinity.xlsx
  5. BIN
      ruoyi-admin/src/main/resources/static/attachments/销售出货单vantritek.xlsx
  6. 4
      ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html

4
ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java

@ -489,7 +489,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform
* */
@Override
public void exportShippingInfinity(String shippingInformationCode, HttpServletResponse response) {
String fileName = "销售出货单1.xlsx";
String fileName = "销售出货单vantritek.xlsx";
try {
String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
@ -568,7 +568,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform
* */
@Override
public void exportShippingVantritek(String shippingInformationCode, HttpServletResponse response) {
String fileName = "销售出货单2.xlsx";
String fileName = "销售出货单infinity.xlsx";
try {
String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);

4
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java

@ -805,7 +805,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
@Override
public void exportShippingOrderOne(String outOrderCode, HttpServletResponse response) {
String fileName = "销售出货单1.xlsx";
String fileName = "销售出货单vantritek.xlsx";
String shippingOrderCode = redisCache.generateBillNo("shd");
try {
@ -907,7 +907,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
@Override
public void exportShippingOrderTwo(String outOrderCode, HttpServletResponse response) {
String fileName = "销售出货单2.xlsx";
String fileName = "销售出货单infinity.xlsx";
String shippingOrderCode = redisCache.generateBillNo("shd");
try {

BIN
ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx

Binary file not shown.

BIN
ruoyi-admin/src/main/resources/static/attachments/销售出货单2.xlsx → ruoyi-admin/src/main/resources/static/attachments/销售出货单infinity.xlsx

Binary file not shown.

BIN
ruoyi-admin/src/main/resources/static/attachments/销售出货单vantritek.xlsx

Binary file not shown.

4
ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html

@ -56,10 +56,10 @@
</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenu2">
<a class="btn btn-success" onclick="exportShippingOrderOne()" shiro:hasPermission="system:salesShippingInform:exportShippingOrderOne">
<i class="fa fa-download"></i> 导出销售出货单1
<i class="fa fa-download"></i> 导出销售出货单vantritek
</a>
<a class="btn btn-success" onclick="exportShippingOrderTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingOrderTwo">
<i class="fa fa-download"></i> 导出销售出货单2
<i class="fa fa-download"></i> 导出销售出货单infinity
</a>
<a class="btn btn-success" onclick="exportShippingPackingOne()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingOne">

Loading…
Cancel
Save