From 2bfc37cbc679ceb5cef3b714e93ce4ebf55f9512 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 08 十一月 2023 17:24:58 +0800
Subject: [PATCH] 修改缩略图尺寸 config文件覆盖修复
---
controllers/product_controller.go | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index b9c02b5..da77f6c 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -38,10 +38,6 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧鍚嶇О涓嶈兘涓虹┖")
return
}
- if params.SalePrice.IntPart() <= 0 {
- util.ResponseFormat(c, code.RequestParamError, "浜у搧鍞环涓嶈兘灏忎簬绛変簬闆�")
- return
- }
if params.Model == "" {
util.ResponseFormat(c, code.RequestParamError, "鐗╂枡绫诲瀷涓嶈兘涓虹┖")
return
@@ -137,10 +133,6 @@
}
if params.Name == "" {
util.ResponseFormat(c, code.RequestParamError, "浜у搧鍚嶇О涓嶈兘涓虹┖")
- return
- }
- if params.SalePrice.IntPart() <= 0 {
- util.ResponseFormat(c, code.RequestParamError, "浜у搧鍞环涓嶈兘灏忎簬绛変簬闆�")
return
}
if params.Model == "" {
@@ -399,9 +391,7 @@
return
}
- //db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,wms_operation_details.product_name,wms_operation_details.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id")
-
- db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id")
+ db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)
if params.Number != "" {
db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or material.name like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))
@@ -485,19 +475,35 @@
if err := tx.Save(listProdt[k]).Error; err != nil {
return err
}
- var locAmount models.LocationProductAmount
- if err := models.NewLocationProductAmountSearch().Orm.
- Table("wms_location_product_amount").
- Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
- Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).
- First(&locAmount).Error; err != nil {
+
+ //var locAmount models.LocationProductAmount
+ //if err := models.NewLocationProductAmountSearch().Orm.
+ // Table("wms_location_product_amount").
+ // Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
+ // Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).
+ // First(&locAmount).Error; err != nil {
+ // return err
+ //}
+ //if locAmount.Amount.LessThan(value) {
+ // return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+ //}
+ //locAmount.Amount = locAmount.Amount.Sub(value)
+ //if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
+ // return err
+ //}
+
+ locAmount, res := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(operation.ToLocationID).
+ FirstRes()
+ if res.Error != nil {
return err
}
if locAmount.Amount.LessThan(value) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鎶ュ簾锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愭姤搴熸搷浣�", v.Name, v.Amount.String(), value.String()))
}
locAmount.Amount = locAmount.Amount.Sub(value)
- if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
return err
}
}
@@ -543,6 +549,10 @@
util.ResponseFormat(c, code.RequestParamError, "璇ヤ俊鎭棤娉曚慨鏀�")
return
}
+ if params.ProductId == "" {
+ util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨鎶ュ簾浜у搧")
+ return
+ }
detail := &models.OperationDetails{
ProductId: params.ProductId,
//ProductName: params.ProductName,
@@ -550,15 +560,16 @@
//Unit: params.Unit,
}
operation := models.Operation{
- Id: params.Id,
- Number: params.Number,
- SourceNumber: params.SourceNumber,
- OperationTypeId: 0,
- Status: params.Status,
- FromLocationID: params.FromLocationId,
- ToLocationID: params.ToLocationId,
- OperationDate: params.OperationDate,
- Details: []*models.OperationDetails{detail},
+ Id: params.Id,
+ Number: params.Number,
+ SourceNumber: params.SourceNumber,
+ OperationTypeId: 0,
+ Status: params.Status,
+ FromLocationID: params.FromLocationId,
+ ToLocationID: params.ToLocationId,
+ OperationDate: params.OperationDate,
+ Details: []*models.OperationDetails{detail},
+ BaseOperationType: params.BaseOperationType,
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {
--
Gitblit v1.8.0