From 3f4f2d033f63296ad7e80415cfe2af41f136bfc0 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 13 十一月 2023 11:18:53 +0800
Subject: [PATCH] 修改文件服务器端口号
---
controllers/product_controller.go | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 2903cb3..8178e2d 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
@@ -56,6 +52,19 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅淇濆瓨澶辫触")
return
}
+
+ materialAttachmentList := []*models.MaterialAttachment{}
+ for _, v := range params.AttachmentIDs {
+ ma := &models.MaterialAttachment{MaterialID: params.ID, AttachmentID: v}
+ materialAttachmentList = append(materialAttachmentList, ma)
+ }
+ if len(materialAttachmentList) > 0 {
+ if err := models.NewMaterialAttachmentSearch().CreateBatch(materialAttachmentList); err != nil {
+ util.ResponseFormat(c, code.SaveFail, "闄勪欢淇濆瓨澶辫触")
+ return
+ }
+ }
+
util.ResponseFormat(c, code.Success, "淇濆瓨鎴愬姛")
}
@@ -76,7 +85,7 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- products, total, err := search.SetKeyword(params.KeyWord).SetCategoryId(params.CategoryId).SetOrder("created_at desc").Find()
+ products, total, err := search.SetPreload(true).SetKeyword(params.KeyWord).SetCategoryId(params.CategoryId).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -114,7 +123,7 @@
util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")
return
}
- material, err := models.NewMaterialSearch().SetID(id).First()
+ material, err := models.NewMaterialSearch().SetID(id).SetPreload(true).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -139,10 +148,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
@@ -155,6 +160,22 @@
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅鏇存柊澶辫触")
return
+ }
+
+ materialAttachmentList := []*models.MaterialAttachment{}
+ for _, v := range params.AttachmentIDs {
+ ma := &models.MaterialAttachment{MaterialID: params.ID, AttachmentID: v}
+ materialAttachmentList = append(materialAttachmentList, ma)
+ }
+ if err := models.NewMaterialAttachmentSearch().SetMaterialID(params.ID).Delete(); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "浜у搧闄勪欢娓呴櫎澶辫触")
+ return
+ }
+ if len(materialAttachmentList) > 0 {
+ if err := models.NewMaterialAttachmentSearch().CreateBatch(materialAttachmentList); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅鏇存柊澶辫触")
+ return
+ }
}
util.ResponseFormat(c, code.Success, "鏇存柊鎴愬姛")
}
@@ -399,9 +420,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 +504,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
}
}
--
Gitblit v1.8.0