From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期

---
 src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java                   |   31 +
 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java                                    |    3 
 src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java                            |    5 
 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java               |    5 
 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java                           |   10 
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java                                   |    5 
 src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java                                          |   11 
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java                               |    2 
 src/main/java/com/ruoyi/production/dto/DaiDto.java                                                      |  110 ++++++
 src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java                                  |   23 +
 src/main/resources/application-zyrqCopy.yml                                                             |  219 ++++++++++++
 src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java                         |   18 +
 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java                        |    4 
 src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java                                          |    8 
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml                                 |   18 
 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml                                        |    3 
 src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java                                   |   12 
 src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java                                                  |    7 
 src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java                                             |    8 
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java                                       |    2 
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java                                              |    5 
 src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java                                           |    7 
 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java                                     |    8 
 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml                              |    6 
 src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java                      |   29 +
 src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java                             |   26 +
 src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java                               |    5 
 src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java               |  111 ++++++
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java                          |    4 
 src/main/java/com/ruoyi/production/service/SalesLedgerSchedulingService.java                            |    2 
 src/main/java/com/ruoyi/purchase/dto/VatDto.java                                                        |    5 
 src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java                                         |    8 
 src/main/java/com/ruoyi/purchase/dto/InvoicePurchaseReportDto.java                                      |    9 
 src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java                   |   38 ++
 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java                                             |    1 
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java                |    2 
 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java                             |    5 
 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java |   28 +
 src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java                                                |    5 
 src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceDto.java                                 |   68 ++++
 src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java                            |   21 +
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java                       |   13 
 src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml                             |    4 
 src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java                                          |   17 +
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java                               |    2 
 src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java                             |   16 
 src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java                               |    9 
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java                                 |    2 
 src/main/java/com/ruoyi/procurementrecord/dto/Details.java                                              |   16 
 49 files changed, 932 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index af0f61b..fee8947 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -2,9 +2,11 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.aftersalesservice.dto.AfterSalesServiceDto;
 import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
 import com.ruoyi.aftersalesservice.service.AfterSalesServiceService;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -12,12 +14,16 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.purchase.dto.VatDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,6 +50,38 @@
         return AjaxResult.success(listPage);
     }
 
