Browse Source

[fix] 销售管理

按照万材要求:新增导出销售出货箱单vantritek和销售出货出货箱单infinity模板,删除之前的两个模板
dev
liuxiaoxu 2 months ago
parent
commit
fe2d1ec157
  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/销售出货发票2.xlsx
  4. BIN
      ruoyi-admin/src/main/resources/static/attachments/销售出货箱单1.xlsx
  5. BIN
      ruoyi-admin/src/main/resources/static/attachments/销售出货箱单infinity.xlsx
  6. BIN
      ruoyi-admin/src/main/resources/static/attachments/销售出货箱单vantritek.xlsx
  7. 10
      ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html

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

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

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

@ -1012,7 +1012,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
@Override @Override
public void exportShippingPackingOne(String outOrderCode, HttpServletResponse response) { public void exportShippingPackingOne(String outOrderCode, HttpServletResponse response) {
String fileName = "销售出货箱单1.xlsx"; String fileName = "销售出货箱单infinity.xlsx";
try { try {
@ -1116,7 +1116,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
* */ * */
@Override @Override
public void exportShippingPackingTwo(String outOrderCode, HttpServletResponse response) { public void exportShippingPackingTwo(String outOrderCode, HttpServletResponse response) {
String fileName = "销售出货箱单2.xlsx"; String fileName = "销售出货箱单vantritek.xlsx";
try { try {

BIN
ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx

Binary file not shown.

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

Binary file not shown.

BIN
ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx → ruoyi-admin/src/main/resources/static/attachments/销售出货箱单infinity.xlsx

Binary file not shown.

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

Binary file not shown.

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

@ -63,10 +63,10 @@
</a> </a>
<a class="btn btn-success" onclick="exportShippingPackingOne()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingOne"> <a class="btn btn-success" onclick="exportShippingPackingOne()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingOne">
<i class="fa fa-download"></i> 导出销售出货箱单1 <i class="fa fa-download"></i> 导出销售出货箱单infinity
</a> </a>
<a class="btn btn-success" onclick="exportShippingPackingTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingTwo"> <a class="btn btn-success" onclick="exportShippingPackingTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingTwo">
<i class="fa fa-download"></i> 导出销售出货箱单2 <i class="fa fa-download"></i> 导出销售出货箱单vantritek
</a> </a>
<a class="btn btn-success" onclick="exportShippingInvoiceOne()" shiro:hasPermission="system:salesShippingInform:exportShippingInvoiceOne"> <a class="btn btn-success" onclick="exportShippingInvoiceOne()" shiro:hasPermission="system:salesShippingInform:exportShippingInvoiceOne">
@ -464,7 +464,7 @@
const row = selectedRows[0]; const row = selectedRows[0];
// 使用 $.modal.confirm 显示确认对话框 // 使用 $.modal.confirm 显示确认对话框
$.modal.confirm("确定导出这条数据的出货单吗?", function() { $.modal.confirm("确定导出这条数据的出货单吗?", function() {
// 如果用户点击确定,继续导出 // 如果用户点击确定,继续导出
var outOrderCode = row.outOrderCode; var outOrderCode = row.outOrderCode;
window.location.href = prefix + "/exportShippingPackingOne/" + outOrderCode; window.location.href = prefix + "/exportShippingPackingOne/" + outOrderCode;
@ -487,7 +487,7 @@
const row = selectedRows[0]; const row = selectedRows[0];
// 使用 $.modal.confirm 显示确认对话框 // 使用 $.modal.confirm 显示确认对话框
$.modal.confirm("确定导出这条数据的出货单吗?", function() { $.modal.confirm("确定导出这条数据的出货单吗?", function() {
// 如果用户点击确定,继续导出 // 如果用户点击确定,继续导出
var outOrderCode = row.outOrderCode; var outOrderCode = row.outOrderCode;
window.location.href = prefix + "/exportShippingPackingTwo/" + outOrderCode; window.location.href = prefix + "/exportShippingPackingTwo/" + outOrderCode;
@ -509,7 +509,7 @@
const row = selectedRows[0]; const row = selectedRows[0];
// 使用 $.modal.confirm 显示确认对话框 // 使用 $.modal.confirm 显示确认对话框
$.modal.confirm("确定导出这条数据的出货发票1吗?", function() { $.modal.confirm("确定导出这条数据的出货发票吗?", function() {
// 如果用户点击确定,继续导出 // 如果用户点击确定,继续导出
var outOrderCode = row.outOrderCode; var outOrderCode = row.outOrderCode;
window.location.href = prefix + "/exportShippingInvoiceOne/" + outOrderCode; window.location.href = prefix + "/exportShippingInvoiceOne/" + outOrderCode;

Loading…
Cancel
Save