From 96844c22ef3fba86a55e0af1b51bc1009d6fa950 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 20 十月 2023 11:57:48 +0800
Subject: [PATCH] 1.库存盘点bug修改
---
controllers/location_product_amount.go | 245 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 199 insertions(+), 46 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index c3fc1b8..ce3bcf4 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "errors"
"fmt"
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
@@ -12,6 +13,7 @@
"wms/extend/util"
"wms/models"
"wms/request"
+ "wms/response"
)
type LocationProductAmountController struct {
@@ -23,25 +25,32 @@
// @Produce application/json
// @Param object body request.PageInfo true "鏌ヨ鍙傛暟"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/locationProductamount/list [post]
+// @Router /api-wms/v1/locationProductAmount/list [post]
func (slf LocationProductAmountController) List(c *gin.Context) {
var params request.PageInfo
if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
return
}
- if params.Check() {
+ if !params.Check() {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父")
return
}
search := models.NewLocationProductAmountSearch()
- search.SetPage(params.Page, params.PageSize)
+ //search.SetPage(params.Page, params.PageSize)
- search.Orm = search.Orm.Model(&models.LocationProductAmountWithOperation{}).Table("wms_location_product_amount").Select("wms_location_product_amount.*,wms_operation.amount as adjust_amount").InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").InnerJoins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").InnerJoins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeAdjust)
-
+ //wms_operation_details.amount as adjust_amount,wms_operation.id as operation_id,wms_operation.status
+ search.Orm = search.Orm.
+ Table("wms_location_product_amount").
+ Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.name as location_name,material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,wms_location_product_amount.create_date`).
+ InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
+ InnerJoins("inner join material on material.id=wms_location_product.product_id").
+ InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id")
+ //Joins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
+ //Joins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id and wms_operation.base_operation_type=? and wms_operation.status=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready)
var (
- records = make([]*models.ResponseDisuseList, 0)
+ records = make([]*models.LocationProductAmountWithOperation, 0)
total int64
)
@@ -49,15 +58,31 @@
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
return
}
- search.Orm = search.Orm.Preload("LocationProduct").Preload("LocationProduct.Location").Preload("LocationProduct.Product")
+ //search.Orm = search.Orm.Preload("LocationProduct").Preload("LocationProduct.Location").Preload("LocationProduct.Product")
if params.Page*params.PageSize > 0 {
search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
}
- if err := search.Orm.Find(&records).Error; err != nil {
+ if err := search.Orm.Order("wms_location_product_amount.updated_at desc").Find(&records).Error; err != nil {
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
return
}
-
+ var operation models.Operation
+ for k, v := range records {
+ if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
+ if errors.Is(res.Error, gorm.ErrRecordNotFound) {
+ records[k].Status = constvar.OperationStatus_Finish
+ continue
+ } else {
+ util.ResponseFormat(c, code.RequestError, fmt.Errorf("find operation err: %v", res.Error.Error()))
+ return
+ }
+ } else {
+ records[k].AdjustAmount = operation.Details[0].Amount
+ records[k].OperationId = operation.Id
+ records[k].Status = operation.Status
+ records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ }
+ }
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
@@ -65,54 +90,63 @@
// @Tags 搴撳瓨鐩樼偣
// @Summary 娣诲姞搴撳瓨鐩樼偣淇℃伅
// @Produce application/json
-// @Param object body request.AddLocationProductAmount true "鍏ュ簱/鍑哄簱淇℃伅"
+// @Param object body request.UpdateLocationProductAmount true "鍏ュ簱/鍑哄簱淇℃伅"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/locationProductamount/add [post]
+// @Router /api-wms/v1/locationProductAmount/add [post]
func (slf LocationProductAmountController) Add(c *gin.Context) {
- var reqParams request.AddLocationProductAmount
+ var reqParams request.UpdateLocationProductAmount
if err := c.BindJSON(&reqParams); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
+
+ if err := AddLocationProductAmount(reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestError, err)
+ }
+
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+func AddLocationProductAmount(reqParams request.UpdateLocationProductAmount) error {
if reqParams.LocationId == 0 {
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛岃閫夋嫨浣嶇疆")
- return
+ return errors.New("鍙傛暟寮傚父锛屼綅缃甶d淇℃伅涓嶅瓨鍦�")
}
if reqParams.ProductId == "" {
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛岃閫夋嫨浜у搧")
- return
+ return errors.New("鍙傛暟寮傚父锛屼骇鍝乮d淇℃伅涓嶅瓨鍦�")
}
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_operaton.status=?", reqParams.LocationId, reqParams.ProductId, constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready).Count(&existCount).Error; err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ 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 {
+ return err
}
if existCount > 0 {
- util.ResponseFormat(c, code.RequestError, "璇ュ晢鍝佸湪宸查�変腑鐨勪綅缃瓨鍦ㄦ湭楠岃瘉鐨勫簱瀛樼洏鐐逛俊鎭紝鏃犳硶缁х画娣诲姞鐩稿叧淇℃伅")
- return
+ return errors.New("璇ュ晢鍝佸湪宸查�変腑鐨勪綅缃瓨鍦ㄦ湭楠岃瘉鐨勫簱瀛樼洏鐐逛俊鎭紝鏃犳硶缁х画娣诲姞鐩稿叧淇℃伅")
}
locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛屾湭鎵惧埌璇ヤ笂鏋惰鍒�")
- return
+ return errors.New("鍙傛暟寮傚父锛屾湭鎵惧埌璇ヤ笂鏋惰鍒�")
}
- if locProduct.Id == 0 {
- util.ResponseFormat(c, code.RequestError, "涓嶅瓨鍦ㄨ涓婃灦瑙勫垯锛屾棤娉曡繘琛屽簱瀛樼洏鐐�")
- return
+
+ existAmount, err := models.NewLocationProductAmountSearch().SetLocationProductId(locProduct.Id).First()
+ if err != nil {
+ return err
}
location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ return err
}
- reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
- //reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
- locAmount := models.LocationProductAmount{
- LocationProductId: locProduct.Id,
- Amount: decimal.NewFromInt(0),
+ //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
+ reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
+ var locAmount models.LocationProductAmount
+ if existAmount.Id == 0 {
+ 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,
@@ -124,23 +158,143 @@
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)) {
- // 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 {
+ if existAmount.Id == 0 {
+ if err := models.NewLocationProductAmountSearch().SetOrm(tx).Create(&locAmount); err != nil {
+ return err
+ }
+ }
+ return nil
+ }); err != nil {
+ return err
+ }
+ return nil
+}
+
+// GetRuleList
+// @Tags 搴撳瓨鐩樼偣
+// @Summary 鑾峰彇涓婃灦瑙勫垯
+// @Produce application/json
+// @Param object body request.GetRuleList true "鏌ヨ淇℃伅"
+// @Success 200 {object} util.ResponseList{data=[]response.RuleList} "鎴愬姛"
+// @Router /api-wms/v1/locationProductAmount/getRuleList [post]
+func (slf LocationProductAmountController) GetRuleList(c *gin.Context) {
+ var params request.GetRuleList
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ list, err := models.NewLocationProductSearch().SetProductId(params.ProductId).SetLocationId(params.LocationId).Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ var ruleList response.RuleList
+ for _, l := range list {
+ ruleList.LocationList = append(ruleList.LocationList, l.Location)
+ ruleList.ProductList = append(ruleList.ProductList, l.Product)
+ }
+ util.ResponseFormat(c, code.Success, ruleList)
+}
+
+// Update
+// @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, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if reqParams.OperationId == 0 {
+ if err := AddLocationProductAmount(reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+ return
+ }
+ reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
+ operation, err := models.NewOperationSearch().SetID(reqParams.OperationId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏虫暟鎹�")
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曞凡楠岃瘉閫氳繃锛屾棤娉曡繘琛屼慨鏀�")
+ return
+ }
+
+ if err := models.NewOperationDetailsSearch().SetOperationId(reqParams.OperationId).SetProductId(reqParams.ProductId).Update(&models.OperationDetails{Amount: reqParams.AdjustAmount}); err != nil {
+ util.ResponseFormat(c, code.RequestError, "淇敼澶辫触锛�"+err.Error())
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
+}
+
+// finish
+//
+// @Tags 搴撳瓨鐩樼偣
+// @Summary 搴旂敤銆侀獙璇�
+// @Produce application/json
+// @Param object body request.FinishLocationProductAmount true "鍏ュ弬"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/locationProductAmount/finish [post]
+func (slf LocationProductAmountController) Finish(c *gin.Context) {
+ var reqParams request.FinishLocationProductAmount
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if reqParams.LocationProductAmountId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "locationProductAmountId涓�0")
+ return
+ }
+ if reqParams.OperationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "operationId涓�0")
+ return
+ }
+ operationSearch := models.NewOperationSearch().SetPreload(true)
+ operationSearch.SetOrm(operationSearch.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.id=?", reqParams.ProductId, reqParams.OperationId))
+ operation, err := operationSearch.First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏充俊鎭�:"+err.Error())
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestError, "璇ラ獙璇佹棤娉曞畬鎴�")
+ return
+ }
+ material, err := models.NewMaterialSearch().SetID(reqParams.ProductId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ locProdtAmount, err := models.NewLocationProductAmountSearch().SetID(reqParams.LocationProductAmountId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ if err := models.WithTransaction(func(tx *gorm.DB) error {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(reqParams.OperationId).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
+ return err
+ }
+ if err := models.NewMaterialSearch().SetOrm(tx).SetID(reqParams.ProductId).Update(&models.Material{Amount: material.Amount.Add(operation.Details[0].Amount)}); err != nil {
+ return err
+ }
+ if err := models.NewLocationProductAmountSearch().SetOrm(tx).SetID(reqParams.LocationProductAmountId).Update(&models.LocationProductAmount{Amount: locProdtAmount.Amount.Add(operation.Details[0].Amount)}); err != nil {
return err
}
return nil
@@ -148,6 +302,5 @@
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
-
- util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
--
Gitblit v1.8.0