+    @Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("鍞悗鏈嶅姟-鍙嶉鐧昏")
+    public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        AfterSalesService afterSalesService = new AfterSalesService();
+        IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+        List<AfterSalesServiceDto> list = new ArrayList<>();
+        listPage.getRecords().forEach(item -> {
+            AfterSalesServiceDto dto = new AfterSalesServiceDto();
+            BeanUtils.copyProperties(item, dto);
+            dto.setStatusName(item.getStatus().toString());
+            list.add(dto);
+        });
+        ExcelUtil<AfterSalesServiceDto> util = new ExcelUtil<AfterSalesServiceDto>(AfterSalesServiceDto.class);
+        util.exportExcel(response, list , "鍙嶉鐧昏");
+    }
+
+    @Log(title = "鍞悗鏈嶅姟-鍞悗澶勭悊", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportTwo")
+    @ApiOperation("鍞悗鏈嶅姟-鍞悗澶勭悊")
+    public void exportTwo(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        AfterSalesService afterSalesService = new AfterSalesService();
+        IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+        listPage.getRecords().forEach(item -> {
+            item.setStatusName(item.getStatus().toString());
+        });
+        ExcelUtil<AfterSalesService> util = new ExcelUtil<AfterSalesService>(AfterSalesService.class);
+        util.exportExcel(response, listPage.getRecords() , "鍞悗澶勭悊");
+    }
+
     @PostMapping("/add")
     @ApiOperation("鍞悗鏈嶅姟-鏂板")
     @Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceDto.java
new file mode 100644
index 0000000..8a7c70b
--- /dev/null
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceDto.java
@@ -0,0 +1,68 @@
+package com.ruoyi.aftersalesservice.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @author :yys
+ * @date : 2025/11/3 11:14
+ */
+@Data
+public class AfterSalesServiceDto {
+
+    /**
+     * 鐘舵�� 1-寰呭鐞� 2-宸插鐞�
+     */
+    @ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
+    private Integer status;
+
+
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呭鐞�,2=宸插鐞�")
+    private String statusName;
+
+    /**
+     * 鐧昏浜哄悕绉�
+     */
+    @ApiModelProperty("鐧昏浜哄悕绉�")
+    @Excel(name = "鐧昏浜哄悕绉�")
+    private String checkNickName;
+
+
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    @ApiModelProperty("瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
+    private String customerName;
+
+    /**
+     * 闂鎻忚堪
+     */
+    @ApiModelProperty("闂鎻忚堪")
+    @Excel(name = "闂鎻忚堪")
+    private String proDesc;
+
+
+    /**
+     * 鍙嶉鏃ユ湡
+     */
+    @ApiModelProperty("鍙嶉鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date feedbackDate;
+
+
+    @ApiModelProperty("鍏宠仈閮ㄩ棬")
+    @Excel(name = "鍏宠仈閮ㄩ棬")
+    private String deptName;
+
+}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
index f8c459d..67ccd01 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,6 +33,10 @@
     @ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
     private Integer status;
 
+
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呭鐞�,2=宸插鐞�")
+    private String statusName;
+
     /**
      * 鐧昏浜�
      */
@@ -42,6 +47,7 @@
      * 鐧昏浜哄悕绉�
      */
     @ApiModelProperty("鐧昏浜哄悕绉�")
+    @Excel(name = "鐧昏浜哄悕绉�")
     private String checkNickName;
 
     /**
@@ -54,24 +60,28 @@
      * 澶勭悊浜哄悕绉�
      */
     @ApiModelProperty("澶勭悊浜哄悕绉�")
+    @Excel(name = "澶勭悊浜哄悕绉�")
     private String disposeNickName;
 
     /**
      * 瀹㈡埛鍚嶇О
      */
     @ApiModelProperty("瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
 
     /**
      * 闂鎻忚堪
      */
     @ApiModelProperty("闂鎻忚堪")
+    @Excel(name = "闂鎻忚堪")
     private String proDesc;
 
     /**
      * 澶勭悊缁撴灉
      */
     @ApiModelProperty("澶勭悊缁撴灉")
+    @Excel(name = "澶勭悊缁撴灉")
     private String disRes;
 
     /**
@@ -80,6 +90,7 @@
     @ApiModelProperty("鍙嶉鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private Date feedbackDate;
 
     /**
@@ -88,6 +99,7 @@
     @ApiModelProperty("澶勭悊鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private Date disDate;
 
 
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index ef046ac..33c3f72 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -1,11 +1,13 @@
 package com.ruoyi.collaborativeApproval.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 鍏憡琛�
@@ -39,6 +41,8 @@
     @ApiModelProperty("鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
     private Integer status;
 
+    private String statusName;
+
     /**
      * 鍏憡鍐呭
      */
@@ -52,6 +56,12 @@
     private Integer priority;
 
     /**
+     * 杩囨湡鏃堕棿
+     */
+    private Date expirationDate;
+
+
+    /**
      * 鍒涘缓鑰�
      */
     @TableField(fill = FieldFill.INSERT)
@@ -61,6 +71,7 @@
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
index 8f2216b..d6504a1 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -24,7 +24,18 @@
 
     @Override
     public IPage<NoticeDTO> listPage(Page page, NoticeDTO noticeDTO) {
-        return noticeMapper.listPage(page, noticeDTO);
+        IPage<NoticeDTO> noticeDTOIPage = noticeMapper.listPage(page, noticeDTO);
+        noticeDTOIPage.getRecords().forEach(item -> {
+            // 鏍规嵁杩囨湡鏃堕棿鍒ゆ柇statusName
+            if (item.getExpirationDate() == null) {
+                item.setStatusName("鏈煡");
+            }else if(item.getExpirationDate().getTime() < System.currentTimeMillis()){
+                item.setStatusName("宸茶繃鏈�");
+            } else{
+                item.setStatusName("姝ｅ父");
+            }
+        });
+        return noticeDTOIPage;
     }
 
     @Override
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 92dd71a..6cd3316 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -21,7 +21,7 @@
     @ApiModelProperty("瑙勬牸鍨嬪彿")
     private String deviceModel;
 
-    @Excel(name = "璁″垝淇濆吇鏃ユ湡")
+    @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
     private Date maintenancePlanTime;
 
@@ -30,7 +30,7 @@
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    @Excel(name = "瀹為檯淇濆吇鏃ユ湡")
+    @Excel(name = "瀹為檯淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     private LocalDateTime maintenanceActuallyTime;
 
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
@@ -42,11 +42,11 @@
     private String status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
-    @Excel(name = "褰曞叆鏃堕棿")
+    @Excel(name = "褰曞叆鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     private Date createTime;
 
     @ApiModelProperty("鍒涘缓浜�")
-    @Excel(name = "褰曞叆浜�")
+//    @Excel(name = "褰曞叆浜�")
     private String createUser;
 
 }
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 958db15..a1b15f3 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -22,7 +22,7 @@
     private String deviceModel;
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
-    @Excel(name = "鎶ヤ慨鏃堕棿")
+    @Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date repairTime;
 
     @ApiModelProperty("鎶ヤ慨浜�")
@@ -38,7 +38,7 @@
     private String maintenanceName;
 
     @ApiModelProperty("缁翠慨鏃堕棿")
-    @Excel(name = "缁翠慨鏃堕棿")
+    @Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date maintenanceTime;
 
     @ApiModelProperty("缁翠慨缁撴灉")
@@ -50,10 +50,10 @@
     private String statusStr;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
-    @Excel(name = "褰曞叆鏃堕棿")
+    @Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDateTime createTime;
 
-    @Excel(name = "褰曞叆浜�")
+//    @Excel(name = "褰曞叆浜�")
     @ApiModelProperty("鍒涘缓浜�")
     private String createUser;
 
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 9c92254..011d32b 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -54,17 +54,13 @@
 
     @Override
     public void export(HttpServletResponse response, Long[] ids) {
-        ArrayList<Long> arrayList = new ArrayList<>();
-        Arrays.stream(ids).map(id -> {
-            return arrayList.add( id);
-        });
-        List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectBatchIds(arrayList);
+        List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectList(null);
         ArrayList<DeviceMaintenanceExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
-        supplierManageList.stream().forEach(deviceMaintenance -> {
+        supplierManageList.forEach(deviceMaintenance -> {
             DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
             BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
             deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : "瀹岀粨");
-            deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
+            deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() != null && deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
 
             deviceLedgerExeclDtos.add(deviceRepairExeclDto);
         });
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index ddda227..fad06fa 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -66,8 +66,11 @@
     @PostMapping("/export")
     @ApiOperation("瀵煎嚭鐢ㄧ數鏃舵")
     public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        EnergyPeriod energyPeriod = new EnergyPeriod();
+        IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
         ExcelUtil<EnergyPeriod> util = new ExcelUtil<EnergyPeriod>(EnergyPeriod.class);
-        util.exportExcel(response, null , "鐢ㄧ數鏃舵鏁版嵁");
+        util.exportExcel(response, listPage.getRecords() , "鐢ㄧ數鏃舵鏁版嵁");
     }
 
 }
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index 5dc5686..dedd340 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -6,6 +6,7 @@
 import com.ruoyi.basic.pojo.Customer;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.equipmentenergyconsumption.dto.EquipmentEnergyConsumptionDto;
 import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
 import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -14,12 +15,14 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 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.ArrayList;
 import java.util.List;
 
 /**
@@ -93,8 +96,11 @@
     @PostMapping("/export")
     @ApiOperation("瀵煎嚭璁惧鑳借��")
     public void export(HttpServletResponse response) {
+        Page page = new Page<>(-1,-1);
+        EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+        IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
         ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
-        util.exportExcel(response, null , "瀹㈡埛妗ｆ鏁版嵁");
+        util.exportExcel(response, listPage.getRecords() , "瀵煎嚭璁惧鑳借��");
     }
 
     @GetMapping("/listPageByTrend")
@@ -105,6 +111,26 @@
         return AjaxResult.success(listPage);
     }
 
+    /**
+     * 瀵煎嚭鑳芥簮瓒嬪娍
+     */
+    @Log(title = "瀵煎嚭鑳芥簮瓒嬪娍", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportTwo")
+    @ApiOperation("瀵煎嚭鑳芥簮瓒嬪娍")
+    public void exportTwo(HttpServletResponse response) {
+        Page page = new Page<>(-1,-1);
+        EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+        IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
+        List<EquipmentEnergyConsumptionDto> list = new ArrayList<>();
+        listPage.getRecords().forEach(item -> {
+            EquipmentEnergyConsumptionDto dto = new EquipmentEnergyConsumptionDto();
+            BeanUtils.copyProperties(item, dto);
+            list.add(dto);
+        });
+        ExcelUtil<EquipmentEnergyConsumptionDto> util = new ExcelUtil<EquipmentEnergyConsumptionDto>(EquipmentEnergyConsumptionDto.class);
+        util.exportExcel(response, list , "瀵煎嚭鑳芥簮瓒嬪娍");
+    }
+
 
 
 }
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java
new file mode 100644
index 0000000..15689d0
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java
@@ -0,0 +1,111 @@
+package com.ruoyi.equipmentenergyconsumption.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @author :yys
+ * @date : 2025/11/3 15:22
+ */
+@Data
+public class EquipmentEnergyConsumptionDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 璁惧缂栧彿
+     */
+    @ApiModelProperty("璁惧缂栧彿")
+    @Excel(name = "瑙勬牸鍨嬪彿")
+    private String code;
+
+    /**
+     * 璁惧鍚嶇О
+     */
+    @ApiModelProperty("璁惧鍚嶇О")
+    @Excel(name = "璁惧鍚嶇О")
+    private String name;
+
+    /**
+     * 棰濆畾鍔熺巼
+     */
+    @ApiModelProperty("棰濆畾鍔熺巼")
+//    @Excel(name = "棰濆畾鍔熺巼")
+    private String powerRating;
+
+    /**
+     * 瀹為檯鍔熺巼
+     */
+    @ApiModelProperty("瀹為檯鍔熺巼")
+//    @Excel(name = "瀹為檯鍔熺巼")
+    private String powerActual;
+
+
+    /**
+     * 褰撴棩鐢ㄧ數閲�
+     */
+    @ApiModelProperty("褰撴棩鐢ㄧ數閲�")
+//    @Excel(name = "褰撴棩鐢ㄧ數閲�")
+    private BigDecimal dayNum;
+
+    /**
+     * 鏄ㄧ敤鐢甸噺
+     */
+    @ApiModelProperty("鏄ㄧ敤鐢甸噺")
+    @TableField(exist = false)
+    @Excel(name = "鏄ㄧ敤鐢甸噺")
+    private BigDecimal toDayNum;
+
+    /**
+     * 鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級
+     */
+    @ApiModelProperty("鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
+    @TableField(exist = false)
+    @Excel(name = "鏈湀骞冲潎鐢甸噺")
+    private BigDecimal avgNum;
+
+
+    /**
+     * 瓒嬪娍
+     */
+    @ApiModelProperty("瓒嬪娍")
+    @TableField(exist = false)
+    @Excel(name = "瓒嬪娍")
+    private String trend;
+
+    /**
+     * 绱鐢ㄧ數閲�
+     */
+    @ApiModelProperty("绱鐢ㄧ數閲�")
+//    @Excel(name = "绱鐢ㄧ數閲�")
+    private BigDecimal sumNum;
+    /**
+     * 杩愯鏃堕棿
+     */
+    @ApiModelProperty("杩愯鏃堕棿")
+    @Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date runDate;
+
+    /**
+     * 姣忔棩闄愬埗鐢甸噺
+     */
+    @ApiModelProperty("姣忔棩闄愬埗鐢甸噺")
+//    @Excel(name = "姣忔棩闄愬埗鐢甸噺")
+    private BigDecimal everyNum;
+
+
+}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index baba550..20c9e8f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -18,7 +18,7 @@
      * 鏃ユ湡
      */
     @ApiModelProperty("鏃ユ湡")
-    @Excel(name = "鏃ユ湡")
+    @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date date;
     /**
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index a32dd4b..ce8e057 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -2,9 +2,11 @@
 
 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.controller.BaseController;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
+import com.ruoyi.inspectiontask.dto.TimingTaskDto;
 import com.ruoyi.inspectiontask.pojo.InspectionTask;
 import com.ruoyi.inspectiontask.service.InspectionTaskService;
 import io.swagger.annotations.Api;
@@ -13,6 +15,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author :yys
@@ -36,6 +40,20 @@
         return R.ok(list);
     }
 
+
+    /**
+     * 瀵煎嚭
+     */
+    @PostMapping("/export")
+    @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
+    public void export(HttpServletResponse response) {
+        Page page = new Page<>(-1,-1);
+        InspectionTaskDto timingTask = new InspectionTaskDto();
+        IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,timingTask);
+        ExcelUtil<InspectionTaskDto> util = new ExcelUtil<>(InspectionTaskDto.class);
+        util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟璁板綍");
+    }
+
     /**
      * 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
      */
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
index 6b80e1b..e802ccc 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
@@ -2,6 +2,7 @@
 
 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.controller.BaseController;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.inspectiontask.dto.TimingTaskDto;
@@ -13,6 +14,8 @@
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author :yys
@@ -38,6 +41,19 @@
     }
 
     /**
+     * 瀵煎嚭
+     */
+    @PostMapping("/export")
+    @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟")
+    public void export(HttpServletResponse response) {
+        Page page = new Page<>(-1,-1);
+        TimingTaskDto timingTask = new TimingTaskDto();
+        IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page,timingTask);
+        ExcelUtil<TimingTaskDto> util = new ExcelUtil<>(TimingTaskDto.class);
+        util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟");
+    }
+
+    /**
      * 瀹氭椂宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
      */
     @PostMapping("/addOrEditTimingTask")
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index a94776a..d6fc797 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +28,7 @@
     private Long id;
 
     @ApiModelProperty(value = "璁惧鍚嶇О")
+    @Excel(name = "宸℃浠诲姟鍚嶇О")
     private String taskName;
 
     @ApiModelProperty(value = "璁惧id")
@@ -36,21 +38,26 @@
     private String inspectorId;
 
     @ApiModelProperty(value = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+    @Excel(name = "鎵ц宸℃浜哄憳")
     private String inspector;
 
     @ApiModelProperty(value = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+    @Excel(name = "澶囨敞")
     private String remarks;
 
     @ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
     private Long registrantId;
 
     @ApiModelProperty(value = "浠诲姟鐧昏浜哄鍚�")
+    @Excel(name = "鐧昏浜�")
     private String registrant;
 
     @ApiModelProperty(value = "棰戞")
+    @Excel(name = "棰戞")
     private String frequencyType;
 
     @ApiModelProperty(value = "鏃堕棿缁嗚妭")
+    @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
     private String frequencyDetail;
 
     @ApiModelProperty(value = "宸℃鍦扮偣璇︾粏鎻忚堪")
@@ -67,6 +74,7 @@
     @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index f9bf88e..8d03b06 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,21 +32,25 @@
     private Long id;
 
     @ApiModelProperty(value = "璁惧鍚嶇О")
+    @Excel(name = "宸℃浠诲姟鍚嶇О")
     private String taskName;
 
     @ApiModelProperty(value = "璁惧id")
     private Integer taskId;
 
     @ApiModelProperty(value = "宸℃浜�")
+    @Excel(name = "鎵ц宸℃浜�")
     private String inspectorIds;
 
     @ApiModelProperty(value = "宸℃鍦扮偣")
     private String inspectionLocation;
 
     @ApiModelProperty(value = "棰戞")
+    @Excel(name = "棰戞")
     private String frequencyType;
 
     @ApiModelProperty(value = "棰戞璇︽儏")
+    @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
     private String frequencyDetail;
 
     @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
@@ -58,15 +63,18 @@
     private boolean isActive;
 
     @ApiModelProperty(value = "澶囨敞")
+    @Excel(name = "澶囨敞")
     private String remarks;
 
     @ApiModelProperty(value = "鐧昏浜篿d")
     private Long registrantId;
 
     @ApiModelProperty(value = "鐧昏浜�")
+    @Excel(name = "鐧昏浜�")
     private String registrant;
 
     @ApiModelProperty(value = "鐧昏鏃ユ湡")
+    @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDate registrationDate;
 
     @ApiModelProperty(value = "鐘舵��")
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
index 510b62d..b2e5a21 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -1,24 +1,16 @@
 package com.ruoyi.procurementrecord.dto;
 
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 /**
  * @author :yys
  * @date : 2025/7/7 16:17
  */
+@Data
 public class Details {
     private Integer id;
     private BigDecimal inboundQuantity;
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    public BigDecimal getInboundQuantity() {
-        return inboundQuantity;
-    }
-    public void setInboundQuantity(BigDecimal inboundQuantity) {
-        this.inboundQuantity = inboundQuantity;
-    }
+    private BigDecimal warnNum;
 }
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java
index 7864f93..d8004b4 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java
@@ -20,6 +20,8 @@
 
     private Integer recordId;
 
+    private BigDecimal warnNum;
+
     /**
      * 鍏ュ簱鏁伴噺
      */
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 387a8b5..4f3f260 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -40,6 +40,9 @@
     @Excel(name = "鍏ュ簱鏁伴噺")
     private BigDecimal inboundNum;
 
+    @Excel(name = "棰勮鏁伴噺")
+    private BigDecimal warnNum;
+
     /**
      * 寰呭嚭搴撴暟閲�
      */
@@ -54,6 +57,8 @@
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime createTime;
 
+    private String timeStr;
+
     /**
      * 鍑哄叆搴撴椂闂�
      */
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 5d4810d..9592ad1 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -25,6 +25,8 @@
     @Excel(name = "鍏ュ簱鎵规")
     private String inboundBatches;
 
+    private BigDecimal warnNum;
+
     /**
      * 鍚堝悓鍙�
      */
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index f353897..55ceb9c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -19,6 +19,8 @@
 
     private Integer id;
 
+    private BigDecimal warnNum;
+
     /**
      * 鍑哄叆搴撴暟閲�
      */
@@ -32,6 +34,8 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
+    private String timeStr;
+
     @Excel(name = "鍑哄簱鏃堕棿")
     private String time;
 
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
index 153884e..82e02f1 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
@@ -14,6 +14,8 @@
 
     private Integer id;
 
+    private BigDecimal warnNum;
+
     private BigDecimal quantityStock;
 
     private List<Integer> ids;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index a0f73d9..28cee3c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -35,6 +35,11 @@
      * 鍏ュ簱鏁伴噺
      */
     private BigDecimal inboundNum;
+
+    /**
+     * 棰勮鏁伴噺
+     */
+    private BigDecimal warnNum;
 //    /**
 //     * 鏈�浣庡簱瀛樻暟閲�
 //     */
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 7b7f623..1675069 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -103,6 +103,7 @@
     public int updatePro(ProcurementUpdateDto procurementDto) {
         ProcurementRecordStorage procurementRecordStorageById = getProcurementRecordById(procurementDto.getId());
         procurementRecordStorageById.setInboundNum(procurementDto.getQuantityStock());
+        procurementRecordStorageById.setWarnNum(procurementDto.getWarnNum());
         procurementRecordStorageById.setUpdateUser(SecurityUtils.getLoginUser().getUserId());
         procurementRecordStorageById.setUpdateTime(LocalDateTime.now());
         return procurementRecordMapper.updateById(procurementRecordStorageById);
@@ -348,6 +349,7 @@
                     .salesLedgerProductId(detail.getId())
                     .inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
                     .inboundNum(detail.getInboundQuantity())
+                    .warnNum(detail.getWarnNum())
                     .createTime(LocalDateTime.now())
                     .createUser(loginUser.getUserId())
                     .updateTime(LocalDateTime.now())
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java
index 22b96b4..5ca3bc2 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java
@@ -2,6 +2,7 @@
 
 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.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -52,6 +53,17 @@
         salesLedgerSchedulingService.export(response);
     }
 
+
+    /**
+     * 瀵煎嚭
+     * @param response
+     */
+    @PostMapping("/exportOne")
+    @ApiOperation("鐢熶骇绠＄悊-鐢熶骇娲惧伐-瀵煎嚭")
+    public void exportOne(HttpServletResponse response) {
+        salesLedgerSchedulingService.exportOne(response);
+    }
+
     @PostMapping("/productionDispatch")
     @Log(title = "鐢熶骇绠＄悊-鐢熶骇璁㈠崟-鐢熶骇娲惧伐", businessType = BusinessType.INSERT)
     @ApiOperation("鐢熶骇绠＄悊-鐢熶骇璁㈠崟-鐢熶骇娲惧伐")
@@ -69,6 +81,23 @@
         return AjaxResult.success(result);
     }
 
+    /**
+     * 瀵煎嚭
+     * @param response
+     */
+    @PostMapping("/exportTwo")
+    @ApiOperation("鐢熶骇绠＄悊-宸ュ簭鎺掍骇-瀵煎嚭")
+    public void exportTwo(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        SalesLedgerSchedulingProcessDto salesLedgerSchedulingDto = new SalesLedgerSchedulingProcessDto();
+        IPage<SalesLedgerSchedulingProcessDto> result = salesLedgerSchedulingService.listPageProcess(page,salesLedgerSchedulingDto);
+        result.getRecords().forEach(item -> {
+            item.setStatusName(item.getStatus().toString());
+        });
+        ExcelUtil<SalesLedgerSchedulingProcessDto> util = new ExcelUtil<>(SalesLedgerSchedulingProcessDto.class);
+        util.exportExcel(response, result.getRecords(), "宸ュ簭鎺掍骇");
+    }
+
 
     @DeleteMapping("/productionDispatchDelete")
     @Log(title = "鐢熶骇绠＄悊-宸ュ簭鎺掍骇-鍙栨秷鎺掍骇", businessType = BusinessType.DELETE)
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
index 866970e..4051ecf 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
@@ -2,12 +2,14 @@
 
 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.aspectj.lang.annotation.Log;
 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.production.dto.ProcessSchedulingDto;
 import com.ruoyi.production.dto.ProductionReportDto;
+import com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto;
 import com.ruoyi.production.dto.SalesLedgerWorkDto;
 import com.ruoyi.production.pojo.SalesLedgerWork;
 import com.ruoyi.production.service.SalesLedgerWorkService;
@@ -18,6 +20,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -41,6 +44,24 @@
         return AjaxResult.success(listPage);
     }
 
+    /**
+     * 瀵煎嚭
+     * @param response
+     */
+    @PostMapping("/export")
+    @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鎶ュ伐-瀵煎嚭")
+    public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        SalesLedgerWorkDto salesLedgerSchedulingDto = new SalesLedgerWorkDto();
+        IPage<SalesLedgerWorkDto> result = salesLedgerWorkService.listPage(page,salesLedgerSchedulingDto);
+        result.getRecords().forEach(item -> {
+            item.setDaiNum(item.getFinishedNum().subtract(item.getSchedulingNum()));
+            item.setStatusName(item.getStatus().toString());
+        });
+        ExcelUtil<SalesLedgerWorkDto> util = new ExcelUtil<>(SalesLedgerWorkDto.class);
+        util.exportExcel(response, result.getRecords(), "宸ュ簭鎺掍骇");
+    }
+
     @GetMapping("/list")
     @Log(title = "鐢熶骇鎶ュ伐-鏌ヨ", businessType = BusinessType.OTHER)
     @ApiOperation("鐢熶骇鎶ュ伐-鏌ヨ")
diff --git a/src/main/java/com/ruoyi/production/dto/DaiDto.java b/src/main/java/com/ruoyi/production/dto/DaiDto.java
new file mode 100644
index 0000000..86853cb
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/DaiDto.java
@@ -0,0 +1,110 @@
+package com.ruoyi.production.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author :yys
+ * @date : 2025/11/3 9:35
+ */
+@Data
+public class DaiDto{
+
+    @Excel(name = "寰呮帓鏁伴噺")
+    private BigDecimal daiNum;
+
+    @ApiModelProperty(value = "閿�鍞骇鍝両D")
+    private Long salesLedgerProductId;
+
+    @ApiModelProperty(value = "閿�鍞彴璐D")
+    private Long salesLedgerId;
+
+    /**
+     * 閿�鍞悎鍚屽彿
+     */
+    @Excel(name = "閿�鍞悎鍚屽彿")
+    @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+    private String salesContractNo;
+
+    /**
+     * 瀹㈡埛鍚堝悓鍙�
+     */
+    @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+    @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+    private String customerContractNo;
+
+    /**
+     * 椤圭洰鍚嶇О
+     */
+    @Excel(name = "椤圭洰鍚嶇О")
+    @ApiModelProperty(value = "椤圭洰鍚嶇О")
+    private String projectName;
+
+    /**
+     * 褰曞叆鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "褰曞叆鏃ユ湡")
+    private Date entryDate;
+
+    @ApiModelProperty(value = "褰曞叆鏃ユ湡寮�濮�")
+    private String entryDateStart;
+
+    @ApiModelProperty(value = "褰曞叆鏃ユ湡缁撴潫")
+    private String entryDateEnd;
+
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    @Excel(name = "瀹㈡埛鍚嶇О")
+    @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+    private String customerName;
+
+
+    /**
+     * 浜у搧澶х被
+     */
+    @Excel(name = "浜у搧澶х被")
+    @ApiModelProperty(value = "浜у搧澶х被")
+    private String productCategory;
+
+    /**
+     * 瑙勬牸鍨嬪彿
+     */
+    @Excel(name = "瑙勬牸鍨嬪彿")
+    @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+    private String specificationModel;
+
+    /**
+     * 鍗曚綅
+     */
+    @Excel(name = "鍗曚綅")
+    @ApiModelProperty(value = "鍗曚綅")
+    private String unit;
+
+    /**
+     * 鏁伴噺
+     */
+    @Excel(name = "鏁伴噺")
+    @ApiModelProperty(value = "鏁伴噺")
+    private BigDecimal quantity;
+
+    /**
+     * 鎺掍骇鏁伴噺
+     */
+    @Excel(name = "鎺掍骇鏁伴噺")
+    @ApiModelProperty(value = "鎺掍骇鏁伴噺")
+    private BigDecimal schedulingNum;
+
+    @ApiModelProperty(value = "绉熸埛ID")
+    private Long tenantId;
+
+}
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
index accffb0..4e606a1 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
@@ -113,6 +113,9 @@
     @ApiModelProperty(value = "瀹屽伐鏁伴噺")
     private BigDecimal successNum;
 
+    @Excel(name = "鐘舵��")
+    private String status;
+
     @ApiModelProperty(value = "绉熸埛ID")
     private Long tenantId;
 
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 45e6148..8952455 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -96,9 +96,11 @@
     /**
      * 鐘舵��
      */
-    @Excel(name = "鐘舵��")
     @ApiModelProperty(value = "鐘舵��")
     private Integer status;
+
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呮帓浜�,2=鎺掍骇涓�,3=宸叉帓浜�")
+    private String statusName;
 
     /**
      * 娲惧伐浜�
@@ -125,6 +127,7 @@
      * 宸叉帓浜ф暟閲�
      */
     @ApiModelProperty(value = "宸叉帓浜ф暟閲�")
+    @Excel(name = "宸叉帓浜ф暟閲�")
     private BigDecimal successNum;
 
     private Long tenantId;
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
index a241cca..055f2a8 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -1,5 +1,6 @@
 package com.ruoyi.production.dto;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +28,7 @@
      * 鎺掍骇浜哄悕绉�
      */
     @ApiModelProperty(value = "鎺掍骇浜哄悕绉�")
+    @Excel(name = "鎺掍骇浜�")
     private String schedulingUserName;
 
 
@@ -34,13 +36,22 @@
      * 鎺掍骇鏁伴噺
      */
     @ApiModelProperty(value = "鎺掍骇鏁伴噺")
+    @Excel(name = "鎺掍骇鏁伴噺")
     private BigDecimal schedulingNum;
 
     /**
      * 鐢熶骇鏁伴噺
      */
     @ApiModelProperty(value = "鐢熶骇鏁伴噺")
+    @Excel(name = "鐢熶骇鏁伴噺")
     private BigDecimal finishedNum;
+
+    /**
+     * 寰呯敓浜ф暟閲�
+     */
+    @ApiModelProperty(value = "寰呯敓浜ф暟閲�")
+    @Excel(name = "寰呯敓浜ф暟閲�")
+    private BigDecimal daiNum;
 
     /**
      * 宸ユ椂瀹氶
@@ -52,11 +63,13 @@
      * 宸ュ簭
      */
     @ApiModelProperty(value = "宸ュ簭")
+    @Excel(name = "宸ュ簭")
     private String process;
     /**
      * 鎺掍骇鏃ユ湡
      */
     @ApiModelProperty(value = "鎺掍骇鏃ユ湡")
+    @Excel(name = "鎺掍骇鏃ユ湡")
     private String schedulingDate;
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
@@ -70,4 +83,8 @@
     @ApiModelProperty(value = "鎶ュ伐鐘舵��")
     private Integer status;
 
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呯敓浜�,2=鐢熶骇涓�,3=宸叉姤宸�")
+    private String statusName;
+
+
 }
