From 23663116574fa8f977c1241f98347833a2c28087 Mon Sep 17 00:00:00 2001 From: yinbentan <yinbentan@live.com> Date: 星期六, 29 六月 2024 18:27:48 +0800 Subject: [PATCH] 仓库盘点bug修改 --- controllers/operation.go | 61 +++++++++++++++++------------- 1 files changed, 35 insertions(+), 26 deletions(-) diff --git a/controllers/operation.go b/controllers/operation.go index e174c67..d948560 100644 --- a/controllers/operation.go +++ b/controllers/operation.go @@ -63,37 +63,42 @@ return } - if err := slf.FormatLocation(¶ms); err != nil { - util.ResponseFormat(c, code.RequestParamError, err.Error()) - return - } - if CheckDetailsRepeat(params.Details) { util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧") return } - var operationType *models.OperationType - var err error - if params.OperationTypeId == 0 { - operationType, err = models.NewOperationTypeSearch().SetWarehouseId(params.WarehouseId).SetBaseOperationType(params.BaseOperationType).First() - if err != nil || params.WarehouseId != operationType.WarehouseId { - util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け") - return - } - } else { - operationType, err = models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First() - if err != nil { + + if params.BaseOperationType != constvar.BaseOperationTypeAdjust { + if err := slf.FormatLocation(¶ms); err != nil { util.ResponseFormat(c, code.RequestParamError, err.Error()) return } + + var operationType *models.OperationType + var err error + if params.OperationTypeId == 0 { + operationType, err := models.NewOperationTypeSearch(). + SetWarehouseId(params.WarehouseId).SetBaseOperationType(params.BaseOperationType). + First() + if err != nil || params.WarehouseId != operationType.WarehouseId { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け") + return + } + } else { + operationType, err = models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First() + if err != nil { + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } + } + params.BaseOperationType = operationType.BaseOperationType + params.WarehouseId = operationType.WarehouseId } userInfo := middleware.GetUserInfo(c) params.CreatedBy = userInfo.Username params.Status = constvar.OperationStatus_Ready //params.Number = strconv.FormatInt(time.Now().Unix(), 10) - params.BaseOperationType = operationType.BaseOperationType - params.WarehouseId = operationType.WarehouseId var numberNum int64 if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil { @@ -104,7 +109,7 @@ util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�") return } - err = models.WithTransaction(func(db *gorm.DB) error { + err := models.WithTransaction(func(db *gorm.DB) error { if err := models.NewOperationSearch().Create(¶ms); err != nil { return err } @@ -148,6 +153,7 @@ return false } +// FormatLocation 浣嶇疆妫�鏌� func (slf OperationController) FormatLocation(params *models.Operation) error { operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First() if err != nil { @@ -215,9 +221,9 @@ return errors.New("璇烽�夋嫨瀹夋帓鏃ユ湡") } - if params.LocationID == 0 { - return errors.New("璇烽�夋嫨婧愪綅缃�") - } + //if params.LocationID == 0 { + // return errors.New("璇烽�夋嫨婧愪綅缃�") + //} if len(params.Details) <= 0 { return errors.New("璇锋坊鍔犳槑缁嗕俊鎭�") @@ -268,7 +274,7 @@ // @Summary 鍏ュ簱/鍑哄簱鍒楄〃 // @Produce application/json // @Param object body request.OperationList true "鏌ヨ鍙傛暟" -// @Success 200 {object} util.Response "鎴愬姛" +// @Success 200 {object} util.ResponseList{data=[]models.Operation} "鎴愬姛" // @Router /api-wms/v1/operation/list [post] func (slf OperationController) List(c *gin.Context) { var params request.OperationList @@ -358,9 +364,12 @@ util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧") return } - if err := slf.FormatLocation(¶ms); err != nil { - util.ResponseFormat(c, code.RequestParamError, err.Error()) - return + + if params.BaseOperationType != constvar.BaseOperationTypeAdjust { + if err := slf.FormatLocation(¶ms); err != nil { + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } } 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