From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里
---
controllers/product_controller.go | 179 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 120 insertions(+), 59 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 616b889..606e381 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -12,9 +12,11 @@
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
"wms/pkg/logx"
"wms/pkg/mysqlx"
+ "wms/pkg/structx"
"wms/request"
)
@@ -464,8 +466,10 @@
}
detail := &models.OperationDetails{
- ProductId: params.ProductId,
- Amount: params.Amount,
+ ProductId: params.ProductId,
+ Amount: params.Amount,
+ FromLocationID: params.FromLocationId,
+ ToLocationID: params.ToLocationId,
}
operation := models.Operation{
//Number: strconv.FormatInt(time.Now().Unix(), 10),
@@ -473,11 +477,10 @@
SourceNumber: params.SourceNumber,
OperationTypeId: 0,
Status: constvar.OperationStatus_Ready,
- FromLocationID: params.FromLocationId,
- ToLocationID: params.ToLocationId,
OperationDate: time.Now().Format("2006-01-02 15:04:05"),
Details: []*models.OperationDetails{detail},
BaseOperationType: constvar.BaseOperationTypeDisuse,
+ OperationTypeName: "搴撳瓨鎶ュ簾",
}
if err := models.NewOperationSearch().Create(&operation); err != nil {
logx.Errorf("Operation create err: %v", err)
@@ -505,7 +508,15 @@
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,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)
+ db := models.NewOperationSearch().Orm.
+ Table("wms_operation").
+ Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation_details.from_location_id,"+
+ "wms_operation_details.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,wms_operation.base_operation_type").
+ 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))
@@ -564,62 +575,34 @@
if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
return err
}
- var listProdtId []string
- var listProdt []*models.Material
- mapProdt := make(map[string]decimal.Decimal)
- listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
+
+ listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).SetPreload(true).FindAll()
if err != nil {
return err
}
- for _, v := range listDetails {
- listProdtId = append(listProdtId, v.ProductId)
- mapProdt[v.ProductId] = v.Amount
- }
- if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
- return err
- }
- for k, v := range listProdt {
- if value, ok := mapProdt[v.ID]; !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- } else {
- if v.Amount.LessThan(value) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鎶ュ簾锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愭姤搴熸搷浣�", v.Name, v.Amount.String(), value.String()))
- }
- listProdt[k].Amount = listProdt[k].Amount.Sub(value)
- 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 {
- // 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
- //}
+ for k, v := range listDetails {
+ if v.Product.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鎶ュ簾锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愭姤搴熸搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
+ }
+ listDetails[k].Product.Amount = listDetails[k].Product.Amount.Sub(v.Amount)
+ if err := tx.Save(&listDetails[k].Product).Error; err != nil {
+ return err
+ }
- locAmount, res := models.NewLocationProductAmountSearch().
- SetProductId(v.ID).
- SetLocationId(operation.FromLocationID).
- 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()))
- }
- 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.ProductId).
+ SetLocationId(v.FromLocationID).
+ FirstRes()
+ if res.Error != nil {
+ return err
+ }
+ if locAmount.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鎶ュ簾锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愭姤搴熸搷浣�", v.Product.Name, locAmount.Amount.String(), v.Amount.String()))
+ }
+ locAmount.Amount = locAmount.Amount.Sub(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
+ return err
}
}
return nil
@@ -672,6 +655,8 @@
//ProductName: params.ProductName,
Amount: params.Amount,
//Unit: params.Unit,
+ FromLocationID: params.FromLocationId,
+ ToLocationID: params.ToLocationId,
}
operation := models.Operation{
Id: params.Id,
@@ -679,8 +664,6 @@
SourceNumber: params.SourceNumber,
OperationTypeId: 0,
Status: params.Status,
- FromLocationID: params.FromLocationId,
- ToLocationID: params.ToLocationId,
OperationDate: params.OperationDate,
Details: []*models.OperationDetails{detail},
BaseOperationType: params.BaseOperationType,
@@ -723,7 +706,7 @@
}
search := models.NewOperationSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetOrder("created_at desc")
- search.SetOrm(search.Orm.InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation_details.product_id=? and (wms_operation.from_location_id=? or wms_operation.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
+ search.SetOrm(search.Orm.InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation_details.product_id=? and (wms_operation_details.from_location_id=? or wms_operation_details.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
list, total, err := search.SetBaseOperationType(constvar.BaseOperationTypeAdjust).Find()
if err != nil {
@@ -769,3 +752,81 @@
}
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
+
+// GetUserInfo
+//
+// @Tags 浜у搧
+// @Summary 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+// @Produce application/json
+// @Success 200 {object} util.ResponseList{data=map[string]interface{}} "鎴愬姛"
+// @Router /api-wms/v1/product/getUserInfo [get]
+func (slf ProductController) GetUserInfo(c *gin.Context) {
+ userInfo := middleware.GetUserInfo(c)
+ m := make(map[string]interface{})
+ m["userName"] = userInfo.Username
+ util.ResponseFormat(c, code.Success, m)
+}
+
+// GetUnitInfo
+//
+// @Tags 浜у搧
+// @Summary 鑾峰彇鍗曚綅淇℃伅
+// @Produce application/json
+// @Success 200 {object} util.ResponseList{data=[]models.UnitDict} "鎴愬姛"
+// @Router /api-wms/v1/product/getUnitInfo [get]
+func (slf ProductController) GetUnitInfo(c *gin.Context) {
+ dicts, total, err := models.NewUnitDictSearch().Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鍑洪敊")
+ return
+ }
+ util.ResponseFormatList(c, code.Success, dicts, int(total))
+}
+
+// SaveUnitDict
+//
+// @Tags 鏁版嵁瀛楀吀
+// @Summary 鏇存柊璁￠噺鍗曚綅瀛楀吀
+// @Produce application/json
+// @Param object body request.SaveUnitDict true "鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/product/saveUnitDict [post]
+func (slf ProductController) SaveUnitDict(c *gin.Context) {
+ var reqParams request.SaveUnitDict
+ var params []*models.UnitDict
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if err := structx.AssignTo(reqParams.Data, ¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒")
+ return
+ }
+
+ for i, v := range params {
+ if len(v.Name) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍚嶇О涓虹┖")
+ return
+ }
+ v.Sort = i + 1
+ }
+
+ err := models.WithTransaction(func(tx *gorm.DB) error {
+ err := models.NewUnitDictSearch().SetOrm(tx).Delete()
+ if err != nil {
+ return err
+ }
+
+ err = models.NewUnitDictSearch().SetOrm(tx).CreateBatch(params)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
--
Gitblit v1.8.0