diff --git a/src/main/java/com/ruoyi/production/service/SalesLedgerSchedulingService.java b/src/main/java/com/ruoyi/production/service/SalesLedgerSchedulingService.java
index 484bd23..2387e87 100644
--- a/src/main/java/com/ruoyi/production/service/SalesLedgerSchedulingService.java
+++ b/src/main/java/com/ruoyi/production/service/SalesLedgerSchedulingService.java
@@ -29,4 +29,6 @@
     int productionDispatchDelete(List<Long> ids);
 
     int processScheduling(List<ProcessSchedulingDto> processSchedulingDto);
+
+    void exportOne(HttpServletResponse response);
 }
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
index 103d809..4f60b7e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -6,10 +6,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
-import com.ruoyi.production.dto.ProcessSchedulingDto;
-import com.ruoyi.production.dto.ProductionDispatchAddDto;
-import com.ruoyi.production.dto.SalesLedgerSchedulingDto;
-import com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto;
+import com.ruoyi.production.dto.*;
 import com.ruoyi.production.mapper.SalesLedgerSchedulingMapper;
 import com.ruoyi.production.mapper.SalesLedgerWorkMapper;
 import com.ruoyi.production.pojo.SalesLedgerScheduling;
@@ -19,6 +16,7 @@
 import com.ruoyi.project.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -26,6 +24,7 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -61,6 +60,12 @@
                     .filter(j -> j.getSalesLedgerProductId().equals(i.getSalesLedgerProductId()))
                     .map(SalesLedgerWork::getFinishedNum)
                     .reduce(BigDecimal.ZERO, BigDecimal::add));
