Compare commits

...

3 Commits

Author SHA1 Message Date
wangjia 7f3261a4a9 chore: release server-v1.0.66
Deploy Server / release-deploy-server (push) Successful in 51s
fix(backend): 入库/出库列表按 order_date 倒序,历史导入单按业务日期归位

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-20 12:50:26 +08:00
wangjia bcc02a2f09 chore: release client-v1.0.63
Deploy Client / build-client-web (push) Successful in 37s
Deploy Client / build-windows (push) Successful in 2m32s
Deploy Client / build-macos (push) Successful in 2m2s
Deploy Client / build-android (push) Successful in 1m7s
Deploy Client / build-ios (push) Successful in 2m31s
Deploy Client / release-deploy-client (push) Successful in 1m33s
fix(client): 入库/出库单状态筛选改服务端,全部状态含未审核 + 下拉补待审核

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-20 12:19:51 +08:00
wangjia 50b5c9fccb chore: release server-v1.0.65
Deploy Server / release-deploy-server (push) Successful in 1m5s
fix(backend): 入库/出库列表 status 支持多状态 IN 查询

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-20 12:19:46 +08:00
9 changed files with 79 additions and 12 deletions
+6
View File
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.0.63] - 2026-06-20
### 修复
- 修复入库单 / 出库单「全部状态」筛选遗漏未审核单据的问题,状态下拉新增「待审核」选项,且筛选真正生效
- 修复「入库审核 / 出库审核」标签页只显示部分待审核单、漏掉早期单号的问题:筛选改为服务端驱动,跨分页结果完整可靠
## [1.0.62] - 2026-06-20
### 改进
+10
View File
@@ -5,6 +5,16 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.0.66] - 2026-06-20
### 修复
- 入库/出库单据列表改为按业务日期(入库/出库日期)倒序排列:从旧系统迁入的历史单据按真实日期归位到列表顶部,不再因录入时间晚、被排到末尾分页而在首页遗漏
## [1.0.65] - 2026-06-20
### 修复
- 单据列表状态筛选支持一次查询多种状态,配合客户端修复让「入库审核 / 出库审核」标签页完整列出全部待审核单据,不再因分页只显示部分
## [1.0.64] - 2026-06-20
### 改进
+3 -2
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"net/http"
"strconv"
"strings"
"time"
"github.com/gin-gonic/gin"
@@ -40,7 +41,7 @@ func (h *StockInHandler) List(c *gin.Context) {
Where("shop_id = ? AND deleted_at IS NULL", shopID)
if status := c.Query("status"); status != "" {
query = query.Where("status = ?", status)
query = query.Where("status IN ?", strings.Split(status, ","))
}
if startDate := c.Query("start_date"); startDate != "" {
query = query.Where("order_date >= ?", startDate)
@@ -55,7 +56,7 @@ func (h *StockInHandler) List(c *gin.Context) {
orders := make([]model.StockInOrder, 0)
query.Preload("Warehouse").Preload("Partner").Preload("Operator").Preload("Reviewer").
Offset((page - 1) * pageSize).Limit(pageSize).
Order("id DESC").Find(&orders)
Order("order_date DESC, id DESC").Find(&orders)
c.JSON(http.StatusOK, gin.H{"data": orders, "total": total, "page": page, "page_size": pageSize})
}
@@ -343,4 +343,9 @@ func TestStockInHandler_List_FilterByStatus(t *testing.T) {
w = makeRequest(r, "GET", "/api/v1/stock-in/orders?status=draft", token, nil)
resp = parseResponse(w)
assert.Equal(t, float64(1), resp["total"].(float64))
// 逗号分隔的多状态:pending + draft 应返回两条(审核标签页用法)
w = makeRequest(r, "GET", "/api/v1/stock-in/orders?status=pending,draft", token, nil)
resp = parseResponse(w)
assert.Equal(t, float64(2), resp["total"].(float64))
}
+3 -2
View File
@@ -3,6 +3,7 @@ package handler
import (
"net/http"
"strconv"
"strings"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
@@ -33,7 +34,7 @@ func (h *StockOutHandler) List(c *gin.Context) {
Where("shop_id = ? AND deleted_at IS NULL", shopID)
if status := c.Query("status"); status != "" {
query = query.Where("status = ?", status)
query = query.Where("status IN ?", strings.Split(status, ","))
}
if startDate := c.Query("start_date"); startDate != "" {
query = query.Where("order_date >= ?", startDate)
@@ -48,7 +49,7 @@ func (h *StockOutHandler) List(c *gin.Context) {
orders := make([]model.StockOutOrder, 0)
query.Preload("Warehouse").Preload("Partner").Preload("Operator").Preload("Reviewer").
Offset((page - 1) * pageSize).Limit(pageSize).
Order("id DESC").Find(&orders)
Order("order_date DESC, id DESC").Find(&orders)
c.JSON(http.StatusOK, gin.H{"data": orders, "total": total, "page": page, "page_size": pageSize})
}
@@ -60,6 +60,9 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
reload();
}
/// 当前服务端状态过滤值(供页面进入时对齐标签/下拉,避免重复拉取)
String get currentStatus => _status;
void setStatus(String status) {
_status = status;
_page = 1;
@@ -60,6 +60,9 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
reload();
}
/// 当前服务端状态过滤值(供页面进入时对齐标签/下拉,避免重复拉取)
String get currentStatus => _status;
void setStatus(String status) {
_status = status;
_page = 1;
@@ -61,6 +61,14 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
ColumnPrefs.load(_screenId).then((saved) {
if (saved != null && mounted) setState(() => _hiddenCols = saved);
});
// 进入页面时把服务端状态过滤对齐到当前标签/下拉(provider 持久化,State 会重建)
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
final tab = ref.read(stockInTabProvider);
final want = tab == 1 ? 'pending,draft' : _statusFilter;
final notifier = ref.read(stockInListProvider.notifier);
if (notifier.currentStatus != want) notifier.setStatus(want);
});
}
String? get _startDate => _dateRange != null
@@ -89,7 +97,13 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
return PageScaffold(
title: '入库管理',
initialTab: ref.read(stockInTabProvider),
onTabChanged: (i) => ref.read(stockInTabProvider.notifier).state = i,
onTabChanged: (i) {
ref.read(stockInTabProvider.notifier).state = i;
// 审核标签页按 pending+draft 服务端拉取;入库单页沿用下拉状态('' 为全部)
ref
.read(stockInListProvider.notifier)
.setStatus(i == 1 ? 'pending,draft' : _statusFilter);
},
tabs: const [
Tab(text: '入库单'),
Tab(text: '入库审核'),
@@ -124,15 +138,19 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
),
data: (result) {
final allOrders = result.data;
// 状态过滤已改为服务端驱动(setStatus)。这里仅按标签做轻量显示守卫,
// 避免共用 provider 在标签切换、refetch 在途时短暂闪现他状态数据。
final List<StockInOrder> statusFiltered;
if (filterStatus == 'pending') {
// 入库审核:服务端按 pending,draft 拉取
statusFiltered = allOrders
.where((o) => o.status == 'draft' || o.status == 'pending')
.toList();
} else if (filterStatus == 'exclude_pending') {
statusFiltered = allOrders
.where((o) => o.status != 'draft' && o.status != 'pending')
.toList();
// 入库单:服务端按下拉状态拉取;'全部状态' 显示全部(含未审核)
statusFiltered = _statusFilter.isEmpty
? allOrders
: allOrders.where((o) => o.status == _statusFilter).toList();
} else {
statusFiltered = allOrders;
}
@@ -1041,6 +1059,7 @@ class _StatusFilterDropdown extends StatelessWidget {
items: [
const DropdownMenuItem(value: '', child: Text('全部状态', style: TextStyle(fontSize: 13))),
const DropdownMenuItem(value: 'draft', child: Text('草稿', style: TextStyle(fontSize: 13))),
const DropdownMenuItem(value: 'pending', child: Text('待审核', style: TextStyle(fontSize: 13))),
const DropdownMenuItem(value: 'approved', child: Text('已审核', style: TextStyle(fontSize: 13))),
const DropdownMenuItem(value: 'rejected', child: Text('已拒绝', style: TextStyle(fontSize: 13))),
],
@@ -47,6 +47,14 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
ColumnPrefs.load(_screenId).then((saved) {
if (saved != null && mounted) setState(() => _hiddenCols = saved);
});
// 进入页面时把服务端状态过滤对齐到当前标签/下拉(provider 持久化,State 会重建)
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
final tab = ref.read(stockOutTabProvider);
final want = tab == 1 ? 'pending,draft' : _statusFilter;
final notifier = ref.read(stockOutListProvider.notifier);
if (notifier.currentStatus != want) notifier.setStatus(want);
});
}
static const _colDefs = [
@@ -89,7 +97,13 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
return PageScaffold(
title: '出库管理',
initialTab: ref.read(stockOutTabProvider),
onTabChanged: (i) => ref.read(stockOutTabProvider.notifier).state = i,
onTabChanged: (i) {
ref.read(stockOutTabProvider.notifier).state = i;
// 审核标签页按 pending+draft 服务端拉取;出库单页沿用下拉状态('' 为全部)
ref
.read(stockOutListProvider.notifier)
.setStatus(i == 1 ? 'pending,draft' : _statusFilter);
},
tabs: const [
Tab(text: '出库单'),
Tab(text: '出库审核'),
@@ -124,15 +138,19 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
),
data: (result) {
final allOrders = result.data;
// 状态过滤已改为服务端驱动(setStatus)。这里仅按标签做轻量显示守卫,
// 避免共用 provider 在标签切换、refetch 在途时短暂闪现他状态数据。
final List<StockOutOrder> statusFiltered;
if (filterStatus == 'pending') {
// 出库审核:服务端按 pending,draft 拉取
statusFiltered = allOrders
.where((o) => o.status == 'draft' || o.status == 'pending')
.toList();
} else if (filterStatus == 'exclude_pending') {
statusFiltered = allOrders
.where((o) => o.status != 'draft' && o.status != 'pending')
.toList();
// 出库单:服务端按下拉状态拉取;'全部状态' 显示全部(含未审核)
statusFiltered = _statusFilter.isEmpty
? allOrders
: allOrders.where((o) => o.status == _statusFilter).toList();
} else {
statusFiltered = allOrders;
}
@@ -950,6 +968,7 @@ class _StatusFilterDropdown extends StatelessWidget {
items: const [
DropdownMenuItem(value: '', child: Text('全部状态', style: TextStyle(fontSize: 13))),
DropdownMenuItem(value: 'draft', child: Text('草稿', style: TextStyle(fontSize: 13))),
DropdownMenuItem(value: 'pending', child: Text('待审核', style: TextStyle(fontSize: 13))),
DropdownMenuItem(value: 'approved', child: Text('已审核', style: TextStyle(fontSize: 13))),
DropdownMenuItem(value: 'rejected', child: Text('已拒绝', style: TextStyle(fontSize: 13))),
],