From cd7538d13b0f52a06587b3961a47535c143b1c86 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Tue, 19 Aug 2025 10:52:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=92=8C=E5=87=BA=E5=BA=93=E5=8D=95=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=9A=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsOutstockDetailController 中添加 getOutstockDetailList 方法，用于查询出库单-物料列表 - 在 WmsOutstockOrderController 中添加 getOutstockOrderList 方法，用于查询出库单列表 --- .../WmsOutstockDetailController.java | 40 ++++++++++------- .../WmsOutstockOrderController.java | 43 +++++++++++-------- 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java index 680aeb3..bfa421f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java @@ -1,26 +1,26 @@ package org.dromara.wms.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; import org.dromara.wms.domain.bo.WmsOutstockDetailBo; import org.dromara.wms.domain.vo.WmsOutstockDetailVo; import org.dromara.wms.service.IWmsOutstockDetailService; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import org.springframework.web.bind.annotation.*; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import java.util.List; /** * 出库单-物料 @@ -115,4 +115,14 @@ public class WmsOutstockDetailController extends BaseController { public R removeOutstockDetailId(@PathVariable Long outstockDetailId) { return toAjax(wmsOutstockDetailService.deleteById(outstockDetailId)>0); } + + /** + * 查询出库单-物料列表 + */ + @GetMapping("/getOutstockDetailList") + public R> getOutstockDetailList(WmsOutstockDetailBo bo) { + return R.ok(wmsOutstockDetailService.queryList(bo)); + } + + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java index 0c9ad0a..e9c2b5d 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java @@ -1,27 +1,26 @@ package org.dromara.wms.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.wms.domain.WmsOutstockOrder; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; import org.dromara.wms.domain.bo.WmsOutstockOrderBo; import org.dromara.wms.domain.vo.WmsOutstockOrderVo; import org.dromara.wms.service.IWmsOutstockOrderService; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 出库单 @@ -116,4 +115,14 @@ public class WmsOutstockOrderController extends BaseController { return toAjax(wmsOutstockOrderService.approve(bo)); } + + /** + * 查询出库单列表 + */ + @GetMapping("/getOutstockOrderList") + public R> getOutstockOrderList(WmsOutstockOrderBo bo) { + return R.ok(wmsOutstockOrderService.queryList(bo)); + } + + }