+            // 鐘舵�� = 鏁伴噺鍜屽畬宸ユ暟閲忔瘮杈�
+            if(i.getSchedulingNum().compareTo(i.getSuccessNum()) == 0){
+                i.setStatus("宸插畬鎴�");
+            }else{
+                i.setStatus("鏈畬鎴�");
+            }
         });
         return list;
     }
@@ -175,4 +180,22 @@
         }
         return 0;
     }
+
+    @Override
+    public void exportOne(HttpServletResponse response) {
+        List<SalesLedgerSchedulingDto> list = salesLedgerSchedulingMapper.list();
+        if(CollectionUtils.isEmpty(list)){
+            throw new RuntimeException("鏃犲鍑烘暟鎹�");
+        }
+        List<DaiDto> dais = new ArrayList<>();
+        list.forEach(i -> {
+            DaiDto daiDto = new DaiDto();
+            BeanUtils.copyProperties(i, daiDto);
+            // 鑾峰彇寰呮帓浜ф暟閲�
+            daiDto.setDaiNum(daiDto.getQuantity().subtract(i.getSchedulingNum()));
+            dais.add(daiDto);
+        });
+        ExcelUtil<DaiDto> util = new ExcelUtil<>(DaiDto.class);
+        util.exportExcel(response, dais, "鐢熶骇娲惧伐");
+    }
 }
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index 5f62c97..3df034f 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -2,6 +2,7 @@
 
 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.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -9,13 +10,17 @@
 import com.ruoyi.purchase.dto.VatDto;
 import com.ruoyi.purchase.pojo.InvoicePurchase;
 import com.ruoyi.purchase.service.IInvoicePurchaseService;
