From 4ee1fc9a73b8be12f204b8b5b6550227f79c8139 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 18 Feb 2025 16:05:23 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=A7=94=E5=A4=96=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=E5=A7=94=E5=A4=96=E7=AE=A1=E7=90=86=E5=A7=94=E5=A4=96?= =?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?=E5=A7=94=E5=A4=96=E7=AE=A1=E7=90=86=E5=A7=94=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutsourceStorageOrderController.java | 29 +++++++++++++--- .../IOutsourceStorageOrderService.java | 2 ++ .../OutsourceStorageOrderServiceImpl.java | 2 ++ .../system/outsource_storage/storage.html | 33 ++++++++++++++----- 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java index ecb48757..3fc3550e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java @@ -3,12 +3,18 @@ package com.ruoyi.system.controller; import java.util.List; import com.ruoyi.system.domain.OutsourceStorage; +import com.ruoyi.system.domain.Vo.ExportOutsourceRequisitionVo; +import com.ruoyi.system.domain.Vo.OutsourceRequisitionVO; import com.ruoyi.system.service.IOutsourceStorageOrderService; +import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo; import com.ruoyi.warehouse.domain.WarehouseStorageOrder; +import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper; +import com.ruoyi.warehouse.service.IWarehouseStorageOrderService; 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; @@ -33,6 +39,9 @@ public class OutsourceStorageOrderController extends BaseController @Autowired private IOutsourceStorageOrderService outsourceStorageOrderService ; + @Autowired + private IWarehouseStorageOrderService storageOrderService ; + @RequiresPermissions("system:storage:view") @GetMapping() public String storage() @@ -60,11 +69,23 @@ public class OutsourceStorageOrderController extends BaseController @Log(title = "委外入库", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder) + public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder, String ids) { - List list = outsourceStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder); - ExcelUtil util = new ExcelUtil(WarehouseStorageOrder.class); - return util.exportExcel(list, "委外入库数据"); + + warehouseStorageOrder.setWarehouseOrderType("3"); + if (StringUtils.isEmpty(ids)){ + List list = storageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder); + List exportWarehouseStorageOrderVos = storageOrderService.exportStorageOrderList(list); + ExcelUtil util = new ExcelUtil(ExportWarehouseStorageOrderVo.class); + return util.exportExcel(exportWarehouseStorageOrderVos, "入库单数据"); + }else { + String[] storageCodes = ids.split(","); + List list = storageOrderService.selectStorageOrderListByCodes(storageCodes); + List exportWarehouseStorageOrderVos = storageOrderService.exportStorageOrderList(list); + ExcelUtil util = new ExcelUtil(ExportWarehouseStorageOrderVo.class); + return util.exportExcel(exportWarehouseStorageOrderVos, "入库单数据"); + } + } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java index 9a7aa496..cf1676f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service; import com.ruoyi.system.domain.OutsourceStorage; +import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo; import com.ruoyi.warehouse.domain.WarehouseStorageOrder; import java.util.List; @@ -63,4 +64,5 @@ public interface IOutsourceStorageOrderService public int deleteWarehouseStorageOrderByWarehouseStorageId(Long warehouseStorageId); OutsourceStorage selectStorageOrderByWarehouseStorageCode(String warehouseStorageCode); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java index c714c260..cd7c79a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.ruoyi.system.domain.OutsourceStorageDetail; import com.ruoyi.system.mapper.OutsourceOrderDetailMapper; import com.ruoyi.system.mapper.OutsourceStorageDetailMapper; import com.ruoyi.system.service.IOutsourceStorageOrderService; +import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo; import com.ruoyi.warehouse.domain.WarehouseStorageOrder; import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail; import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper; @@ -267,4 +268,5 @@ public class OutsourceStorageOrderServiceImpl implements IOutsourceStorageOrderS outsourceStorage.setStorageDetailList(outsourceStorageDetails); return outsourceStorage; } + } diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html index 43403659..332cc8a5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html @@ -36,13 +36,6 @@ - - - - - - -
  • @@ -59,7 +52,7 @@ @@ -235,6 +228,30 @@ }; $.table.init(options); }); + + // 导出 + 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