From 530b456eded06e0692e1d8bd5891069439c8f8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 15:10:56 +0800
Subject: [PATCH] fix: 1.已发货的销售台账对应的出入库记录做限制不能删除;2.销售台账入库操作后,点击删除,对应的销售入库记录未一并删除;3.销售台账入库状态新增部分入库

---
 src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index 41dcdf8..bed5510 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -8,6 +8,7 @@
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
 import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
 import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
 import io.swagger.annotations.Api;
@@ -27,9 +28,8 @@
     @GetMapping("/listById")
     @ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
     @Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listById(Long warehouseId) {
-        List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
-                .eq(WarehouseGoodsShelves::getWarehouseId, warehouseId));
+    public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+        List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
         return AjaxResult.success(list);
     }
     @PostMapping("/add")
@@ -38,7 +38,7 @@
     public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
         return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
     }
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("鍟嗗搧璐ф灦-鏇存柊")
     @Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {

--
Gitblit v1.9.3