+import com.ruoyi.waterrecord.pojo.WaterRecord;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
@@ -34,10 +39,31 @@
         return AjaxResult.success(result);
     }
 
+    @Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭")
+    public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        InvoicePurchaseReportDto waterRecord = new InvoicePurchaseReportDto();
+        IPage<InvoicePurchaseReportDto> listPage = invoicePurchaseService.listPurchaseReport(page, waterRecord);
+        ExcelUtil<InvoicePurchaseReportDto> util = new ExcelUtil<InvoicePurchaseReportDto>(InvoicePurchaseReportDto.class);
+        util.exportExcel(response, listPage.getRecords() , "椤圭洰鍒╂鼎瀵煎嚭");
+    }
+
     @Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.OTHER)
     @GetMapping("/listVat")
     public AjaxResult listVat(Page page,String month) {
         IPage<VatDto> result = invoicePurchaseService.listVat(page, month);
         return AjaxResult.success(result);
     }
+
+    @Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportTwo")
+    @ApiOperation("閲囪喘鎶ヨ〃-澧炲�肩◣姣斿")
+    public void exportTwo(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        IPage<VatDto> result = invoicePurchaseService.listVat(page, null);
+        ExcelUtil<VatDto> util = new ExcelUtil<VatDto>(VatDto.class);
+        util.exportExcel(response, result.getRecords() , "澧炲�肩◣姣斿");
+    }
 }
