From a2599e2fffaf6bb1d781325736f06955fa19511b Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 21 十月 2026 15:24:59 +0800
Subject: [PATCH] fix(芯导): 补回各系统丢失的既有文件修改(分支切换导致)

---
 src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java          |    6 +
 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml                           |   12 +++
 src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml  |    2 
 src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java                           |    5 +
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml                                   |    4 +
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java                                   |    5 +
 src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java                       |    2 
 src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java                   |    1 
 src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java                                  |    7 +
 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java                            |    7 +
 src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java                              |    2 
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java                     |    2 
 src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml                           |    2 
 src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java                           |    5 +
 src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java                               |    1 
 src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java                             |    5 +
 src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java                       |    4 
 src/main/java/com/ruoyi/procurementrecord/controller/CustomStorageWarningRecordController.java |   66 ++++++++++++++++
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java       |    3 
 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java                    |   11 ++
 src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java                                   |    3 
 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java               |    6 +
 src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java                                 |    2 
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java    |   10 ++
 src/main/java/com/ruoyi/production/pojo/ProductionOrder.java                                   |    7 +
 src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorageWarningRecord.java                 |    8 ++
 src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java    |    5 +
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java                                     |    5 +
 28 files changed, 193 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
index b5354f2..5e72379 100644
--- a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
+++ b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
@@ -36,5 +36,8 @@
         IGNORE_TABLES.add("gen_table");
         IGNORE_TABLES.add("gen_table_column");
         IGNORE_TABLES.add("custom_storage_warning_record");
+        IGNORE_TABLES.add("stock_taking");
+        IGNORE_TABLES.add("stock_time_setting");
+        IGNORE_TABLES.add("env_device_command");
     }
 }
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index cae0715..d99d2cb 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -30,6 +30,11 @@
 
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
     private LocalDateTime maintenancePlanTime;
+    @ApiModelProperty("淇濆吇鍛ㄦ湡")
+    private String maintenanceCycle;
+
+    @ApiModelProperty("淇濆吇鍐呭")
+    private String maintenanceContent;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 6cd3316..b531591 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -24,6 +24,13 @@
     @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
     private Date maintenancePlanTime;
+    @Excel(name = "淇濆吇鍛ㄦ湡")
+    @ApiModelProperty("淇濆吇鍛ㄦ湡")
+    private String maintenanceCycle;
+
+    @Excel(name = "淇濆吇鍐呭")
+    @ApiModelProperty("淇濆吇鍐呭")
+    private String maintenanceContent;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     @Excel(name = "瀹為檯淇濆吇浜�")
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index f5d5463..c7242b2 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -31,6 +31,11 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime maintenancePlanTime;
+    @ApiModelProperty("淇濆吇鍛ㄦ湡")
+    private String maintenanceCycle;
+
+    @ApiModelProperty("淇濆吇鍐呭")
+    private String maintenanceContent;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
index 75eed76..347e076 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
@@ -81,6 +81,11 @@
      */
     @ApiModelProperty("鏈夋晥鏈燂紙鍗曚綅澶╋級")
     private Integer valid;
