From cb660c4be22610730966db2a4a36c3a7c008b579 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期三, 27 九月 2023 17:23:01 +0800 Subject: [PATCH] 1.二期一部分代码 --- controllers/location_product_amount.go | 96 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 91 insertions(+), 5 deletions(-) diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go index 5e0b383..c2c1c16 100644 --- a/controllers/location_product_amount.go +++ b/controllers/location_product_amount.go @@ -48,7 +48,8 @@ wms_location_product_amount.amount, material.unit, wms_location_product_amount.create_date, - wms_operation_details.amount as adjust_amount`). + wms_operation_details.amount as adjust_amount, + wms_operation.id as operation_id`). InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id"). InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id"). InnerJoins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id"). @@ -125,11 +126,12 @@ util.ResponseFormat(c, code.RequestParamError, err.Error()) return } - reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount) - //reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount) + //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount) + reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount) locAmount := models.LocationProductAmount{ LocationProductId: locProduct.Id, Amount: decimal.NewFromInt(0), + CreateDate: time.Now().Format("2006-01-02 15:04:05"), } detail := &models.OperationDetails{ ProductId: reqParams.ProductId, @@ -142,8 +144,8 @@ Comment: "搴撳瓨鐩樼偣", BaseOperationType: constvar.BaseOperationTypeAdjust, Details: []*models.OperationDetails{detail}, - FromLocationID: reqParams.LocationId, - ToLocationID: location.Id, + FromLocationID: location.Id, + ToLocationID: reqParams.LocationId, } //if reqParams.AdjustAmount.GreaterThanOrEqual(decimal.NewFromInt(0)) { @@ -169,3 +171,87 @@ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛") } + +// Add +// @Tags 搴撳瓨鐩樼偣 +// @Summary 淇敼搴撳瓨鐩樼偣淇℃伅 +// @Produce application/json +// @Param object body request.UpdateLocationProductAmount true "鍏ュ簱/鍑哄簱淇℃伅" +// @Success 200 {object} util.Response "鎴愬姛" +// @Router /api-wms/v1/locationProductAmount/update [post] +//func (slf LocationProductAmountController) Update(c *gin.Context) { +// var reqParams request.UpdateLocationProductAmount +// if err := c.BindJSON(&reqParams); err != nil { +// util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�") +// return +// } +// +// var existCount int64 +// if err := models.NewOperationSearch().Orm.Table("wms_operation").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation.from_location_id=? and wms_operation_details.product_id=? and wms_operation.base_operation_type=? and wms_operation.status=?", reqParams.LocationId, reqParams.ProductId, constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready).Count(&existCount).Error; err != nil { +// util.ResponseFormat(c, code.RequestParamError, err.Error()) +// return +// } +// if existCount > 0 { +// util.ResponseFormat(c, code.RequestError, "璇ュ晢鍝佸湪宸查�変腑鐨勪綅缃瓨鍦ㄦ湭楠岃瘉鐨勫簱瀛樼洏鐐逛俊鎭紝鏃犳硶缁х画娣诲姞鐩稿叧淇℃伅") +// return +// } +// +// locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First() +// if err != nil { +// util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛屾湭鎵惧埌璇ヤ笂鏋惰鍒�") +// return +// } +// if locProduct.Id == 0 { +// util.ResponseFormat(c, code.RequestError, "涓嶅瓨鍦ㄨ涓婃灦瑙勫垯锛屾棤娉曡繘琛屽簱瀛樼洏鐐�") +// return +// } +// location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First() +// if err != nil { +// util.ResponseFormat(c, code.RequestParamError, err.Error()) +// return +// } +// //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount) +// reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount) +// locAmount := models.LocationProductAmount{ +// LocationProductId: locProduct.Id, +// Amount: decimal.NewFromInt(0), +// CreateDate: time.Now().Format("2006-01-02 15:04:05"), +// } +// detail := &models.OperationDetails{ +// ProductId: reqParams.ProductId, +// Amount: reqParams.AdjustAmount, +// } +// operation := models.Operation{ +// Number: strconv.FormatInt(time.Now().Unix(), 10), +// Status: constvar.OperationStatus_Ready, +// OperationDate: time.Now().Format("2006-01-02 15:04:05"), +// Comment: "搴撳瓨鐩樼偣", +// BaseOperationType: constvar.BaseOperationTypeAdjust, +// Details: []*models.OperationDetails{detail}, +// FromLocationID: location.Id, +// ToLocationID: reqParams.LocationId, +// } +// +// //if reqParams.AdjustAmount.GreaterThanOrEqual(decimal.NewFromInt(0)) { +// // operation.FromLocationID = Location.Id +// // operation.ToLocationID = reqParams.LocationId +// //} else { +// // operation.FromLocationID = reqParams.LocationId +// // operation.ToLocationID = Location.Id +// //} +// +// if err := models.WithTransaction(func(tx *gorm.DB) error { +// if err := models.NewOperationSearch().SetOrm(tx).Create(&operation); err != nil { +// return err +// } +// if err := models.NewLocationProductAmountSearch().SetOrm(tx).Create(&locAmount); err != nil { +// return err +// } +// return nil +// }); err != nil { +// util.ResponseFormat(c, code.RequestError, err.Error()) +// return +// } +// +// util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛") +//} -- Gitblit v1.8.0