diff --git a/src/main/java/com/ruoyi/purchase/dto/InvoicePurchaseReportDto.java b/src/main/java/com/ruoyi/purchase/dto/InvoicePurchaseReportDto.java
index f9b8657..45347ad 100644
--- a/src/main/java/com/ruoyi/purchase/dto/InvoicePurchaseReportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/InvoicePurchaseReportDto.java
@@ -1,5 +1,6 @@
 package com.ruoyi.purchase.dto;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
 
 /**
@@ -9,24 +10,32 @@
 public class InvoicePurchaseReportDto {
 
     //閿�鍞悎鍚屽彿
+    @Excel(name = "閿�鍞悎鍚屽彿")
     private String customerContractNo;
 //    瀹㈡埛鍚嶇О
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
 //    椤圭洰鍚嶇О
+    @Excel(name = "椤圭洰鍚嶇О")
     private String projectName;
 //    鍚堝悓閲戦
+    @Excel(name = "鍚堝悓閲戦")
     private String contractAmount;
 //    閲囪喘閲戦
+    @Excel(name = "閲囪喘閲戦")
     private String purchaseAmount;
 
     private String saleTaxExclusiveTotalPrice;
 
     private String taxExclusiveTotalPrice;
 //    鍒╂鼎
+    @Excel(name = "鍒╂鼎")
     private String balance;
     //    鍒╂鼎鐜�
+    @Excel(name = "鍒╂鼎鐜�")
     private String balanceRatio;
     //    澧炲�肩◣
+    @Excel(name = "澧炲�肩◣")
     private String balanceAmount;
 
 }
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 547861e..7cc660c 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -28,6 +28,7 @@
     private String purchaseContractNumber;
 
 
+
     /**
      * 渚涘簲鍟嗗悕绉癷d
      */