+    @ApiModelProperty("涓嬫妫�瀹氭棩鏈�")
+    @TableField(exist = false)
+    @Excel(name = "涓嬫妫�瀹氭棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date nextDate;
 
 
     /**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/CustomStorageWarningRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/CustomStorageWarningRecordController.java
index 5dabd7a..063e87e 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/CustomStorageWarningRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/CustomStorageWarningRecordController.java
@@ -9,6 +9,15 @@
 import io.swagger.annotations.Api;
 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.RequestBody;
+import java.util.Map;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.ruoyi.procurementrecord.pojo.CustomStorageWarningRecord;
+import com.ruoyi.procurementrecord.pojo.CustomStorage;
+import com.ruoyi.procurementrecord.mapper.CustomStorageWarningRecordMapper;
+import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,10 +29,65 @@
     @Autowired
     private CustomStorageWarningRecordService customStorageWarningRecordService;
 
+    @Autowired
+    private CustomStorageWarningRecordMapper warningRecordMapper;
+
+    @Autowired
+    private CustomStorageMapper customStorageMapper;
+
     @GetMapping("/pageList")
     @Log(title = "浠撳偍鐗╂祦-搴撳瓨棰勮-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult pageList(Page page, ProcurementPageDto dto){
         return AjaxResult.success(customStorageWarningRecordService.listPage(page,dto));
     }
 
-}
+    /**
+     * 鐢熸垚閲囪喘寤鸿 / 婊為攢澶勭悊鎻愮ず锛堝苟璁板綍鍒伴璀︿簨浠讹級
+     */
+    @PostMapping("/generateSuggestion")
+    @Log(title = "浠撳偍鐗╂祦-搴撳瓨棰勮-鐢熸垚寤鸿", businessType = BusinessType.UPDATE)
+    public AjaxResult generateSuggestion(@RequestBody Map<String, Object> body) {
+        Object idObj = body.get("id");
+        if (idObj == null) return AjaxResult.error("鍙傛暟涓嶈兘涓虹┖");
+        String type = body.get("type") == null ? "閲囪喘寤鸿" : body.get("type").toString();
+        Long targetId = Long.valueOf(idObj.toString());
+        CustomStorageWarningRecord record = warningRecordMapper.selectById(targetId);
+        if (record == null) {
+            com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<CustomStorageWarningRecord> w =
+                    new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>();
+            w.eq(CustomStorageWarningRecord::getCustomStorageId, targetId.intValue()).last("limit 1");
+            record = warningRecordMapper.selectOne(w);
+        }
+        if (record == null) {
+            record = new CustomStorageWarningRecord();
+            record.setCustomStorageId(targetId.intValue());
+            record.setWarningStatus("宸查璀�");
+            record.setWarningTime(LocalDateTime.now());
+            try {
+                record.setTenantId(com.ruoyi.common.utils.SecurityUtils.getLoginUser().getTenantId());
+            } catch (Exception ignored) {
+            }
+            warningRecordMapper.insert(record);
+        }
+        CustomStorage storage = record.getCustomStorageId() == null ? null : customStorageMapper.selectById(record.getCustomStorageId());
+        String product = storage == null ? "鏈煡鍟嗗搧"
+                : (storage.getProductCategory() == null ? "" : storage.getProductCategory())
+                  + (storage.getSpecificationModel() == null ? "" : " " + storage.getSpecificationModel());
+        BigDecimal current = (storage == null || storage.getInboundNum() == null) ? BigDecimal.ZERO : storage.getInboundNum();
+        BigDecimal warn = storage == null ? null : storage.getWarnNum();
+        String content;
+        if (type.contains("閲囪喘")) {
+            BigDecimal suggest = (warn == null ? BigDecimal.ZERO : warn).subtract(current);
+            if (suggest.compareTo(BigDecimal.ZERO) <= 0) suggest = BigDecimal.valueOf(10);
+            content = String.format("銆愰噰璐缓璁��%s 褰撳墠搴撳瓨 %s锛屾渶浣庡簱瀛橀槇鍊� %s锛屽缓璁噰璐� %s锛堝缓璁粨鍚堣繎30澶╂秷鑰楅噺琛ヨ揣锛�",
+                    product, current.toPlainString(), warn == null ? "-" : warn.toPlainString(), suggest.toPlainString());
+        } else {
+            content = String.format("銆愭粸閿�澶勭悊鎻愮ず銆�%s 褰撳墠搴撳瓨 %s锛屽懆杞紦鎱�/搴撳瓨鍋忛珮锛屽缓璁細鈶犱績閿�鎴栧唴閮ㄩ鐢� 鈶¤浆浣滃叾浠栫敤閫� 鈶笌渚涘簲鍟嗗崗鍟嗛��鎹㈣揣",
+                    product, current.toPlainString());
+        }
+        record.setSuggestionType(type);
+        record.setSuggestionContent(content);
+        record.setSuggestionTime(LocalDateTime.now());
+        warningRecordMapper.updateById(record);
+        return AjaxResult.success(content);
+    }}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java
index 44c0e0d..4fdab69 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java
@@ -28,5 +28,7 @@
      * 渚涘簲鍟嗗悕绉帮紙閫�璐у嚭搴�-閫�鍥炰緵搴斿晢鏃朵娇鐢級
      */
     private String supplierName;
