From fb0ec93d82eed1f91de55a8ba3df201dbbca5f6f Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 3 Sep 2024 15:23:10 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BAtable=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=92=8Cjs=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8F=AF=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=80=E8=A1=8C=EF=BC=8C=E5=8F=AF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=20=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E9=80=89=E6=8B=A9=E8=A1=8C?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=B1=9E=E6=80=A7=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?@Excel=E6=B3=A8=E8=A7=A3=EF=BC=8C=E5=AD=97=E5=85=B8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=8A=A0=E4=B8=8A=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=95=B0=E7=BB=84=E6=9F=A5=E8=AF=A2=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=9B=86=E5=90=88=E5=90=8E=E7=AB=AF=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E6=9F=A5=E8=AF=A2=E5=8F=AF=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysSalesOrderController.java | 21 +++++- .../ruoyi/system/domain/SysCustomerQuote.java | 1 - .../ruoyi/system/domain/SysSalesOrder.java | 29 +++++++- .../system/mapper/SysSalesOrderMapper.java | 10 +++ .../system/service/ISysSalesOrderService.java | 10 +++ .../impl/SysSalesOrderServiceImpl.java | 17 +++++ .../mapper/system/SysSalesOrderMapper.xml | 58 ++++++++++++++++ .../system/salesOrder/salesOrder.html | 66 ++++++++++++++++++- 8 files changed, 205 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index dbaa3235..8b4371f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -148,6 +148,22 @@ public class SysSalesOrderController extends BaseController return getDataTable(list); } + /** + * 导出销售订单列表 + */ + + @RequiresPermissions("system:salesOrder:export") + @Log(title = "销售订单", businessType = BusinessType.EXPORT) + @PostMapping("/exportAll") + @ResponseBody + public AjaxResult exportAll(SysSalesOrderVo sysSalesOrder) + { + List list = sysSalesOrderService.selectSysSalesOrderAllList(sysSalesOrder); + ExcelUtil util = new ExcelUtil(SysSalesOrderVo.class); + return util.exportExcel(list, "销售订单数据"); + } + + /** * 导出销售订单列表 */ @@ -156,15 +172,16 @@ public class SysSalesOrderController extends BaseController @Log(title = "销售订单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(SysSalesOrderVo sysSalesOrder) + public AjaxResult export(@RequestBody String[] salesOrderCodes) { - List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrder); + List list = sysSalesOrderService.selectSysSalesOrderListByCodes(salesOrderCodes); ExcelUtil util = new ExcelUtil(SysSalesOrderVo.class); return util.exportExcel(list, "销售订单数据"); } + /** * 修改保存销售订单 * */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java index 6523fa7c..893563b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java @@ -86,7 +86,6 @@ public class SysCustomerQuote extends BaseEntity private BigDecimal usdSum; private String businessMembers; - @Excel(name = "审核标志: 0未审核 1审核成功 2审核拒绝") private String deginFlag; /** 删除标志（0代表存在 1代表删除） */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index f7f350f4..95376b8a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -21,15 +21,25 @@ public class SysSalesOrder extends BaseEntity { /* 订单id*/ private Long salesOrderId; + /*使用状态 0未使用，1使用，2已作废*/ + @Excel(name = "使用状态", dictType = "useStatus") private String useStatus; + /*审核状态 (0未审核，1审核通过，2审核拒绝)*/ + @Excel(name = "审核状态", dictType = "auditStatus") private String auditStatus; + /*出货状态（0待出货通知,1待准备货,2待出货,3部分收货,4全部收货,5部分出货,6全部出货,7部分验收,8全部验收)*/ + @Excel(name = "出货状态", dictType = "sys_delivery_status") private String deliveryStatus; + /*收款结案状态（0待收款，1部分收款，2全部收款，3已结案)*/ + @Excel(name = "收款结案状态", dictType = "sys_close_status") private String closeStatus; + /**生产状态(0待评审、1待部门主管确认、2待工程审核、3待生产、4生产中、5部分完成、6全部完成)*/ + @Excel(name = "生产状态", dictType = "sys_erp_makeStatus") private String makeStatus; /* 订单编号*/ @Excel(name = "销售订单编号") @@ -37,7 +47,7 @@ public class SysSalesOrder extends BaseEntity { /*订单号码*/ @Excel(name = "客户订单编号") private String salesOrderNumber; - @Excel(name = "订单类型") + @Excel(name = "订单类型", dictType = "sys_order_type") private String salesOrderType; /* 客户代码*/ @Excel(name = "客户代码") @@ -45,41 +55,58 @@ public class SysSalesOrder extends BaseEntity { @Excel(name="币种") private String commonCurrency; /*美元汇率*/ + @Excel(name = "美元汇率") private Double usdTax; /*税率*/ + @Excel(name = "税率") private Double taxRate; /*是否开票*/ + @Excel(name = "是否开票", dictType = "sys_whether") private String invoice; /* 客户名称*/ @Excel(name = "客户名称") private String enterpriseName; /*事业部*/ + @Excel(name = "事业部") private String customerPurser; /*客户电话*/ + @Excel(name = "客户电话") private String customerPhone; /*物料合计*/ + @Excel(name = "物料合计") private Long materialSum; /*数量合计*/ + @Excel(name = "数量合计") private Long enterpriseSum; /*不含税单价(RMB)*/ + @Excel(name = "不含税单价(RMB)") private Double noRmbPrice; /*不含税总价(RMB)*/ + @Excel(name = "不含税总价(RMB)") private Double noRmbSum; /*含税单价(RMB)*/ + @Excel(name = "含税单价(RMB)") private Double rmbPrice; /*含税总价(RMB)*/ + @Excel(name = "含税总价(RMB)") private Double rmbTaxSum; /*不含税单价(美元)*/ + @Excel(name = "不含税单价(美元)") private Double noUsdPrice; /*不含税总价(美元)*/ + @Excel(name = "不含税总价(美元)") private Double noUsdSum; /*含税单价(美元)*/ + @Excel(name = "含税单价(美元)") private Double usdPrice; /*含税总价(美元)*/ + @Excel(name = "含税总价(美元)") private Double usdTaxSum; /*计划交付时间*/ + @Excel(name = "计划交付时间") private String deliveryTime; /*客户收货人*/ + @Excel(name = "客户收货人") private String customerDelivery; /*客户收货人(Bill to)*/ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java index 066ff4cd..def16c1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java @@ -76,4 +76,14 @@ public interface SysSalesOrderMapper * @return 结果 * */ int updateSysSalesOrderBySalesOrderCode(SysSalesOrder sysSalesOrder); + + /** + * 根据销售单号数组查询销售订单集合 + * */ + List selectSysSalesOrderListByCodes(String[] salesOrderCodes); + + /** + * 导出查询所有的销售订单 + * */ + List selectSysSalesOrderAllList(SysSalesOrderVo sysSalesOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java index d47badce..b949b69d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java @@ -115,4 +115,14 @@ public interface ISysSalesOrderService * 导出销售订单数据 */ void exportSalesOrderByCode(String salesOrderCode, HttpServletResponse response); + + /** + * 根据销售单号数组查询销售订单集合 + * */ + List selectSysSalesOrderListByCodes(String[] salesOrderCodes); + + /** + * 查询所有可使用的销售订单 + * */ + List selectSysSalesOrderAllList(SysSalesOrderVo sysSalesOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index 09bbb62e..1bc12fed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -206,6 +206,23 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService return returnList; } + + /** + * 根据销售单号数组查询销售订单集合 + * */ + @Override + public List selectSysSalesOrderListByCodes(String[] salesOrderCodes) { + return sysSalesOrderMapper.selectSysSalesOrderListByCodes(salesOrderCodes); + } + + /** + * 导出查询所有的销售订单 + * */ + @Override + public List selectSysSalesOrderAllList(SysSalesOrderVo sysSalesOrder) { + return sysSalesOrderMapper.selectSysSalesOrderAllList(sysSalesOrder); + } + /** * 新增销售订单 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml index 4334a61b..facbf1f1 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml @@ -146,6 +146,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sales_order_code = #{salesOrderCode} + + + + + insert into sys_sales_order diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html index 318a9046..8eb66c8f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html @@ -185,11 +185,12 @@
- - + 导出 - + + 导出销售订单 + 添加 @@ -452,6 +453,65 @@ } + + + // 导出 + function exportExcel(formId) { + // $.table.set(); + var salesOrderCodeData = []; + var selections = $("#bootstrap-table").bootstrapTable("getSelections"); + if(selections.length === 0){ + $.modal.confirm("确定导出所有出货通知吗？", function() { + var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + var params = $("#bootstrap-table").bootstrapTable('getOptions'); + var dataParam = $("#" + currentId).serializeArray(); + dataParam.push({ "name": "orderByColumn", "value": params.sortName }); + dataParam.push({ "name": "isAsc", "value": params.sortOrder }); + $.modal.loading("正在导出数据，请稍后..."); + $.post(prefix + '/exportAll', dataParam, function(result) { + if (result.code == web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + }else { + $.modal.confirm("确定导出选中的所有出货通知吗？", function () { + //·拼接单号 + for(let i=0;i