diff --git a/src/main/java/com/ruoyi/purchase/dto/VatDto.java b/src/main/java/com/ruoyi/purchase/dto/VatDto.java
index 8eb273a..c70ebeb 100644
--- a/src/main/java/com/ruoyi/purchase/dto/VatDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/VatDto.java
@@ -1,5 +1,6 @@
 package com.ruoyi.purchase.dto;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,14 +10,18 @@
 public class VatDto {
 
     //鏈堜唤
+    @Excel(name = "鏈堜唤")
     private String month ;
 
     //杩涢」绋�
+    @Excel(name = "杩涢」绋庨")
     private BigDecimal jTaxAmount;
 
     //閿�椤圭◣
+    @Excel(name = "閿�椤圭◣棰�")
     private BigDecimal xTaxAmount;
 
+    @Excel(name = "閿�-杩�")
     private BigDecimal taxAmount;
 
 }
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index 7428b0b..e79796a 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -28,6 +28,13 @@
     private Long id;
 
     /**
+     * 鐘舵��
+     */
+    @Excel(name = "鐘舵��")
+    @TableField(exist = false)
+    private String statusName;
+
+    /**
      * 閲囪喘鍙拌处id
      */
     private Long purchaseLedgerId;
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index 8fc333d..f696be7 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -369,6 +369,10 @@
                 ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size());
             }
         }
+        ticketRegistrationIPage.getRecords().forEach(item -> {
+            // 宸蹭粯娆鹃噾棰� == 寰呬粯娆鹃噾棰�
+            item.setStatusName(item.getPaymentAmountTotal().compareTo(item.getInvoiceAmount()) == 0 ? "宸插畬鎴愪粯娆�" : "鏈畬鎴愪粯娆�");
+        });
         return ticketRegistrationIPage;
     }
 
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index 6df2ede..3a579d6 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -1,11 +1,23 @@
 package com.ruoyi.sales.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.aftersalesservice.dto.AfterSalesServiceDto;
+import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
+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.sales.dto.SalesQuotationDto;
 import com.ruoyi.sales.service.SalesQuotationService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 @RequestMapping("/sales/quotation")
@@ -16,6 +28,17 @@
     public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
         return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
     }
+
+    @PostMapping("/export")
+    public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        SalesQuotationDto afterSalesService = new SalesQuotationDto();
+        IPage<SalesQuotationDto> listPage = salesQuotationService.listPage(page, afterSalesService);
+        ExcelUtil<SalesQuotationDto> util = new ExcelUtil<SalesQuotationDto>(SalesQuotationDto.class);
+        util.exportExcel(response, listPage.getRecords() , "鍙嶉鐧昏");
+    }
+
+
     @PostMapping("/add")
     public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
         return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index c49a3b2..5bbf31f 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -19,6 +19,11 @@
     @Excel(name = "瀹㈡埛鍚堝悓鍙�")
     private String customerContractNo;
 
+    @ApiModelProperty(value = "鐘舵��")
+    @Excel(name = "鐘舵��")
+    private String statusName;
+
+
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
     @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index efa03ec..a135fa3 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -36,6 +36,11 @@
     private Long salesLedgerId;
 
     /**
+     * 棰勮鏁伴噺
+     */
+    private BigDecimal warnNum;
+
+    /**
      * 浜у搧澶х被
      */
     @Excel(name = "浜у搧澶х被")
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 72c4f00..b22e6a3 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,19 +16,24 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     @ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
+    @Excel(name = "鎶ヤ环鍗曠紪鍙�")
     private String quotationNo;
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customer;
 
     @ApiModelProperty(value = "涓氬姟鍛�")
+    @Excel(name = "涓氬姟鍛�")
     private String salesperson;
     @ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate quotationDate;
     @ApiModelProperty(value = "鏈夋晥鏈熻嚦")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate validDate;
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
@@ -36,6 +42,7 @@
     @ApiModelProperty(value = "鐘舵��")
     private String status;
     @ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
+    @Excel(name = "鎶ヤ环閲戦")
     private Double totalAmount;
 
     @ApiModelProperty(value = "澶囨敞")
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 5349dab..ae93c3b 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -164,6 +164,15 @@
         if (receiptPaymentDto.getStatus()) {
             receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
         }
+        receiptPaymentDtoIPage.getRecords().forEach(item -> {
+            // 姣旇緝鍥炴閲戦 == 寰呭洖娆鹃噾棰�
+            if (item.getInvoiceTotal().compareTo(item.getReceiptPaymentAmountTotal()) == 0) {
+                item.setStatusName("宸插畬鎴愬洖娆�");
+            }else{
+                item.setStatusName("鏈畬鎴愬洖娆�");
+            }
+
+        });
         return receiptPaymentDtoIPage;
     }
 
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index 87a9b7d..a963aa1 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -81,8 +81,11 @@
     @PostMapping("/export")
     @ApiOperation("瀵煎嚭鐢ㄦ按绠＄悊")
     public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        WaterRecord waterRecord = new WaterRecord();
+        IPage<WaterRecord> listPage = waterRecordService.listPage(page, waterRecord);
         ExcelUtil<WaterRecord> util = new ExcelUtil<WaterRecord>(WaterRecord.class);
-        util.exportExcel(response, null , "鐢ㄦ按绠＄悊");
+        util.exportExcel(response, listPage.getRecords() , "鐢ㄦ按绠＄悊");
     }
 
 }
