From 5c1dfdd9f0d51821ac47a46cba74ef94bfe0141e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 27 九月 2023 17:28:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/location_product_amount.go | 205 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 180 insertions(+), 25 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 701a205..c2c1c16 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -3,6 +3,10 @@
import (
"fmt"
"github.com/gin-gonic/gin"
+ "github.com/shopspring/decimal"
+ "gorm.io/gorm"
+ "strconv"
+ "time"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
@@ -19,14 +23,14 @@
// @Produce application/json
// @Param object body request.PageInfo true "鏌ヨ鍙傛暟"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/locationProduct/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
}
@@ -34,10 +38,27 @@
search := models.NewLocationProductAmountSearch()
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)
+ search.Orm = search.Orm.
+ Table("wms_location_product_amount").
+ Select(`
+ 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,
+ 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").
+ InnerJoins("inner join material on material.id=wms_operation_details.product_id").
+ InnerJoins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id").
+ Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeAdjust)
var (
- records = make([]*models.ResponseDisuseList, 0)
+ records = make([]*models.LocationProductAmountWithOperation, 0)
total int64
)
@@ -45,7 +66,7 @@
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)
}
@@ -53,7 +74,9 @@
util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
return
}
-
+ for k, v := range records {
+ records[k].DifferenceAmount = v.Amount.Sub(v.AdjustAmount)
+ }
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
@@ -63,40 +86,172 @@
// @Produce application/json
// @Param object body request.AddLocationProductAmount true "鍏ュ簱/鍑哄簱淇℃伅"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/operation/operation [post]
-//func (slf LocationProductAmountController) Add(c *gin.Context) {
-// var reqParams request.AddLocationProductAmount
+// @Router /api-wms/v1/locationProductAmount/add [post]
+func (slf LocationProductAmountController) Add(c *gin.Context) {
+ var reqParams request.AddLocationProductAmount
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if reqParams.LocationId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛岃閫夋嫨浣嶇疆")
+ return
+ }
+ if reqParams.ProductId == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛岃閫夋嫨浜у搧")
+ 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, "娣诲姞鎴愬姛")
+}
+
+// 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, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
// return
// }
-// if reqParams.LocationProductAmountId==0 {
-// util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父锛宭ocationProductAmountId涓�0")
+//
+// 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
// }
-// locAmount:=models.LocationProductAmount{
-// LocationProductId: reqParams.LocationProductAmountId
+// if existCount > 0 {
+// util.ResponseFormat(c, code.RequestError, "璇ュ晢鍝佸湪宸查�変腑鐨勪綅缃瓨鍦ㄦ湭楠岃瘉鐨勫簱瀛樼洏鐐逛俊鎭紝鏃犳硶缁х画娣诲姞鐩稿叧淇℃伅")
+// return
// }
-// operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
+//
+// 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
// }
-// //////
-// if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
-// return err
-// } else {
-// params.ToLocationID = location.Id
+// //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
+// //}
//
-// params.Status = constvar.OperationStatus_Ready
-// params.Number = strconv.FormatInt(time.Now().Unix(), 10)
-// params.BaseOperationType = operationType.BaseOperationType
-// if err := models.NewOperationSearch().Create(¶ms); err != nil {
-// logx.Errorf("Operation create err: %v", err)
-// util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
+// 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