From f3b1ba6c5d2f8f479b41e4e36093322d383b4e9c Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 19:32:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/operation.go | 133 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 120 insertions(+), 13 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 581f085..06b3c19 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -6,6 +6,7 @@
"github.com/spf13/cast"
"gorm.io/gorm"
"strconv"
+ "wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
@@ -39,12 +40,54 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+ if err := slf.FormatLocation(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ params.Status = constvar.OperationStatus_Ready
if err := models.NewOperationSearch().Create(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
return
}
util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+func (slf OperationController) FormatLocation(params *models.Operation) error {
+ operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
+ if err != nil {
+ return err
+ }
+ 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("璇烽�夋嫨鐩爣浣嶇疆")
+ }
+ }
+ if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
+ return err
+ } else {
+ params.ToLocationId = location.Id
+ }
+ if params.FromLocationId == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
+ }
+ }
+ if operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
+ if params.ToLocationId == 0 {
+ return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ }
+ if params.FromLocationId == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
+ }
+ }
+ return nil
}
func (slf OperationController) CheckParams(params models.Operation) error {
@@ -54,14 +97,6 @@
if params.OperationTypeId == 0 {
return errors.New("operationTypeId涓�0")
- }
-
- if params.FromLocationId == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
- }
-
- if params.ToLocationId == 0 {
- return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
}
if params.OperationDate == "" {
@@ -74,16 +109,13 @@
//妫�鏌ユ槑缁嗛儴鍒�
for _, v := range params.Details {
- if v.ProductId == 0 {
+ if v.ProductId == "" {
return errors.New("productID涓�0")
}
if v.ProductName == "" {
return errors.New("浜у搧鍚嶇О寮傚父")
}
if v.Quantity.IsNegative() {
- return errors.New("浜у搧鏁伴噺鍑洪敊")
- }
- if v.FinishQuantity.IsNegative() {
return errors.New("浜у搧鏁伴噺鍑洪敊")
}
}
@@ -151,11 +183,19 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇細"+err.Error())
return
}
+ if reqParams.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestParamError, "璇ュ叆搴撲俊鎭凡瀹屾垚锛屾棤娉曡繘琛屼慨鏀�")
+ return
+ }
if err := structx.AssignTo(reqParams, ¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒"+err.Error())
return
}
if err := slf.CheckParams(params); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err := slf.FormatLocation(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
@@ -190,7 +230,16 @@
return
}
if id == 0 {
- util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
+ util.ResponseFormat(c, code.RequestParamError, "id涓�0")
+ return
+ }
+ operation, err := models.NewOperationSearch().SetID(id).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ util.ResponseFormat(c, code.RequestError, "璇ュ叆搴撲俊鎭棤娉曡繘琛屽垹闄�")
return
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -207,3 +256,61 @@
}
util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
}
+
+// DeleteDevice
+//
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鏇存敼璁板綍鐘舵��
+// @Produce application/json
+// @Param id path int true "id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/finish/{id} [put]
+func (slf OperationController) Finish(c *gin.Context) {
+ id, err := strconv.Atoi(c.Param("id"))
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "閿欒鐨刬d鍊�")
+ return
+ }
+ if id == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "id涓�0")
+ return
+ }
+ operation, err := models.NewOperationSearch().SetID(id).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
+ return
+ }
+ if operation.Status != constvar.OperationStatus_Ready {
+ 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("璇烽�夋嫨鐩爣浣嶇疆")
+ // }
+ //}
+ 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
+ }
+ return nil
+ }); err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
+}
--
Gitblit v1.8.0