diff --git a/src/main/resources/application-zyrqCopy.yml b/src/main/resources/application-zyrqCopy.yml
new file mode 100644
index 0000000..5e7f50b
--- /dev/null
+++ b/src/main/resources/application-zyrqCopy.yml
@@ -0,0 +1,219 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ruoyi:
+  # 鍚嶇О
+  name: RuoYi
+  # 鐗堟湰
+  version: 3.8.9
+  # 鐗堟潈骞翠唤
+  copyrightYear: 2025
+  # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
+  profile: /javaWork/product-inventory-management/file
+
+  # 鑾峰彇ip鍦板潃寮�鍏�
+  addressEnabled: false
+  # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+  captchaType: math
+
+# 寮�鍙戠幆澧冮厤缃�
+server:
+  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+  port: 9030
+  servlet:
+    # 搴旂敤鐨勮闂矾寰�
+    context-path: /
+  tomcat:
+    # tomcat鐨刄RI缂栫爜
+    uri-encoding: UTF-8
+    # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+    accept-count: 1000
+    threads:
+      # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+      max: 800
+      # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+      min-spare: 100
+
+# 鏃ュ織閰嶇疆
+logging:
+  level:
+    com.ruoyi: warn
+    org.springframework: warn
+
+minio:
+  endpoint: http://114.132.189.42/
+  port: 7019
+  secure: false
+  accessKey: admin
+  secretKey: 12345678
+  preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+  default-bucket: demo-product
+# 鐢ㄦ埛閰嶇疆
+user:
+  password:
+    # 瀵嗙爜鏈�澶ч敊璇鏁�
+    maxRetryCount: 5
+    # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+    lockTime: 10
+
+# Spring閰嶇疆
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 涓诲簱鏁版嵁婧�
+      master:
+        url: jdbc:mysql://192.168.1.185:3306/product-inventory-management-zyrq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: xd@123456..
+      # 浠庡簱鏁版嵁婧�
+      slave:
+        # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+        enabled: false
+        url:
+        username:
+        password:
+      # 鍒濆杩炴帴鏁�
+      initialSize: 5
+      # 鏈�灏忚繛鎺ユ睜鏁伴噺
+      minIdle: 10
+      # 鏈�澶ц繛鎺ユ睜鏁伴噺
+      maxActive: 20
+      # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+      maxWait: 60000
+      # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
+      connectTimeout: 30000
+      # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
+      socketTimeout: 60000
+      # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+      timeBetweenEvictionRunsMillis: 60000
+      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+      minEvictableIdleTimeMillis: 300000
+      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+      maxEvictableIdleTimeMillis: 900000
+      # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+        allow:
+        url-pattern: /druid/*
+        # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 鎱QL璁板綍
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # 璧勬簮淇℃伅
+  messages:
+    # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+    basename: i18n/messages
+  # 鏂囦欢涓婁紶
+  servlet:
+    multipart:
+      # 鍗曚釜鏂囦欢澶у皬
+      max-file-size: 1GB
+      # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+      max-request-size: 2GB
+  # 鏈嶅姟妯″潡
+  devtools:
+    restart:
+      # 鐑儴缃插紑鍏�
+      enabled: false
+  # redis 閰嶇疆
+  redis:
+    # 鍦板潃
+#    host: 127.0.0.1
+    host: 192.168.1.185
+    # 绔彛锛岄粯璁や负6379
+    port: 6380
+    # 鏁版嵁搴撶储寮�
+    database: 5
+    # 瀵嗙爜
+#    password: root2022!
+    password:
+
+    # 杩炴帴瓒呮椂鏃堕棿
+    timeout: 10s
+    lettuce:
+      pool:
+        # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+        min-idle: 0
+        # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+        max-idle: 8
+        # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+        max-active: 8
+        # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+        max-wait: -1ms
+
+# token閰嶇疆
+token:
+  # 浠ょ墝鑷畾涔夋爣璇�
+  header: Authorization
+  # 浠ょ墝瀵嗛挜
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+  expireTime: 450
+  
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+  # 鎼滅储鎸囧畾鍖呭埆鍚�   鏍规嵁鑷繁鐨勯」鐩潵
+  typeAliasesPackage: com.ruoyi.**.pojo
+  # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+  configLocation: classpath:mybatis/mybatis-config.xml
+  global-config:
+    enable-sql-runner: true
+    db-config:
+      id-type: auto
+  
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+  # 鏄惁寮�鍚痵wagger
+  enabled: true
+  # 璇锋眰鍓嶇紑
+  pathMapping: /dev-api
+
+# 闃叉XSS鏀诲嚮
+xss:
+  # 杩囨护寮�鍏�
+  enabled: true
+  # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+  excludes: /system/notice
+  # 鍖归厤閾炬帴
+  urlPatterns: /system/*,/monitor/*,/tool/*
+  
+# 浠ｇ爜鐢熸垚
+gen:
+  # 浣滆��
+  author: ruoyi
+  # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
+  packageName: com.ruoyi.project.system
+  # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
+  autoRemovePre: false
+  # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
+  tablePrefix: sys_
+  # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
+  allowOverwrite: false
+
+file:
+  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
+  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 74e6ae5..c378c6a 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -12,6 +12,7 @@
             t2.unit,
             t2.quantity,
             t2.min_stock,
+            t2.warn_num,
             t2.quantity as quantity0,
             t2.tax_rate,
             t2.tax_inclusive_unit_price,
@@ -46,7 +47,8 @@
         t1.inbound_num as inboundNum0,
         t1.create_time,
         t1.update_time,
-        t1.create_by
+        t1.create_by,
+        t2.warn_num
         from  procurement_record_storage t1
                   left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                   left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -54,6 +56,9 @@
             1 = 1
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
+            </if>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
         </where>
     </select>
@@ -96,12 +101,13 @@
         t2.tax_inclusive_total_price,
         t2.tax_exclusive_total_price,
         t1.inbound_batches,
-        t1.inbound_num,
-        t1.inbound_num as inboundNum0,
+        sum(t1.inbound_num) as inboundNum,
+        sum(t1.inbound_num) as inboundNum0,
         t1.inbound_num as totalInboundNum,
         t1.create_time,
         t1.update_time,
-        t1.create_by
+        t1.create_by,
+        t2.warn_num
         from  procurement_record_storage t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
         left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -109,6 +115,9 @@
             1 = 1
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
+            </if>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
             <if test="req.reportDate != null">
                 and t1.create_time >= #{req.reportDate} and t1.create_time &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -126,6 +135,7 @@
                 and t1.create_time &lt;= #{req.endDate}
             </if>
         </where>
+        group by t3.supplier_name,t2.product_category,t2.specification_model
     </select>
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 5822e73..ec91c53 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -16,7 +16,8 @@
         t2.tax_exclusive_total_price,
         t1.inbound_num,
         t1.create_time,
-        t1.create_by
+        t1.create_by,
+        t2.warn_num
         from  procurement_record_out t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
         left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -25,6 +26,9 @@
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
             </if>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                and t1.create_time like  concat('%',#{req.timeStr},'%')
+            </if>
         </where>
     </select>
     <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 59396c5..8e8cf1c 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -179,6 +179,9 @@
             <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
                 AND T1.payment_date &lt;= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
             </if>
+            <if test="params.purchaseContractNumber != null and params.purchaseContractNumber !='' ">
+                AND t4.purchase_contract_number LIKE CONCAT('%',#{params.purchaseContractNumber},'%')
+            </if>
         </where>
         ORDER BY T1.payment_date,T1.create_time DESC
     </select>
diff --git a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
index dabc4f0..06202f8 100644
--- a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
@@ -35,8 +35,8 @@
         from documentation_return_management dbm
         LEFT JOIN documentation doc on doc.id = dbm.documentation_id
         where dbm.returner IS NOT NULL
-        <if test="documentationReturnManagement.returnStatus != null">
-            and return_status = #{documentationReturnManagement.returnStatus}
+        <if test="documentationReturnManagement.borrowStatus != null">
+            and borrow_status = #{documentationReturnManagement.borrowStatus}
         </if>
         <if test="documentationReturnManagement.documentationId != null">
             and documentation_id = #{documentationReturnManagement.documentationId}

--
Gitblit v1.9.3