From 3555995d5bc75b08d06a24372aeccfaad0d3d40c Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 19 Feb 2025 10:34:00 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=A6=81=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=A1=8C=E5=92=8C=E5=85=A8=E9=83=A8=E8=A1=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=92=8C=E9=80=89=E6=8B=A9=E5=AF=BC=E5=87=BA=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BB=93=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E4=BB=93=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E9=9B=86=E5=90=88=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseStorageOrderController.java | 27 +++++++++++++---- .../VO/ExportWarehouseStorageOrderVo.java | 29 ------------------- .../WarehouseStorageOrderServiceImpl.java | 10 +++---- .../warehouse/storageOrder/storageOrder.html | 27 ++++++++++++++++- 4 files changed, 52 insertions(+), 41 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java index c7af0ff0..f49e6ae1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java @@ -4,15 +4,17 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.OutsourcePlan; import com.ruoyi.system.domain.OutsourcePlanDetail; +import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheckDetail; import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail; import com.ruoyi.warehouse.service.IWarehouseStorageOrderDetailService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; @@ -68,13 +70,26 @@ public class WarehouseStorageOrderController extends BaseController @Log(title = "仓库入库单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder) - { - List list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder); - ExcelUtil util = new ExcelUtil(WarehouseStorageOrder.class); - return util.exportExcel(list, "仓库入库单数据"); + public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder, String ids) + { + if (StringUtils.isEmpty(ids)){ + List list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder); + List exportWarehouseStorageOrderVos = warehouseStorageOrderService.exportStorageOrderList(list); + ExcelUtil util = new ExcelUtil(ExportWarehouseStorageOrderVo.class); + return util.exportExcel(exportWarehouseStorageOrderVos, "仓库入库单数据"); + }else { + String[] checkCodes = ids.split(","); + List list = warehouseStorageOrderService.selectStorageOrderListByCodes(checkCodes); + List exportWarehouseStorageOrderVos = warehouseStorageOrderService.exportStorageOrderList(list); + ExcelUtil util = new ExcelUtil(ExportWarehouseStorageOrderVo.class); + return util.exportExcel(exportWarehouseStorageOrderVos, "仓库入库单数据"); + } + + } + + /** * 新增仓库入库单 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java index 2f81e90f..46165268 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java @@ -331,33 +331,4 @@ public class ExportWarehouseStorageOrderVo { @Excel(name = "生产入库数") private Integer makeStorageNum; - /** - * 客户ID - */ - @Excel(name = "客户ID") - private String customerId; - - /** - * 客户名称 - */ - @Excel(name = "客户名称") - private String customerName; - - /** - * 客户联系人 - */ - @Excel(name = "客户联系人") - private String customerContactPeople; - - /** - * 客户联系人电话 - */ - @Excel(name = "客户联系人电话") - private String customerContactNumber; - - /** - * 客户公司地址 - */ - @Excel(name = "客户公司地址") - private String customerCompanyAddress; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index 52152a5e..c3165eba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -2247,11 +2247,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS exportVo.setTemporaryRemark(detail.getTemporaryRemark()); exportVo.setStorageLocation(detail.getStorageLocation()); exportVo.setMakeStorageNum(detail.getMakeStorageNum()); - exportVo.setCustomerId(detail.getCustomerId()); - exportVo.setCustomerName(detail.getCustomerName()); - exportVo.setCustomerContactPeople(detail.getCustomerContactPeople()); - exportVo.setCustomerContactNumber(detail.getCustomerContactNumber()); - exportVo.setCustomerCompanyAddress(detail.getCustomerCompanyAddress()); +// exportVo.setCustomerId(detail.getCustomerId()); +// exportVo.setCustomerName(detail.getCustomerName()); +// exportVo.setCustomerContactPeople(detail.getCustomerContactPeople()); +// exportVo.setCustomerContactNumber(detail.getCustomerContactNumber()); +// exportVo.setCustomerCompanyAddress(detail.getCustomerCompanyAddress()); // 从WarehouseStorageOrder填充数据，通过入库单号进行关联 WarehouseStorageOrder order = warehouseStorageOrderMap.get(detail.getWarehouseStorageCode()); diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html index 0344f76f..b12b4eb7 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html @@ -74,7 +74,7 @@ @@ -569,6 +569,31 @@ var url = ctx + 'warehouse/storageOrder/storageReturnOrderDetail/' + warehouseStorageId; $.modal.open("详情",url); }; + + + // 导出 + function exportExcel() { + var ids = $.table.selectColumns("warehouseStorageCode"); + var dataParam = $("#formId").serializeArray(); + + let tipMsg = "确定导出当前所有数据吗?"; + if ($.common.isNotEmpty(ids)) { + tipMsg = `确定导出 ${ids} 数据吗?`; + dataParam.push({ "name": "ids", "value": ids }); + } + $.modal.confirm(tipMsg, function () { + $.modal.loading("正在导出数据，请稍后..."); + $.post( prefix + "/export", dataParam, function (result) { + if (result.code === web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true; + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + } + \ No newline at end of file