From f4d4d29368ccacb807f93e2033cd4a643a3ddade Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 10:20:28 +0800
Subject: [PATCH] yys 1.修改bug

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java |   90 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 8e14547..bb63617 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -2,10 +2,28 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
+import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
+import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.service.ReturnManagementService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
+import com.ruoyi.sales.mapper.ShippingInfoDetailMapper;
+import com.ruoyi.sales.mapper.ShippingInfoMapper;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.ShippingInfoDetail;
 import com.ruoyi.sales.service.ISalesLedgerProductService;
+import com.ruoyi.sales.service.ShippingInfoService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -19,11 +37,13 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 浜у搧淇℃伅Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-08
  */
@@ -33,15 +53,73 @@
 {
     @Autowired
     private ISalesLedgerProductService salesLedgerProductService;
+    @Autowired
+    private ProcurementRecordService procurementRecordService;
+    @Autowired
+    private StockUtils stockUtils;
+
+    @Autowired
+    private ShippingInfoService shippingInfoService;
+
+    @Autowired
+    private ReturnManagementService returnManagementService;
+
+
+    /**
+     * 鍥炴鐧昏鍒嗛〉鏌ヨ
+     */
+    @GetMapping("/listPageSalesLedger")
+    public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
+        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
+        return AjaxResult.success(list);
+    }
+
+
+    /**
+     * 浠樻鐧昏鍒嗛〉鏌ヨ
+     */
+    @GetMapping("/listPagePurchaseLedger")
+    public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation("鍙戣揣閫�璐ф挙閿�")
+    @PostMapping("/cancelDelivery")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult cancelDelivery(@RequestBody SalesLedgerProduct salesLedgerProduct) {
+        return AjaxResult.success(salesLedgerProductService.cancelDelivery(salesLedgerProduct));
+    }
+
+
 
     /**
      * 鏌ヨ浜у搧淇℃伅鍒楄〃
      */
     @GetMapping("/list")
-    public List<SalesLedgerProduct> list(SalesLedgerProduct salesLedgerProduct)
+    public AjaxResult list(SalesLedgerProduct salesLedgerProduct)
     {
         List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
-        return list;
+        list.forEach(item -> {
+           // 鑾峰彇鍙戣揣鏁伴噺,閫�璐ф暟閲�
+           Map<String, BigDecimal> map = shippingInfoService.getNumberOfSalesLedgerProduct(item.getId());
+           item.setShippingNum(map.get("shippingNum"));
+           item.setReturnNum(map.get("returnNum"));
+            if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
+                item.setFutureTickets(item.getQuantity());
+            }
+            if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
+                item.setFutureTicketsAmount(item.getTaxInclusiveTotalPrice());
+            }
+            if (item.getApproveStatus() != 2) {
+                if (item.getHasSufficientStock() == 0) {
+                    item.setApproveStatus(0);
+                }else {
+                    item.setApproveStatus(1);
+                }
+            }
+        });
+        return AjaxResult.success(list);
     }
 
     /**
@@ -87,4 +165,10 @@
         }
         return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
     }
+
+    //鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
+    @GetMapping("/judgmentInventory")
+    public R judgmentInventory(SalesLedgerProduct salesLedgerProduct) {
+        return  salesLedgerProductService.judgmentInventory(salesLedgerProduct);
+    }
 }

--
Gitblit v1.9.3