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 | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 4a74aec..8193fa9 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -92,6 +92,23 @@
return
}
+ var productIds []string
+ for _, v := range params.Details {
+ productIds = append(productIds, v.ProductId)
+ }
+ products, err := models.NewMaterialSearch().SetIDs(productIds).FindNotTotal()
+ if err != nil {
+ logx.Errorf("MonthStats get products err:%v", err)
+ return
+ }
+ productMap := models.MaterialMap(products)
+ for i, v := range params.Details {
+ material := productMap[v.ProductId]
+ if material != nil {
+ params.Details[i].Note = material.Note
+ }
+ }
+
if err := models.NewOperationSearch().Create(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -157,7 +174,6 @@
return errors.New("璇烽�夋嫨婧愪綅缃�")
}
}
-
}
return nil
}
@@ -1273,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