+    /** 棰嗙敤鏁伴噺 */
+    private String requisitionNum;
 
 }
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index a9a38a0..49f1f8b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -125,6 +125,8 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+    @ApiModelProperty(value = "鐧昏浜�")
+    private String registrant;
 
     /**
      * 棰勮鏁伴噺
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorageWarningRecord.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorageWarningRecord.java
index 9e05b01..5e0896a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorageWarningRecord.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorageWarningRecord.java
@@ -48,5 +48,13 @@
     private LocalDateTime expectedshortagetime;
 
     private Long tenantId;
+    /** 寤鸿绫诲瀷 */
+    private String suggestionType;
+
+    /** 寤鸿鍐呭 */
+    private String suggestionContent;
+
+    /** 鐢熸垚鏃堕棿 */
+    private LocalDateTime suggestionTime;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
index 42d469c..401d1be 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
@@ -91,5 +91,7 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+    /** 棰嗙敤鏁伴噺 */
+    private java.math.BigDecimal requisitionNum;
 
 }
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index 5240715..8fab6a4 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -95,4 +95,5 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+    private String registrant;
 }
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
index b9f9641..897716f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -80,7 +80,15 @@
                 .createBy(sysUser.getNickName())
                 .updateUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
                 .updateTime(LocalDateTime.now());
-        this.save(procurementRecordOut.build());
+        ProcurementRecordOut saved = procurementRecordOut.build();
+        this.save(saved);
+        if (StringUtils.isNotEmpty(procurementRecordOutAdd.getRequisitionNum()) && saved.getId() != null) {
+            ProcurementRecordOut upd = ProcurementRecordOut.builder()
+                    .id(saved.getId())
+                    .requisitionNum(new BigDecimal(procurementRecordOutAdd.getRequisitionNum()))
+                    .build();
+            procurementRecordOutMapper.updateById(upd);
+        }
         return 0;
     }
 
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 2896718..9d3cef5 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -473,6 +473,9 @@
             Long aLong = customStorageMapper.selectCount(null);
             item.setInboundBatches(aLong.equals(0L) ? "绗�1鎵规(鑷畾涔夊叆搴�)" : "绗�"+ (aLong + 1) + "鎵规(鑷畾涔夊叆搴�)" );
             item.setCreateBy(loginUser.getNickName());
+            if (item.getRegistrant() == null || item.getRegistrant().trim().isEmpty()) {
+                item.setRegistrant(loginUser.getNickName());
+            }
             item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, ""));
             customStorageMapper.insert(item);
         });
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java b/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java
index 7729e8e..8d3884f 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java
@@ -37,5 +37,10 @@
      */
     @ApiModelProperty(value = "鎺掍骇鏃ユ湡")
     private String schedulingDate;
+    /** 鐢熶骇瑕佹眰 */
+    private String productionRequirement;
+
+    /** 瀹屾垚鏈熼檺 */
+    private String completionDeadline;
 
 }
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 308b506..21cdc73 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -105,5 +105,16 @@
     private BigDecimal successNum;
 
     private Long tenantId;
+    /** 鐢熶骇瑕佹眰 */
+    @Excel(name = "鐢熶骇瑕佹眰")
+    @ApiModelProperty(value = "鐢熶骇瑕佹眰")
+    private String productionRequirement;
+
+    /** 瀹屾垚鏈熼檺 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "瀹屾垚鏈熼檺", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "瀹屾垚鏈熼檺")
+    private Date completionDeadline;
 
 }
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index f0855e3..9f70b07 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -43,6 +43,13 @@
     @Excel(name = "浜у搧澶х被")
     @ApiModelProperty(value = "浜у搧澶х被")
     private String productCategory;
+    @Excel(name = "浜у搧鍚嶇О")
+    @ApiModelProperty(value = "浜у搧鍚嶇О")
+    private String productName;
+
+    @Excel(name = "椤圭洰鍚嶇О")
+    @ApiModelProperty(value = "椤圭洰鍚嶇О")
+    private String projectName;
 
     /**
      * 瑙勬牸鍨嬪彿
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java
index e3e6dde..df7bb9f 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java
@@ -56,6 +56,11 @@
      * 娲惧伐鏃ユ湡
      */
     private LocalDate schedulingDate;
