From ea02a2a9a8219d44b103f0a31cf9fc81ff8495e1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 23 九月 2023 16:57:48 +0800
Subject: [PATCH] 产品列表添加类型名称
---
controllers/operation.go | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 06b3c19..32d16bb 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -2,8 +2,9 @@
import (
"errors"
+ "fmt"
"github.com/gin-gonic/gin"
- "github.com/spf13/cast"
+ "github.com/shopspring/decimal"
"gorm.io/gorm"
"strconv"
"wms/constvar"
@@ -63,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("璇烽�夋嫨鐩爣浣嶇疆")
}
}
@@ -73,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("璇烽�夋嫨婧愪綅缃�")
}
}
@@ -110,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("浜у搧鏁伴噺鍑洪敊")
}
}
@@ -168,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 {
@@ -201,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 {
@@ -284,28 +283,47 @@
util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚")
return
}
- //operationType, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
- //if err != nil {
- // util.ResponseFormat(c, code.RequestError, err.Error())
- // return
- //}
- //if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
- // if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First(); err != nil {
- // return err
- // } else {
- // params.FromLocationId = location.Id
- // }
- // if params.ToLocationId == 0 {
- // return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
- // }
- //}
+ operationType, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).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(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); 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.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 {
+ var listProdtId []string
+ var listProdt []*models.Material
+ mapProdt := make(map[string]decimal.Decimal)
+ listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
+ if err != nil {
+ return err
+ }
+ for _, v := range listDetails {
+ listProdtId = append(listProdtId, v.ProductId)
+ 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 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
+ }
}
return nil
}); err != nil {
--
Gitblit v1.8.0