From ade9a56c088aa210fcaa3ebf213fdf908a8c1ca4 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 18:58:38 +0800
Subject: [PATCH] fix: 移除订单状态
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 2 --
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 6 +-----
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 17 -----------------
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 6 +-----
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 5 -----
doc/河南鹤壁天沐钢化玻璃厂.sql | 6 +++++-
src/main/java/com/ruoyi/sales/dto/SalesLedgerExportDto.java | 2 --
7 files changed, 7 insertions(+), 37 deletions(-)
diff --git "a/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql" "b/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
index cc3575d..5fc3ad6 100644
--- "a/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
+++ "b/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
@@ -173,4 +173,8 @@
ADD COLUMN `link` varchar(255) NULL COMMENT '璁块棶璺緞' AFTER `update_time`;
ALTER TABLE `product-inventory-management-hbtmblc`.`product_model`
- ADD COLUMN `create_user` bigint NULL COMMENT '鍒涘缓鐢ㄦ埛' AFTER `thickness`;
\ No newline at end of file
+ ADD COLUMN `create_user` bigint NULL COMMENT '鍒涘缓鐢ㄦ埛' AFTER `thickness`;
+
+
+ALTER TABLE `product-inventory-management-hbtmblc`.`sales_ledger`
+DROP COLUMN `order_status`;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 10cc97c..e3f8e14 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -234,23 +234,6 @@
return result;
}
- /**
- * 鏍囪璁㈠崟瀹屾垚
- */
- @Log(title = "閿�鍞彴璐︽爣璁板畬鎴�", businessType = BusinessType.UPDATE)
- @PostMapping("/markOrderCompleted")
- @ApiOperation("鏍囪璁㈠崟瀹屾垚锛堜笉鍙挙閿�锛�")
- public AjaxResult markOrderCompleted(@RequestBody Map<String, Object> params) {
- @SuppressWarnings("unchecked")
- List<Long> ids = ((List<Object>) params.get("ids")).stream()
- .map(obj -> Long.valueOf(obj.toString()))
- .collect(Collectors.toList());
- if (ids == null || ids.isEmpty()) {
- return AjaxResult.error("璇烽�夋嫨瑕佹爣璁板畬鎴愮殑璁㈠崟");
- }
- salesLedgerService.markOrderCompleted(ids);
- return AjaxResult.success("鏍囪瀹屾垚鎴愬姛");
- }
/**
* 閫掑鎵撳嵃娆℃暟
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index d7de2c3..c3f81b0 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -94,6 +94,4 @@
@ApiModelProperty("鍙嶅鏍告弿杩�")
private String counterReviewDesc;
- @ApiModelProperty("璁㈠崟鐘舵�侊細0-杩涜涓紝1-宸插畬鎴�")
- private Integer orderStatus;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerExportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerExportDto.java
index 4354fe2..3198abb 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerExportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerExportDto.java
@@ -51,8 +51,6 @@
@Excel(name = "瀹℃牳鐘舵��")
private String reviewStatusText;
- @Excel(name = "璁㈠崟鐘舵��")
- private String orderStatusText;
@Excel(name = "澶囨敞")
private String remarks;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 9728a53..d26582f 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -201,11 +201,7 @@
@ApiModelProperty("鍙嶅鏍告弿杩�")
private String counterReviewDesc;
- /**
- * 璁㈠崟鐘舵�侊細0-杩涜涓紝1-宸插畬鎴�
- */
- @ApiModelProperty("璁㈠崟鐘舵�侊細0-杩涜涓紝1-宸插畬鎴�")
- private Integer orderStatus;
+
/**
* 鏍囩鎵撳嵃娆℃暟
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index 751856d..fe28846 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -109,11 +109,6 @@
List<Long> counterReview(CounterReviewDto dto);
/**
- * 鏍囪璁㈠崟瀹屾垚
- */
- void markOrderCompleted(List<Long> ids);
-
- /**
* 閫掑鎵撳嵃娆℃暟
* @param id 閿�鍞彴璐D
* @param printType 鎵撳嵃绫诲瀷锛歭abel=鏍囩鎵撳嵃锛宒ocument=鍗曟嵁鎵撳嵃
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index b2d6781..d284be0 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -33,7 +33,6 @@
T1.payment_method,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
T1.delivery_status AS deliveryStatus,
- T1.order_status AS orderStatus,
T1.label_print_count AS labelPrintCount,
T1.document_print_count AS documentPrintCount
FROM
@@ -76,7 +75,6 @@
T1.counter_review_person_id AS counterReviewPersonId,
T1.counter_review_type AS counterReviewType,
T1.counter_review_desc AS counterReviewDesc,
- T1.order_status AS orderStatus,
T1.label_print_count AS labelPrintCount,
T1.document_print_count AS documentPrintCount
FROM sales_ledger T1
@@ -119,9 +117,7 @@
OR T1.review_status IS NULL
)
</if>
- <if test="salesLedgerDto.orderStatus != null">
- AND T1.order_status = #{salesLedgerDto.orderStatus}
- </if>
+
<if test="salesLedgerDto.width != null or salesLedgerDto.height != null">
AND EXISTS (
SELECT 1
--
Gitblit v1.9.3