From 34e1e9dbc7a750048c0825b8f91b07ed526ae577 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 22 九月 2023 15:41:48 +0800
Subject: [PATCH] 1.根据产品获取出入库历史记录
---
controllers/operation.go | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 1c25adc..97f68b3 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -5,7 +5,6 @@
"fmt"
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
- "github.com/spf13/cast"
"gorm.io/gorm"
"strconv"
"wms/constvar"
@@ -65,9 +64,9 @@
if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First(); err != nil {
return err
} else {
- params.FromLocationId = location.Id
+ params.FromLocationID = location.Id
}
- if params.ToLocationId == 0 {
+ if params.ToLocationID == 0 {
return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
}
}
@@ -75,17 +74,17 @@
if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
return err
} else {
- params.ToLocationId = location.Id
+ params.ToLocationID = location.Id
}
- if params.FromLocationId == 0 {
+ if params.FromLocationID == 0 {
return errors.New("璇烽�夋嫨婧愪綅缃�")
}
}
if operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
- if params.ToLocationId == 0 {
+ if params.ToLocationID == 0 {
return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
}
- if params.FromLocationId == 0 {
+ if params.FromLocationID == 0 {
return errors.New("璇烽�夋嫨婧愪綅缃�")
}
}
@@ -112,12 +111,12 @@
//妫�鏌ユ槑缁嗛儴鍒�
for _, v := range params.Details {
if v.ProductId == "" {
- return errors.New("productID涓�0")
+ return errors.New("productID涓虹┖")
}
if v.ProductName == "" {
return errors.New("浜у搧鍚嶇О寮傚父")
}
- if v.Quantity.IsNegative() {
+ if v.Amount.IsNegative() {
return errors.New("浜у搧鏁伴噺鍑洪敊")
}
}
@@ -170,15 +169,9 @@
// @Summary 淇敼鍏ュ簱/鍑哄簱淇℃伅
// @Produce application/json
// @Param object body request.UpdateOperation true "鍏ュ簱淇℃伅"
-// @Param id path int true "鍏ュ簱淇℃伅id"
// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/operation/operation/{id} [put]
+// @Router /api-wms/v1/operation/update [post]
func (slf OperationController) Update(c *gin.Context) {
- id := cast.ToUint(c.Param("id"))
- if id == 0 {
- util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
- return
- }
var reqParams request.UpdateOperation
var params models.Operation
if err := c.BindJSON(&reqParams); err != nil {
@@ -203,6 +196,10 @@
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {
+ return err
+ }
+ operationSearch := models.NewOperationSearch().SetOrm(tx)
+ if err := operationSearch.Orm.Model(¶ms).Association("Details").Replace(params.Details); err != nil {
return err
}
if err := models.NewOperationSearch().SetOrm(tx).SetID(params.Id).Save(¶ms); err != nil {
@@ -296,11 +293,7 @@
if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
return err
}
- if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
- if err := models.NewMaterialSearch().Orm.Exec("update material INNER JOIN wms_operation_details on wms_operation_details.product_id=material.id INNER JOIN wms_operation on wms_operation.id=wms_operation_details.operation_id set material.amount=material.amount + wms_operation_details.quantity where wms_operation.id=?", id).Error; err != nil {
- return err
- }
- } else if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operationType.BaseOperationType != constvar.BaseOperationTypeInternal {
var listProdtId []string
var listProdt []*models.Material
mapProdt := make(map[string]decimal.Decimal)
@@ -310,23 +303,39 @@
}
for _, v := range listDetails {
listProdtId = append(listProdtId, v.ProductId)
- mapProdt[v.ProductId] = v.Quantity
+ mapProdt[v.ProductId] = v.Amount
}
if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
return err
}
- for _, 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()))
+ if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ for k, v := range listProdt {
+ if value, ok := mapProdt[v.ID]; !ok {
+ return errors.New("浜у搧绉嶇被寮傚父")
+ } else {
+ listProdt[k].Amount.Add(value)
+ if err := tx.Save(listProdt[k]).Error; err != nil {
+ return err
+ }
}
}
}
- if err := models.NewMaterialSearch().Orm.Exec("update material INNER JOIN wms_operation_details on wms_operation_details.product_id=material.id INNER JOIN wms_operation on wms_operation.id=wms_operation_details.operation_id set material.amount=material.amount - wms_operation_details.quantity where wms_operation.id=?", id).Error; err != nil {
- return err
+ if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ 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.Sub(value)
+ if err := tx.Save(listProdt[k]).Error; err != nil {
+ return err
+ }
+ }
+ }
}
+
}
return nil
}); err != nil {
--
Gitblit v1.8.0