From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug
---
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index f75564e..6385144 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -1,13 +1,23 @@
package com.ruoyi.basic.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplierManageDto;
+import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.service.IPurchaseLedgerService;
+import com.ruoyi.purchase.service.impl.PurchaseLedgerServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -18,6 +28,8 @@
@Autowired
private ISupplierService supplierService;
+ @Autowired
+ private IPurchaseLedgerService purchaseLedgerService;
/**
* 渚涘簲鍟嗘柊澧�
@@ -25,7 +37,7 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody SupplierManage supplierManage) {
+ public AjaxResult add(@RequestBody SupplierManageDto supplierManage) {
supplierService.saveSupplier(supplierManage);
return AjaxResult.success();
}
@@ -60,7 +72,7 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+ public AjaxResult update(@RequestBody SupplierManageDto supplierManage) {
supplierService.supplierUpdate(supplierManage);
return AjaxResult.success();
}
@@ -85,4 +97,34 @@
public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
supplierService.supplierExport(response, supplierManageDto);
}
+
+ @PostMapping("/downloadTemplate")
+ @Log(title = "渚涘簲鍟�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<SupplierManage> util = new ExcelUtil<SupplierManage>(SupplierManage.class);
+ util.importTemplateExcel(response, "渚涘簲鍟嗘。妗堟ā鏉�");
+ }
+
+ /**
+ * 渚涘簲鍟嗗鍏�
+ */
+ @PostMapping("/import")
+ @Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
+ public AjaxResult importData(MultipartFile file) {
+ Boolean b = supplierService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
+ }
+
+
+ /**
+ * 渚涘簲鍟嗛�夐」鎺ュ彛
+ * @return
+ */
+ @GetMapping("/getOptions")
+ public AjaxResult getOptions() {
+ return AjaxResult.success(supplierService.list());
+ }
}
--
Gitblit v1.9.3