From b5cb83f31fbd0c1ee2d148851e2838d49912d2cd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 13:01:35 +0800
Subject: [PATCH] 销售退货新增页面基本信息加上发货类型下拉框,可选货车或者快递。货车 展示发货车牌号,选择快递则展示快递公司,快递单号。对应的列表也要加上相应的字段,采购退货也是一样加下

---
 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 537c903..3b20e8f 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -7,6 +7,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.framework.web.domain.R;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.purchase.dto.PurchaseLedgerDto;
 import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -117,6 +118,16 @@
     }
 
     /**
+     * 鏌ヨ閲囪喘閫�璐у彲閫夐噰璐彴璐�
+     */
+    @GetMapping("/returnableList")
+    public TableDataInfo returnableList(PurchaseLedger purchaseLedger) {
+        startPage();
+        List<PurchaseLedger> list = purchaseLedgerService.selectReturnablePurchaseLedgerList(purchaseLedger);
+        return getDataTable(list);
+    }
+
+    /**
      * 瀵煎嚭閲囪喘鍙拌处鍒楄〃
      */
     @Log(title = "閲囪喘鍙拌处", businessType = BusinessType.EXPORT)
@@ -137,6 +148,13 @@
         return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
     }
 
+    @Operation(summary = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�")
+    @Log(title = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�", businessType = BusinessType.OTHER)
+    @PostMapping("/batchInsertPurchaseSteps")
+    public R batchInsertPurchaseSteps(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+        return purchaseLedgerService.batchInsertPurchaseSteps(purchaseLedgerDto == null ? null : purchaseLedgerDto.getIds());
+    }
+
     /**
      * 鏌ヨ閲囪喘妯℃澘
      */

--
Gitblit v1.9.3