Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 71ed15b40b | |||
| fb1e637ce4 |
@@ -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/),
|
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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [1.0.64] - 2026-06-20
|
||||||
|
|
||||||
|
### 新功能
|
||||||
|
- 入库单 / 出库单列表新增搜索框:输入单号或往来单位名称即可即时筛选,不用再翻页查找
|
||||||
|
- 入库 / 出库 / 库存三个列表均新增刷新按钮:多端并发录入后可一键同步最新数据
|
||||||
|
|
||||||
## [1.0.63] - 2026-06-20
|
## [1.0.63] - 2026-06-20
|
||||||
|
|
||||||
### 修复
|
### 修复
|
||||||
|
|||||||
@@ -5,6 +5,15 @@
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [1.0.67] - 2026-06-20
|
||||||
|
|
||||||
|
### 修复
|
||||||
|
- 历史导入单审核入库后,库存里商品显示为「历史导入占位」、按真实名搜不到的问题:审核生成库存时改用单据明细自带的真实商品名/编码/系列/规格,库存列表也不再显示已删除的占位商品名
|
||||||
|
- 库存列表按真实商品名/编码即可搜到这些历史商品
|
||||||
|
|
||||||
|
### 新功能
|
||||||
|
- 入库单 / 出库单列表支持关键词搜索:按单号或往来单位名称即时筛选
|
||||||
|
|
||||||
## [1.0.66] - 2026-06-20
|
## [1.0.66] - 2026-06-20
|
||||||
|
|
||||||
### 修复
|
### 修复
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
|
|||||||
specStr := c.Query("spec")
|
specStr := c.Query("spec")
|
||||||
|
|
||||||
if keyword != "" {
|
if keyword != "" {
|
||||||
baseWhere += " AND (COALESCE(NULLIF(p.name,''), inv.product_name) LIKE ? OR COALESCE(NULLIF(p.code,''), inv.product_code) LIKE ? OR p.name_pinyin LIKE ? OR p.name_initials LIKE ?)"
|
baseWhere += " AND (COALESCE(NULLIF(p.name,''), NULLIF(sii.product_name,''), inv.product_name) LIKE ? OR COALESCE(NULLIF(p.code,''), NULLIF(sii.product_code,''), inv.product_code) LIKE ? OR p.name_pinyin LIKE ? OR p.name_initials LIKE ?)"
|
||||||
like := "%" + keyword + "%"
|
like := "%" + keyword + "%"
|
||||||
args = append(args, like, like, like, like)
|
args = append(args, like, like, like, like)
|
||||||
}
|
}
|
||||||
@@ -101,7 +101,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
|
|||||||
SELECT COUNT(*)
|
SELECT COUNT(*)
|
||||||
FROM inventories inv
|
FROM inventories inv
|
||||||
LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
|
LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
|
||||||
LEFT JOIN products p ON p.id = inv.product_id
|
LEFT JOIN products p ON p.id = inv.product_id AND p.deleted_at IS NULL
|
||||||
LEFT JOIN warehouses w ON w.id = inv.warehouse_id
|
LEFT JOIN warehouses w ON w.id = inv.warehouse_id
|
||||||
WHERE ` + baseWhere
|
WHERE ` + baseWhere
|
||||||
|
|
||||||
@@ -116,10 +116,10 @@ func (h *InventoryHandler) List(c *gin.Context) {
|
|||||||
SELECT
|
SELECT
|
||||||
inv.id, inv.shop_id, inv.warehouse_id, inv.product_id, inv.stock_in_item_id,
|
inv.id, inv.shop_id, inv.warehouse_id, inv.product_id, inv.stock_in_item_id,
|
||||||
inv.quantity,
|
inv.quantity,
|
||||||
COALESCE(NULLIF(p.code,''), inv.product_code, '') AS product_code,
|
COALESCE(NULLIF(p.code,''), NULLIF(sii.product_code,''), inv.product_code, '') AS product_code,
|
||||||
COALESCE(NULLIF(p.name,''), inv.product_name, '') AS product_name,
|
COALESCE(NULLIF(p.name,''), NULLIF(sii.product_name,''), inv.product_name, '') AS product_name,
|
||||||
COALESCE(NULLIF(p.series,''), inv.series, '') AS series,
|
COALESCE(NULLIF(p.series,''), NULLIF(sii.series,''), inv.series, '') AS series,
|
||||||
COALESCE(NULLIF(p.spec,''), inv.spec, '') AS spec,
|
COALESCE(NULLIF(p.spec,''), NULLIF(sii.spec,''), inv.spec, '') AS spec,
|
||||||
COALESCE(NULLIF(p.unit,''), inv.unit, '') AS unit,
|
COALESCE(NULLIF(p.unit,''), inv.unit, '') AS unit,
|
||||||
COALESCE(NULLIF(w.name,''), inv.warehouse_name, '') AS warehouse_name,
|
COALESCE(NULLIF(w.name,''), inv.warehouse_name, '') AS warehouse_name,
|
||||||
COALESCE(sii.unit_price, inv.unit_price) AS unit_price,
|
COALESCE(sii.unit_price, inv.unit_price) AS unit_price,
|
||||||
@@ -132,7 +132,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
|
|||||||
inv.created_at
|
inv.created_at
|
||||||
FROM inventories inv
|
FROM inventories inv
|
||||||
LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
|
LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
|
||||||
LEFT JOIN products p ON p.id = inv.product_id
|
LEFT JOIN products p ON p.id = inv.product_id AND p.deleted_at IS NULL
|
||||||
LEFT JOIN warehouses w ON w.id = inv.warehouse_id
|
LEFT JOIN warehouses w ON w.id = inv.warehouse_id
|
||||||
WHERE ` + baseWhere + `
|
WHERE ` + baseWhere + `
|
||||||
ORDER BY inv.id DESC
|
ORDER BY inv.id DESC
|
||||||
|
|||||||
@@ -219,6 +219,52 @@ func TestInventoryHandler_List_HotelIsolation(t *testing.T) {
|
|||||||
assert.Equal(t, float64(0), respB["total"].(float64))
|
assert.Equal(t, float64(0), respB["total"].(float64))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 库存指向已软删的占位商品时,列表应回退到明细/库存快照真名,
|
||||||
|
// 而非占位商品名「历史导入占位」,且能按真名搜索到。
|
||||||
|
func TestInventoryHandler_List_DeletedProductFallsBackToSnapshot(t *testing.T) {
|
||||||
|
db := testutil.SetupTestDB()
|
||||||
|
shop := testutil.CreateTestShop(db, "INV009")
|
||||||
|
user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
|
||||||
|
warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
|
||||||
|
placeholder := testutil.CreateTestProduct(db, shop.ID, "历史导入占位")
|
||||||
|
token := getAuthToken(user.ID, shop.ID, "admin")
|
||||||
|
r := setupProtectedRouter(db)
|
||||||
|
|
||||||
|
// 明细携带真实快照名
|
||||||
|
item := model.StockInItem{
|
||||||
|
ShopID: shop.ID,
|
||||||
|
ProductID: placeholder.ID,
|
||||||
|
ProductCode: "ZXZ029751",
|
||||||
|
ProductName: "贵州茅台酒2006",
|
||||||
|
Quantity: 10,
|
||||||
|
}
|
||||||
|
require.NoError(t, db.Create(&item).Error)
|
||||||
|
|
||||||
|
// 库存:product_id 指向占位商品,且 product_name 也是占位名(模拟旧脏数据)
|
||||||
|
require.NoError(t, db.Create(&model.Inventory{
|
||||||
|
ShopID: shop.ID,
|
||||||
|
WarehouseID: &warehouse.ID,
|
||||||
|
ProductID: &placeholder.ID,
|
||||||
|
StockInItemID: &item.ID,
|
||||||
|
ProductName: "历史导入占位",
|
||||||
|
Quantity: 10,
|
||||||
|
}).Error)
|
||||||
|
|
||||||
|
// 软删占位商品
|
||||||
|
require.NoError(t, db.Delete(&placeholder).Error)
|
||||||
|
|
||||||
|
// 列表:名称应回退到明细快照真名
|
||||||
|
w := makeRequest(r, "GET", "/api/v1/inventory", token, nil)
|
||||||
|
resp := parseResponse(w)
|
||||||
|
require.Equal(t, float64(1), resp["total"].(float64))
|
||||||
|
invItem := resp["data"].([]interface{})[0].(map[string]interface{})
|
||||||
|
assert.Equal(t, "贵州茅台酒2006", invItem["product_name"])
|
||||||
|
|
||||||
|
// 按真名可搜到
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/inventory?keyword=茅台", token, nil)
|
||||||
|
assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
|
||||||
|
}
|
||||||
|
|
||||||
func TestInventoryHandler_AfterStockInApprove(t *testing.T) {
|
func TestInventoryHandler_AfterStockInApprove(t *testing.T) {
|
||||||
db := testutil.SetupTestDB()
|
db := testutil.SetupTestDB()
|
||||||
shop := testutil.CreateTestShop(db, "INV008")
|
shop := testutil.CreateTestShop(db, "INV008")
|
||||||
|
|||||||
@@ -49,6 +49,13 @@ func (h *StockInHandler) List(c *gin.Context) {
|
|||||||
if endDate := c.Query("end_date"); endDate != "" {
|
if endDate := c.Query("end_date"); endDate != "" {
|
||||||
query = query.Where("order_date <= ?", endDate)
|
query = query.Where("order_date <= ?", endDate)
|
||||||
}
|
}
|
||||||
|
if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
|
||||||
|
like := "%" + kw + "%"
|
||||||
|
query = query.Where(
|
||||||
|
"order_no LIKE ? OR partner_id IN (SELECT id FROM partners WHERE shop_id = ? AND name LIKE ?)",
|
||||||
|
like, shopID, like,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
var total int64
|
var total int64
|
||||||
query.Count(&total)
|
query.Count(&total)
|
||||||
|
|||||||
@@ -308,6 +308,51 @@ func TestStockInHandler_Reject_NotPending(t *testing.T) {
|
|||||||
assert.Equal(t, http.StatusBadRequest, w.Code)
|
assert.Equal(t, http.StatusBadRequest, w.Code)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStockInHandler_List_FilterByKeyword(t *testing.T) {
|
||||||
|
db := testutil.SetupTestDB()
|
||||||
|
shop := testutil.CreateTestShop(db, "SI011")
|
||||||
|
user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
|
||||||
|
warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
|
||||||
|
product := testutil.CreateTestProduct(db, shop.ID, "Brandy")
|
||||||
|
token := getAuthToken(user.ID, shop.ID, "admin")
|
||||||
|
r := setupProtectedRouter(db)
|
||||||
|
|
||||||
|
// 往来单位:茅台供应商
|
||||||
|
partner := &model.Partner{Code: "P001", Name: "茅台供应商", Type: "supplier"}
|
||||||
|
partner.ShopID = shop.ID
|
||||||
|
require.NoError(t, db.Create(partner).Error)
|
||||||
|
|
||||||
|
// 单据1:挂往来单位
|
||||||
|
w := makeRequest(r, "POST", "/api/v1/stock-in/orders", token, map[string]interface{}{
|
||||||
|
"warehouse_id": warehouse.ID,
|
||||||
|
"partner_id": partner.ID,
|
||||||
|
"order_date": time.Now().Format(time.RFC3339),
|
||||||
|
"items": []map[string]interface{}{{"product_id": product.ID, "quantity": 5.0}},
|
||||||
|
})
|
||||||
|
require.Equal(t, http.StatusCreated, w.Code)
|
||||||
|
order1No := parseResponse(w)["data"].(map[string]interface{})["order_no"].(string)
|
||||||
|
|
||||||
|
// 单据2:无往来单位
|
||||||
|
w = makeRequest(r, "POST", "/api/v1/stock-in/orders", token, map[string]interface{}{
|
||||||
|
"warehouse_id": warehouse.ID,
|
||||||
|
"order_date": time.Now().Format(time.RFC3339),
|
||||||
|
"items": []map[string]interface{}{{"product_id": product.ID, "quantity": 3.0}},
|
||||||
|
})
|
||||||
|
require.Equal(t, http.StatusCreated, w.Code)
|
||||||
|
|
||||||
|
// 按往来单位名搜索 → 只命中单据1
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/stock-in/orders?keyword=茅台", token, nil)
|
||||||
|
assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
|
||||||
|
|
||||||
|
// 按单号搜索 → 只命中单据1
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/stock-in/orders?keyword="+order1No, token, nil)
|
||||||
|
assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
|
||||||
|
|
||||||
|
// 无关键词 → 两条都在
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/stock-in/orders", token, nil)
|
||||||
|
assert.Equal(t, float64(2), parseResponse(w)["total"].(float64))
|
||||||
|
}
|
||||||
|
|
||||||
func TestStockInHandler_List_FilterByStatus(t *testing.T) {
|
func TestStockInHandler_List_FilterByStatus(t *testing.T) {
|
||||||
db := testutil.SetupTestDB()
|
db := testutil.SetupTestDB()
|
||||||
shop := testutil.CreateTestShop(db, "SI010")
|
shop := testutil.CreateTestShop(db, "SI010")
|
||||||
|
|||||||
@@ -42,6 +42,13 @@ func (h *StockOutHandler) List(c *gin.Context) {
|
|||||||
if endDate := c.Query("end_date"); endDate != "" {
|
if endDate := c.Query("end_date"); endDate != "" {
|
||||||
query = query.Where("order_date <= ?", endDate)
|
query = query.Where("order_date <= ?", endDate)
|
||||||
}
|
}
|
||||||
|
if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
|
||||||
|
like := "%" + kw + "%"
|
||||||
|
query = query.Where(
|
||||||
|
"order_no LIKE ? OR partner_id IN (SELECT id FROM partners WHERE shop_id = ? AND name LIKE ?)",
|
||||||
|
like, shopID, like,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
var total int64
|
var total int64
|
||||||
query.Count(&total)
|
query.Count(&total)
|
||||||
|
|||||||
@@ -133,6 +133,51 @@ func TestStockOutHandler_List(t *testing.T) {
|
|||||||
assert.Equal(t, float64(2), resp["total"].(float64))
|
assert.Equal(t, float64(2), resp["total"].(float64))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStockOutHandler_List_FilterByKeyword(t *testing.T) {
|
||||||
|
db := testutil.SetupTestDB()
|
||||||
|
shop := testutil.CreateTestShop(db, "SO011")
|
||||||
|
user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
|
||||||
|
warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
|
||||||
|
product := testutil.CreateTestProduct(db, shop.ID, "Beer")
|
||||||
|
token := getAuthToken(user.ID, shop.ID, "admin")
|
||||||
|
r := setupProtectedRouter(db)
|
||||||
|
|
||||||
|
// 往来单位:海底捞客户
|
||||||
|
partner := &model.Partner{Code: "C001", Name: "海底捞客户", Type: "customer"}
|
||||||
|
partner.ShopID = shop.ID
|
||||||
|
require.NoError(t, db.Create(partner).Error)
|
||||||
|
|
||||||
|
// 单据1:挂往来单位
|
||||||
|
w := makeRequest(r, "POST", "/api/v1/stock-out/orders", token, map[string]interface{}{
|
||||||
|
"warehouse_id": warehouse.ID,
|
||||||
|
"partner_id": partner.ID,
|
||||||
|
"order_date": time.Now().Format(time.RFC3339),
|
||||||
|
"items": []map[string]interface{}{{"product_id": product.ID, "quantity": 1.0}},
|
||||||
|
})
|
||||||
|
require.Equal(t, http.StatusCreated, w.Code)
|
||||||
|
order1No := parseResponse(w)["data"].(map[string]interface{})["order_no"].(string)
|
||||||
|
|
||||||
|
// 单据2:无往来单位
|
||||||
|
w = makeRequest(r, "POST", "/api/v1/stock-out/orders", token, map[string]interface{}{
|
||||||
|
"warehouse_id": warehouse.ID,
|
||||||
|
"order_date": time.Now().Format(time.RFC3339),
|
||||||
|
"items": []map[string]interface{}{{"product_id": product.ID, "quantity": 1.0}},
|
||||||
|
})
|
||||||
|
require.Equal(t, http.StatusCreated, w.Code)
|
||||||
|
|
||||||
|
// 按往来单位名搜索
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/stock-out/orders?keyword=海底捞", token, nil)
|
||||||
|
assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
|
||||||
|
|
||||||
|
// 按单号搜索
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/stock-out/orders?keyword="+order1No, token, nil)
|
||||||
|
assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
|
||||||
|
|
||||||
|
// 无关键词
|
||||||
|
w = makeRequest(r, "GET", "/api/v1/stock-out/orders", token, nil)
|
||||||
|
assert.Equal(t, float64(2), parseResponse(w)["total"].(float64))
|
||||||
|
}
|
||||||
|
|
||||||
func TestStockOutHandler_Reject(t *testing.T) {
|
func TestStockOutHandler_Reject(t *testing.T) {
|
||||||
db := testutil.SetupTestDB()
|
db := testutil.SetupTestDB()
|
||||||
shop := testutil.CreateTestShop(db, "SO004")
|
shop := testutil.CreateTestShop(db, "SO004")
|
||||||
|
|||||||
@@ -64,16 +64,26 @@ func (s *StockService) ApproveStockIn(shopID, orderID, reviewerID uint64) error
|
|||||||
unitPricePtr = &itemCopy.UnitPrice
|
unitPricePtr = &itemCopy.UnitPrice
|
||||||
}
|
}
|
||||||
|
|
||||||
productCode := ""
|
// 优先使用明细自带快照列(历史导入单的真实商品信息在此),
|
||||||
productName := ""
|
// Product 关联仅作兜底(普通 UI 录入单的明细快照为空)。
|
||||||
series := ""
|
productCode := itemCopy.ProductCode
|
||||||
spec := ""
|
productName := itemCopy.ProductName
|
||||||
|
series := itemCopy.Series
|
||||||
|
spec := itemCopy.Spec
|
||||||
unit := ""
|
unit := ""
|
||||||
if itemCopy.Product != nil {
|
if itemCopy.Product != nil {
|
||||||
productCode = itemCopy.Product.Code
|
if productCode == "" {
|
||||||
productName = itemCopy.Product.Name
|
productCode = itemCopy.Product.Code
|
||||||
series = itemCopy.Product.Series
|
}
|
||||||
spec = itemCopy.Product.Spec
|
if productName == "" {
|
||||||
|
productName = itemCopy.Product.Name
|
||||||
|
}
|
||||||
|
if series == "" {
|
||||||
|
series = itemCopy.Product.Series
|
||||||
|
}
|
||||||
|
if spec == "" {
|
||||||
|
spec = itemCopy.Product.Spec
|
||||||
|
}
|
||||||
unit = itemCopy.Product.Unit
|
unit = itemCopy.Product.Unit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,6 +65,47 @@ func TestStockService_ApproveStockIn_Success(t *testing.T) {
|
|||||||
assert.Equal(t, float64(10), logs[0].QtyAfter)
|
assert.Equal(t, float64(10), logs[0].QtyAfter)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 历史导入单:明细自带真实快照名,product_id 指向占位商品(名「历史导入占位」)。
|
||||||
|
// 审核生成的库存应使用明细快照真名,而非占位商品名。
|
||||||
|
func TestStockService_ApproveStockIn_PrefersItemSnapshot(t *testing.T) {
|
||||||
|
db := testutil.SetupTestDB()
|
||||||
|
shop := testutil.CreateTestShop(db, "STOCK009")
|
||||||
|
warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
|
||||||
|
placeholder := testutil.CreateTestProduct(db, shop.ID, "历史导入占位")
|
||||||
|
user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
|
||||||
|
|
||||||
|
order := model.StockInOrder{
|
||||||
|
TenantBase: model.TenantBase{ShopID: shop.ID},
|
||||||
|
OrderNo: "IN20240101000009",
|
||||||
|
WarehouseID: warehouse.ID,
|
||||||
|
OperatorID: user.ID,
|
||||||
|
Status: "pending",
|
||||||
|
OrderDate: model.Date{Time: time.Now()},
|
||||||
|
Items: []model.StockInItem{
|
||||||
|
{
|
||||||
|
ShopID: shop.ID,
|
||||||
|
ProductID: placeholder.ID,
|
||||||
|
ProductCode: "ZXZ029751",
|
||||||
|
ProductName: "贵州茅台酒2006",
|
||||||
|
Series: "茅台",
|
||||||
|
Spec: "500ml",
|
||||||
|
Quantity: 10,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
require.NoError(t, db.Create(&order).Error)
|
||||||
|
|
||||||
|
svc := NewStockService(db)
|
||||||
|
require.NoError(t, svc.ApproveStockIn(shop.ID, order.ID, user.ID))
|
||||||
|
|
||||||
|
var inv model.Inventory
|
||||||
|
require.NoError(t, db.Where("shop_id = ? AND product_id = ?", shop.ID, placeholder.ID).First(&inv).Error)
|
||||||
|
assert.Equal(t, "贵州茅台酒2006", inv.ProductName)
|
||||||
|
assert.Equal(t, "ZXZ029751", inv.ProductCode)
|
||||||
|
assert.Equal(t, "茅台", inv.Series)
|
||||||
|
assert.Equal(t, "500ml", inv.Spec)
|
||||||
|
}
|
||||||
|
|
||||||
func TestStockService_ApproveStockIn_NotPending(t *testing.T) {
|
func TestStockService_ApproveStockIn_NotPending(t *testing.T) {
|
||||||
db := testutil.SetupTestDB()
|
db := testutil.SetupTestDB()
|
||||||
shop := testutil.CreateTestShop(db, "STOCK002")
|
shop := testutil.CreateTestShop(db, "STOCK002")
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
|
|||||||
String _status = '';
|
String _status = '';
|
||||||
String? _startDate;
|
String? _startDate;
|
||||||
String? _endDate;
|
String? _endDate;
|
||||||
|
String _keyword = '';
|
||||||
PageResult<StockInOrder>? _cache;
|
PageResult<StockInOrder>? _cache;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -44,6 +45,7 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
|
|||||||
status: _status.isEmpty ? null : _status,
|
status: _status.isEmpty ? null : _status,
|
||||||
startDate: _startDate,
|
startDate: _startDate,
|
||||||
endDate: _endDate,
|
endDate: _endDate,
|
||||||
|
keyword: _keyword.isEmpty ? null : _keyword,
|
||||||
page: _page,
|
page: _page,
|
||||||
pageSize: _pageSize,
|
pageSize: _pageSize,
|
||||||
);
|
);
|
||||||
@@ -76,6 +78,12 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
|
|||||||
reload();
|
reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setKeyword(String keyword) {
|
||||||
|
_keyword = keyword;
|
||||||
|
_page = 1;
|
||||||
|
reload();
|
||||||
|
}
|
||||||
|
|
||||||
void reload() {
|
void reload() {
|
||||||
state = const AsyncValue.loading();
|
state = const AsyncValue.loading();
|
||||||
_fetch().then((result) {
|
_fetch().then((result) {
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
|
|||||||
String _status = '';
|
String _status = '';
|
||||||
String? _startDate;
|
String? _startDate;
|
||||||
String? _endDate;
|
String? _endDate;
|
||||||
|
String _keyword = '';
|
||||||
PageResult<StockOutOrder>? _cache;
|
PageResult<StockOutOrder>? _cache;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -44,6 +45,7 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
|
|||||||
status: _status.isEmpty ? null : _status,
|
status: _status.isEmpty ? null : _status,
|
||||||
startDate: _startDate,
|
startDate: _startDate,
|
||||||
endDate: _endDate,
|
endDate: _endDate,
|
||||||
|
keyword: _keyword.isEmpty ? null : _keyword,
|
||||||
page: _page,
|
page: _page,
|
||||||
pageSize: _pageSize,
|
pageSize: _pageSize,
|
||||||
);
|
);
|
||||||
@@ -76,6 +78,12 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
|
|||||||
reload();
|
reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setKeyword(String keyword) {
|
||||||
|
_keyword = keyword;
|
||||||
|
_page = 1;
|
||||||
|
reload();
|
||||||
|
}
|
||||||
|
|
||||||
void reload() {
|
void reload() {
|
||||||
state = const AsyncValue.loading();
|
state = const AsyncValue.loading();
|
||||||
_fetch().then((result) {
|
_fetch().then((result) {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class StockInRepository {
|
|||||||
String? status,
|
String? status,
|
||||||
String? startDate,
|
String? startDate,
|
||||||
String? endDate,
|
String? endDate,
|
||||||
|
String? keyword,
|
||||||
int page = 1,
|
int page = 1,
|
||||||
int pageSize = 20,
|
int pageSize = 20,
|
||||||
}) async {
|
}) async {
|
||||||
@@ -23,6 +24,7 @@ class StockInRepository {
|
|||||||
if (status != null && status.isNotEmpty) 'status': status,
|
if (status != null && status.isNotEmpty) 'status': status,
|
||||||
if (startDate != null) 'start_date': startDate,
|
if (startDate != null) 'start_date': startDate,
|
||||||
if (endDate != null) 'end_date': endDate,
|
if (endDate != null) 'end_date': endDate,
|
||||||
|
if (keyword != null && keyword.isNotEmpty) 'keyword': keyword,
|
||||||
};
|
};
|
||||||
final resp = await _client.get('/stock-in/orders', params: params);
|
final resp = await _client.get('/stock-in/orders', params: params);
|
||||||
return PageResult.fromJson(
|
return PageResult.fromJson(
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class StockOutRepository {
|
|||||||
String? status,
|
String? status,
|
||||||
String? startDate,
|
String? startDate,
|
||||||
String? endDate,
|
String? endDate,
|
||||||
|
String? keyword,
|
||||||
int page = 1,
|
int page = 1,
|
||||||
int pageSize = 20,
|
int pageSize = 20,
|
||||||
}) async {
|
}) async {
|
||||||
@@ -23,6 +24,7 @@ class StockOutRepository {
|
|||||||
if (status != null && status.isNotEmpty) 'status': status,
|
if (status != null && status.isNotEmpty) 'status': status,
|
||||||
if (startDate != null) 'start_date': startDate,
|
if (startDate != null) 'start_date': startDate,
|
||||||
if (endDate != null) 'end_date': endDate,
|
if (endDate != null) 'end_date': endDate,
|
||||||
|
if (keyword != null && keyword.isNotEmpty) 'keyword': keyword,
|
||||||
};
|
};
|
||||||
final resp = await _client.get('/stock-out/orders', params: params);
|
final resp = await _client.get('/stock-out/orders', params: params);
|
||||||
return PageResult.fromJson(
|
return PageResult.fromJson(
|
||||||
|
|||||||
@@ -677,6 +677,13 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
|
|||||||
ColumnPrefs.save(_screenId, v);
|
ColumnPrefs.save(_screenId, v);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
IconButton(
|
||||||
|
tooltip: '刷新',
|
||||||
|
icon: const Icon(Icons.refresh, size: 20),
|
||||||
|
onPressed: () => ref
|
||||||
|
.read(inventoryListProvider.notifier)
|
||||||
|
.reload(),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -712,6 +719,13 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
|
|||||||
ColumnPrefs.save(_screenId, v);
|
ColumnPrefs.save(_screenId, v);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
OutlinedButton.icon(
|
||||||
|
onPressed: () =>
|
||||||
|
ref.read(inventoryListProvider.notifier).reload(),
|
||||||
|
icon: const Icon(Icons.refresh, size: 16),
|
||||||
|
label: const Text('刷新'),
|
||||||
|
),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
|||||||
Set<String> _filterWarehouse = {};
|
Set<String> _filterWarehouse = {};
|
||||||
Set<String> _filterSupplier = {};
|
Set<String> _filterSupplier = {};
|
||||||
Set<String>? _hiddenCols; // null = 尚未载入本地存档(回退到 minWidth 首次默认)
|
Set<String>? _hiddenCols; // null = 尚未载入本地存档(回退到 minWidth 首次默认)
|
||||||
|
final _searchCtrl = TextEditingController();
|
||||||
|
|
||||||
static const _screenId = 'stock_in_list';
|
static const _screenId = 'stock_in_list';
|
||||||
|
|
||||||
@@ -71,6 +72,15 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_searchCtrl.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _triggerSearch() =>
|
||||||
|
ref.read(stockInListProvider.notifier).setKeyword(_searchCtrl.text.trim());
|
||||||
|
|
||||||
String? get _startDate => _dateRange != null
|
String? get _startDate => _dateRange != null
|
||||||
? '${_dateRange!.start.year}-${_dateRange!.start.month.toString().padLeft(2, '0')}-${_dateRange!.start.day.toString().padLeft(2, '0')}'
|
? '${_dateRange!.start.year}-${_dateRange!.start.month.toString().padLeft(2, '0')}-${_dateRange!.start.day.toString().padLeft(2, '0')}'
|
||||||
: null;
|
: null;
|
||||||
@@ -352,6 +362,27 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
|||||||
)
|
)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
|
final searchField = TextField(
|
||||||
|
controller: _searchCtrl,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: '单号/往来单位,回车搜索',
|
||||||
|
prefixIcon: const Icon(Icons.search, size: 16),
|
||||||
|
hintStyle: const TextStyle(fontSize: 12),
|
||||||
|
suffixIcon: IconButton(
|
||||||
|
icon: const Icon(Icons.search, size: 16),
|
||||||
|
tooltip: '搜索',
|
||||||
|
onPressed: _triggerSearch,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onSubmitted: (_) => _triggerSearch(),
|
||||||
|
);
|
||||||
|
|
||||||
|
final refreshBtn = IconButton(
|
||||||
|
tooltip: '刷新',
|
||||||
|
icon: const Icon(Icons.refresh, size: 20),
|
||||||
|
onPressed: () => ref.read(stockInListProvider.notifier).reload(),
|
||||||
|
);
|
||||||
|
|
||||||
final dateBtn = OutlinedButton.icon(
|
final dateBtn = OutlinedButton.icon(
|
||||||
onPressed: _pickDateRange,
|
onPressed: _pickDateRange,
|
||||||
icon: const Icon(Icons.date_range, size: 16),
|
icon: const Icon(Icons.date_range, size: 16),
|
||||||
@@ -374,28 +405,36 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
|||||||
: null;
|
: null;
|
||||||
|
|
||||||
if (isMobile) {
|
if (isMobile) {
|
||||||
return Wrap(
|
return Column(
|
||||||
spacing: 8,
|
mainAxisSize: MainAxisSize.min,
|
||||||
runSpacing: 4,
|
|
||||||
crossAxisAlignment: WrapCrossAlignment.center,
|
|
||||||
children: [
|
children: [
|
||||||
if (newBtn != null) newBtn,
|
searchField,
|
||||||
if (statusFilter != null) statusFilter,
|
const SizedBox(height: 8),
|
||||||
dateBtn,
|
Wrap(
|
||||||
if (clearDate != null) clearDate,
|
spacing: 8,
|
||||||
IconButton(
|
runSpacing: 4,
|
||||||
tooltip: '导出',
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
icon: const Icon(Icons.download, size: 20),
|
children: [
|
||||||
onPressed: doExport,
|
if (newBtn != null) newBtn,
|
||||||
),
|
if (statusFilter != null) statusFilter,
|
||||||
ColumnToggleButton(
|
dateBtn,
|
||||||
columns: _colDefs,
|
if (clearDate != null) clearDate,
|
||||||
hidden: hidden,
|
IconButton(
|
||||||
compact: true,
|
tooltip: '导出',
|
||||||
onChanged: (v) {
|
icon: const Icon(Icons.download, size: 20),
|
||||||
setState(() => _hiddenCols = v);
|
onPressed: doExport,
|
||||||
ColumnPrefs.save(_screenId, v);
|
),
|
||||||
},
|
ColumnToggleButton(
|
||||||
|
columns: _colDefs,
|
||||||
|
hidden: hidden,
|
||||||
|
compact: true,
|
||||||
|
onChanged: (v) {
|
||||||
|
setState(() => _hiddenCols = v);
|
||||||
|
ColumnPrefs.save(_screenId, v);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
refreshBtn,
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@@ -403,6 +442,8 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
|||||||
|
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
|
SizedBox(width: 220, child: searchField),
|
||||||
|
const SizedBox(width: 12),
|
||||||
if (newBtn != null) newBtn,
|
if (newBtn != null) newBtn,
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
if (statusFilter != null) ...[
|
if (statusFilter != null) ...[
|
||||||
@@ -429,6 +470,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
|||||||
ColumnPrefs.save(_screenId, v);
|
ColumnPrefs.save(_screenId, v);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
refreshBtn,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
|||||||
Set<String> _filterWarehouse = {};
|
Set<String> _filterWarehouse = {};
|
||||||
Set<String> _filterCustomer = {};
|
Set<String> _filterCustomer = {};
|
||||||
Set<String>? _hiddenCols; // null = 尚未载入本地存档(回退到 minWidth 首次默认)
|
Set<String>? _hiddenCols; // null = 尚未载入本地存档(回退到 minWidth 首次默认)
|
||||||
|
final _searchCtrl = TextEditingController();
|
||||||
|
|
||||||
static const _screenId = 'stock_out_list';
|
static const _screenId = 'stock_out_list';
|
||||||
|
|
||||||
@@ -71,6 +72,16 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
|||||||
ColDef('actions', '操作', required: true),
|
ColDef('actions', '操作', required: true),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_searchCtrl.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _triggerSearch() => ref
|
||||||
|
.read(stockOutListProvider.notifier)
|
||||||
|
.setKeyword(_searchCtrl.text.trim());
|
||||||
|
|
||||||
String? get _startDate => _dateRange != null
|
String? get _startDate => _dateRange != null
|
||||||
? '${_dateRange!.start.year}-${_dateRange!.start.month.toString().padLeft(2, '0')}-${_dateRange!.start.day.toString().padLeft(2, '0')}'
|
? '${_dateRange!.start.year}-${_dateRange!.start.month.toString().padLeft(2, '0')}-${_dateRange!.start.day.toString().padLeft(2, '0')}'
|
||||||
: null;
|
: null;
|
||||||
@@ -358,6 +369,27 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
|||||||
)
|
)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
|
final searchField = TextField(
|
||||||
|
controller: _searchCtrl,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: '单号/往来单位,回车搜索',
|
||||||
|
prefixIcon: const Icon(Icons.search, size: 16),
|
||||||
|
hintStyle: const TextStyle(fontSize: 12),
|
||||||
|
suffixIcon: IconButton(
|
||||||
|
icon: const Icon(Icons.search, size: 16),
|
||||||
|
tooltip: '搜索',
|
||||||
|
onPressed: _triggerSearch,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onSubmitted: (_) => _triggerSearch(),
|
||||||
|
);
|
||||||
|
|
||||||
|
final refreshBtn = IconButton(
|
||||||
|
tooltip: '刷新',
|
||||||
|
icon: const Icon(Icons.refresh, size: 20),
|
||||||
|
onPressed: () => ref.read(stockOutListProvider.notifier).reload(),
|
||||||
|
);
|
||||||
|
|
||||||
final dateBtn = OutlinedButton.icon(
|
final dateBtn = OutlinedButton.icon(
|
||||||
onPressed: _pickDateRange,
|
onPressed: _pickDateRange,
|
||||||
icon: const Icon(Icons.date_range, size: 16),
|
icon: const Icon(Icons.date_range, size: 16),
|
||||||
@@ -380,28 +412,36 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
|||||||
: null;
|
: null;
|
||||||
|
|
||||||
if (isMobile) {
|
if (isMobile) {
|
||||||
return Wrap(
|
return Column(
|
||||||
spacing: 8,
|
mainAxisSize: MainAxisSize.min,
|
||||||
runSpacing: 4,
|
|
||||||
crossAxisAlignment: WrapCrossAlignment.center,
|
|
||||||
children: [
|
children: [
|
||||||
if (newBtn != null) newBtn,
|
searchField,
|
||||||
if (statusFilter != null) statusFilter,
|
const SizedBox(height: 8),
|
||||||
dateBtn,
|
Wrap(
|
||||||
if (clearDate != null) clearDate,
|
spacing: 8,
|
||||||
IconButton(
|
runSpacing: 4,
|
||||||
tooltip: '导出',
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
icon: const Icon(Icons.download, size: 20),
|
children: [
|
||||||
onPressed: doExport,
|
if (newBtn != null) newBtn,
|
||||||
),
|
if (statusFilter != null) statusFilter,
|
||||||
ColumnToggleButton(
|
dateBtn,
|
||||||
columns: _colDefs,
|
if (clearDate != null) clearDate,
|
||||||
hidden: hidden,
|
IconButton(
|
||||||
compact: true,
|
tooltip: '导出',
|
||||||
onChanged: (v) {
|
icon: const Icon(Icons.download, size: 20),
|
||||||
setState(() => _hiddenCols = v);
|
onPressed: doExport,
|
||||||
ColumnPrefs.save(_screenId, v);
|
),
|
||||||
},
|
ColumnToggleButton(
|
||||||
|
columns: _colDefs,
|
||||||
|
hidden: hidden,
|
||||||
|
compact: true,
|
||||||
|
onChanged: (v) {
|
||||||
|
setState(() => _hiddenCols = v);
|
||||||
|
ColumnPrefs.save(_screenId, v);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
refreshBtn,
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@@ -409,6 +449,8 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
|||||||
|
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
|
SizedBox(width: 220, child: searchField),
|
||||||
|
const SizedBox(width: 12),
|
||||||
if (newBtn != null) newBtn,
|
if (newBtn != null) newBtn,
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
if (statusFilter != null) ...[
|
if (statusFilter != null) ...[
|
||||||
@@ -435,6 +477,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
|||||||
ColumnPrefs.save(_screenId, v);
|
ColumnPrefs.save(_screenId, v);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
refreshBtn,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
|
|||||||
Reference in New Issue
Block a user