From 0eac8cd498471e510c1887a914e6e28d1dfb4b19 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期二, 31 十月 2023 11:54:49 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- controllers/location_product.go | 84 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 73 insertions(+), 11 deletions(-) diff --git a/controllers/location_product.go b/controllers/location_product.go index 854d451..5955d2c 100644 --- a/controllers/location_product.go +++ b/controllers/location_product.go @@ -1,8 +1,11 @@ package controllers import ( + "errors" "github.com/gin-gonic/gin" + "gorm.io/gorm" "strconv" + "wms/constvar" "wms/extend/code" "wms/extend/util" "wms/models" @@ -40,14 +43,43 @@ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浣嶇疆") return } - if params.ProductId == "" { - util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧") + + if params.RuleType != constvar.RuleType_Product && params.RuleType != constvar.RuleType_ProductCategory { + util.ResponseFormat(c, code.RequestParamError, "ruleType寮傚父") return } - //if params.ProductCategoryID == 0 { - // util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧绫诲埆") - // return - //} + + if params.RuleType == constvar.RuleType_Product { + if params.ProductId == "" { + util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧") + return + } + if _, err := models.NewLocationProductSearch().SetProductId(params.ProductId).SetLocationId(params.LocationId).SetAreaId(params.AreaId).First(); err != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } + } else { + util.ResponseFormat(c, code.RequestParamError, "宸插瓨鍦ㄨ涓婂瑙勫垯锛岃鍕块噸澶嶆坊鍔�") + return + } + } + + if params.RuleType == constvar.RuleType_ProductCategory { + if params.ProductCategoryID == 0 { + util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧绫诲埆") + return + } + if _, err := models.NewLocationProductSearch().SetProductCategoryId(params.ProductCategoryID).SetLocationId(params.LocationId).SetAreaId(params.AreaId).First(); err != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } + } else { + util.ResponseFormat(c, code.RequestParamError, "宸插瓨鍦ㄨ涓婂瑙勫垯锛岃鍕块噸澶嶆坊鍔�") + return + } + } if err := models.NewLocationProductSearch().Create(¶ms); err != nil { logx.Errorf("Operation create err: %v", err) @@ -116,14 +148,44 @@ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浣嶇疆") return } - if params.ProductId == "" { - util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧") + + if params.RuleType != constvar.RuleType_Product && params.RuleType != constvar.RuleType_ProductCategory { + util.ResponseFormat(c, code.RequestParamError, "ruleType寮傚父") return } - if params.ProductCategoryID == 0 { - util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧绫诲埆") - return + + if params.RuleType == constvar.RuleType_Product { + if params.ProductId == "" { + util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧") + return + } + if rule, err := models.NewLocationProductSearch().SetProductId(params.ProductId).SetLocationId(params.LocationId).SetAreaId(params.AreaId).First(); err != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } + } else if params.Id != rule.Id { + util.ResponseFormat(c, code.RequestParamError, "宸插瓨鍦ㄨ涓婂瑙勫垯锛岃鍕块噸澶嶆坊鍔�") + return + } } + + if params.RuleType == constvar.RuleType_ProductCategory { + if params.ProductCategoryID == 0 { + util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨浜у搧绫诲埆") + return + } + if rule, err := models.NewLocationProductSearch().SetProductCategoryId(params.ProductCategoryID).SetLocationId(params.LocationId).SetAreaId(params.AreaId).First(); err != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } + } else if params.Id != rule.Id { + util.ResponseFormat(c, code.RequestParamError, "宸插瓨鍦ㄨ涓婂瑙勫垯锛岃鍕块噸澶嶆坊鍔�") + return + } + } + if err := models.NewLocationProductSearch().SetID(params.Id).Update(¶ms); err != nil { logx.Errorf("LocationProduct update err: %v", err) util.ResponseFormat(c, code.SaveFail, "淇敼澶辫触锛�"+err.Error()) -- Gitblit v1.8.0