+    /** 鐢熶骇瑕佹眰 */
+    private String productionRequirement;
+
+    /** 瀹屾垚鏈熼檺 */
+    private LocalDate completionDeadline;
 
     /**
      * 鎺掍骇鐘舵�侊紙1-寰呮帓浜� 2-鎺掍骇涓� 3-宸叉帓浜э級
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 4814c79..313a3d2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -106,6 +106,12 @@
                 .schedulingUserName(sysUser.getNickName())
                 .schedulingNum(productionDispatchAddDto.getSchedulingNum())
                 .schedulingDate(LocalDate.parse(productionDispatchAddDto.getSchedulingDate(), DateTimeFormatter.ISO_LOCAL_DATE))
+                .productionRequirement(productionDispatchAddDto.getProductionRequirement())
+                .completionDeadline(
+                        productionDispatchAddDto.getCompletionDeadline() != null
+                                && !productionDispatchAddDto.getCompletionDeadline().isEmpty()
+                                ? LocalDate.parse(productionDispatchAddDto.getCompletionDeadline(), DateTimeFormatter.ISO_LOCAL_DATE)
+                                : null)
                 .status(1)
                 .build();
         return salesLedgerSchedulingMapper.insert(salesLedgerScheduling);
diff --git a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
index 2561c8d..a884286 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
@@ -36,6 +36,7 @@
     private String taxRate;
 
     // 鐧昏浜�
+    @Excel(name = "鐧昏浜�")
     private String registrant;
 
     private String searchText;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index b063b2c..9220143 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -197,6 +197,13 @@
     private String issueDateStart;
     @TableField(exist = false)
     private String issueDateEnd;
+    @ApiModelProperty(value = "鍙戠エ閲戦-璧峰锛堟煡璇㈢敤锛�")
+    @TableField(exist = false)
+    private BigDecimal invoiceAmountStart;
+
+    @ApiModelProperty(value = "鍙戠エ閲戦-缁撴潫锛堟煡璇㈢敤锛�")
+    @TableField(exist = false)
+    private BigDecimal invoiceAmountEnd;
 
     @TableField(exist = false)
     private String supplierNameOrContractNo;
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 2f680d5..4dcb6cf 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -382,6 +382,12 @@
         }
         queryWrapper.eq(TicketRegistration::getTenantId, SecurityUtils.getLoginUser().getTenantId())
                 .eq(TicketRegistration::getDeleteFlag,0);
+        if (ticketRegistration.getInvoiceAmountStart() != null) {
+            queryWrapper.ge(TicketRegistration::getInvoiceAmount, ticketRegistration.getInvoiceAmountStart());
+        }
+        if (ticketRegistration.getInvoiceAmountEnd() != null) {
+            queryWrapper.le(TicketRegistration::getInvoiceAmount, ticketRegistration.getInvoiceAmountEnd());
+        }
         IPage<TicketRegistration> ticketRegistrationIPage = ticketRegistrationMapper.selectPage(page, queryWrapper);
         // 璁$畻宸蹭粯娆鹃噾棰�
         if (CollectionUtils.isNotEmpty(ticketRegistrationIPage.getRecords())) {
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 23fe6b4..375a9c2 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -68,6 +68,11 @@
     private String createTimeStart;
     @TableField(exist = false)
     private String createTimeEnd;
+    @ApiModelProperty(value = "鍙戠エ閲戦-寮�濮�")
+    private BigDecimal invoiceAmountStart;
+
+    @ApiModelProperty(value = "鍙戠エ閲戦-缁撴潫")
+    private BigDecimal invoiceAmountEnd;
 
 
 }
diff --git a/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java b/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java
index aee8370..16f3ed3 100644
--- a/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java
+++ b/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java
@@ -21,7 +21,7 @@
     @Excel(name = "閿�鍞悎鍚屽彿")
     private String salesContractNo;
 
-    @Excel(name = "")
+    @Excel(name = "瀹㈡埛鍚堝悓鍙�")
     private String customerContractNo;
 
     @Excel(name = "瀹㈡埛鍚嶇О")
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index 4722ac4..d2ca447 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -198,7 +198,7 @@
             return invoiceLedgerExcelDto;
         }).collect(Collectors.toList());
         ExcelUtil<InvoiceLedgerExcelDto> util = new ExcelUtil<InvoiceLedgerExcelDto>(InvoiceLedgerExcelDto.class);
-        util.exportExcel(response, invoiceLedgerExcelDtoList, "渚涘簲鍟嗗鍑�");
+        util.exportExcel(response, invoiceLedgerExcelDtoList, "寮�绁ㄥ彴璐�");
     }
 
     /**
@@ -305,7 +305,7 @@
     @Override
     public IPage<InvoiceRegistrationProductDto> registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
         IPage<InvoiceRegistrationProductDto> invoiceRegistrationProductDtoIPage = invoiceRegistrationProductMapper.invoiceRegistrationProductPage(page, registrationProductDto);
-        if (registrationProductDto.getStatus()) {
+        if (Boolean.TRUE.equals(registrationProductDto.getStatus())) {
             invoiceRegistrationProductDtoIPage.getRecords().removeIf(invoiceRegistrationProduct -> !StringUtils.isEmpty(invoiceRegistrationProduct.getInvoiceNo()));
         }
         invoiceRegistrationProductDtoIPage.getRecords().forEach(invoiceRegistrationProductDto -> {
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9917ce2..902717b 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -9,6 +9,8 @@
         select dm.id,
         dm.device_ledger_id,
         dm.maintenance_plan_time,
+        dm.maintenance_cycle,
+        dm.maintenance_content,
         dm.maintenance_actually_time,
         dm.maintenance_result,
         dm.status,
@@ -47,6 +49,8 @@
         select dm.id,
                dm.device_ledger_id,
                dm.maintenance_plan_time,
+               dm.maintenance_cycle,
+               dm.maintenance_content,
                dm.maintenance_actually_time,
                dm.maintenance_result,
                dm.status,
diff --git a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml
index 69446e0..71a206d 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml
@@ -13,6 +13,7 @@
         t2.model,
         t1.valid,
         t1.record_date,
+        DATE_ADD(t1.record_date, INTERVAL t1.valid DAY) AS next_date,
         t1.entry_date
         FROM
         measuring_instrument_ledger_record t1
@@ -44,6 +45,7 @@
         t2.model,
         t1.valid,
         t1.record_date,
+        DATE_ADD(t1.record_date, INTERVAL t1.valid DAY) AS next_date,
         t1.entry_date
         FROM
         measuring_instrument_ledger_record t1
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index a2aaa11..4de6f91 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -71,6 +71,8 @@
         T2.scheduling_user_id,
         T2.scheduling_user_name,
         T2.scheduling_date,
+        T2.production_requirement,
+        T2.completion_deadline,
         ifNull(T2.scheduling_num,0) AS schedulingNum,
         ifNull(T2.finished_num,0) AS successNum,
         t3.product_category,
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index 3178871..01579df 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -115,6 +115,18 @@
             <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
                 AND T3.invoice_date &lt;= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
             </if>
+            <if test="invoiceRegistrationProductDto.invoiceDateStart != null and invoiceRegistrationProductDto.invoiceDateStart != ''">
+                AND T3.invoice_date &gt;= date_format(#{invoiceRegistrationProductDto.invoiceDateStart}, '%Y-%m-%d')
+            </if>
+            <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
+                AND T3.invoice_date &lt;= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
+            </if>
+            <if test="invoiceRegistrationProductDto.invoiceAmountStart != null">
+                AND T3.invoice_total &gt;= #{invoiceRegistrationProductDto.invoiceAmountStart}
+            </if>
+            <if test="invoiceRegistrationProductDto.invoiceAmountEnd != null">
+                AND T3.invoice_total &lt;= #{invoiceRegistrationProductDto.invoiceAmountEnd}
+            </if>
             <if test="invoiceRegistrationProductDto.createTimeStart != null ">
                 AND T1.create_time &gt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
             </if>

--
Gitblit v1.9.3