From ea56cea3ce65e8dddef094a648b5dd97521e1b97 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 15:03:55 +0800
Subject: [PATCH] 位置报表产品类型查询修改
---
controllers/product_controller.go | 6 +++---
models/product_category.go | 11 ++++++-----
controllers/report_forms_controller.go | 2 +-
models/location_product_amount.go | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 054b4ca..96f9306 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -318,7 +318,7 @@
return
}
- first, err := models.NewProductCategorySearch().SetID(cast.ToUint(id)).First()
+ first, err := models.NewProductCategorySearch().SetID(cast.ToInt(id)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -343,7 +343,7 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧绫诲瀷鍚嶇О涓嶈兘涓虹┖")
return
}
- err := models.NewProductCategorySearch().SetID(params.ID).Save(¶ms)
+ err := models.NewProductCategorySearch().SetID(params.Id).Save(¶ms)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "浜у搧绫诲瀷淇℃伅鏇存柊澶辫触")
return
@@ -364,7 +364,7 @@
util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")
return
}
- err := models.NewProductCategorySearch().SetID(cast.ToUint(id)).Delete()
+ err := models.NewProductCategorySearch().SetID(cast.ToInt(id)).Delete()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
return
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index a15025a..ca58506 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -236,7 +236,7 @@
ids = append(ids, params.LocationId)
} else {
//鏌ヨ浣嶇疆
- locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
+ locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).SetType(3).FindAll()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触")
return
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index dc1d0c3..6f3f767 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -17,7 +17,7 @@
LocationId int `json:"locationId" gorm:"type:int;not null;comment:浣嶇疆id"` //浣嶇疆id
Location Location `json:"location" gorm:"foreignKey:LocationId;references:id"`
ProductCategoryID int `json:"productCategoryId" gorm:"type:int;not null;comment:浜у搧绉嶇被id"` //浜у搧绉嶇被id
- ProductCategory ProductCategory `json:"productCategory" gorm:"foreignKey:ProductCategoryID;references:ID"`
+ ProductCategory ProductCategory `json:"productCategory" gorm:"foreignKey:ProductCategoryID;references:Id"`
ProductId string `json:"productId" gorm:"type:varchar(191);not null;comment:浜у搧id"` //浜у搧id
Product Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
Amount decimal.Decimal `json:"amount" gorm:"type:decimal(20,2);not null;comment:搴撳瓨鏁伴噺"` //搴撳瓨鏁伴噺
diff --git a/models/product_category.go b/models/product_category.go
index 62f611d..af90da8 100644
--- a/models/product_category.go
+++ b/models/product_category.go
@@ -10,7 +10,8 @@
type (
// ProductCategory 浜у搧鍒嗙被
ProductCategory struct {
- BaseModelInt
+ WmsModel
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:鍒嗙被鍚嶇О"` //鍒嗙被鍚嶇О
ParentId int `json:"parentId" gorm:"type:int;comment:涓婄骇鍒嗙被id"` //涓婄骇id
RouteId int `json:"routeId" gorm:"type:int;comment:璺嚎id"` //璺嚎id
@@ -55,8 +56,8 @@
return slf
}
-func (slf *ProductCategorySearch) SetID(id uint) *ProductCategorySearch {
- slf.ID = id
+func (slf *ProductCategorySearch) SetID(id int) *ProductCategorySearch {
+ slf.Id = id
return slf
}
@@ -82,8 +83,8 @@
func (slf *ProductCategorySearch) build() *gorm.DB {
var db = slf.Orm.Model(&ProductCategory{})
- if slf.ID != 0 {
- db = db.Where("id = ?", slf.ID)
+ if slf.Id != 0 {
+ db = db.Where("id = ?", slf.Id)
}
if slf.Order != "" {
--
Gitblit v1.8.0