From ee65c91e075f1d95f620c2963ef1f5f55e4e1088 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 14 六月 2024 16:07:50 +0800
Subject: [PATCH] history report add params verified
---
controllers/operation.go | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index d519e04..8193fa9 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -102,12 +102,10 @@
return
}
productMap := models.MaterialMap(products)
- for key, value := range productMap {
- for i := 0; i < len(params.Details); i++ {
- if key == params.Details[i].ProductId {
- params.Details[i].Note = value.Note
- break
- }
+ for i, v := range params.Details {
+ material := productMap[v.ProductId]
+ if material != nil {
+ params.Details[i].Note = material.Note
}
}
@@ -176,7 +174,6 @@
return errors.New("璇烽�夋嫨婧愪綅缃�")
}
}
-
}
return nil
}
@@ -1292,6 +1289,12 @@
if params.Condition != "" {
db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or from_location.`name` like ? or to_location.`name` like ? or material.`name` like ? ", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%")
}
+ if params.WarehouseId != 0 {
+ db = db.Where("warehouse_id = ?", params.WarehouseId)
+ }
+ if params.LocationId != 0 {
+ db = db.Where("location_id = ?", params.LocationId)
+ }
var (
records = make([]*response.InventoryHistory, 0)
total int64
--
Gitblit v1.8.0