From d80428a19673e819440a34f2565b6dbbbe6ac567 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 18 七月 2024 22:32:08 +0800
Subject: [PATCH] fix

---
 controllers/warehouse.go |  116 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/controllers/warehouse.go b/controllers/warehouse.go
index 01c1ba3..087679e 100644
--- a/controllers/warehouse.go
+++ b/controllers/warehouse.go
@@ -7,11 +7,11 @@
 	"github.com/spf13/cast"
 	"gorm.io/gorm"
 	"strconv"
+	"strings"
 	"wms/constvar"
 	"wms/extend/code"
 	"wms/extend/util"
 	"wms/models"
-	"wms/pkg/logx"
 	"wms/pkg/structx"
 	"wms/request"
 )
@@ -41,24 +41,46 @@
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
-	//鍒涘缓榛樿浣嶇疆
-	location := &models.Location{
-		Name:              "榛樿浣嶇疆",
-		JointName:         params.Code,
-		Type:              constvar.LocationTypeInternal,
-		ReplenishLocation: true,
-	}
-	locationId, err := models.NewLocationSearch().CreateReturnId(location)
-	if err != nil {
-		util.ResponseFormat(c, code.SaveFail, "浣嶇疆鍒涘缓澶辫触")
-		return
-	}
-	params.LocationId = locationId
-	err = models.WithTransaction(func(tx *gorm.DB) error {
+
+	err := models.WithTransaction(func(tx *gorm.DB) error {
 		err := models.NewWarehouseSearch().SetOrm(tx).Create(&params)
 		if err != nil {
 			return err
 		}
+
+		//鍒涘缓瑙嗗浘
+		view := &models.Location{
+			Name:        params.Code,
+			JointName:   params.Code,
+			Type:        constvar.LocationTypeView,
+			WarehouseId: params.Id,
+		}
+		viewId, err := models.NewLocationSearch().CreateReturnId(view)
+		if err != nil {
+			return err
+		}
+
+		//鍒涘缓榛樿浣嶇疆
+		location := &models.Location{
+			Name:              params.Name,
+			JointName:         params.Name,
+			Type:              constvar.LocationTypeInternal,
+			ReplenishLocation: true,
+			ParentId:          viewId,
+			WarehouseId:       params.Id,
+		}
+		locationId, err := models.NewLocationSearch().SetOrm(tx).CreateReturnId(location)
+		if err != nil {
+			return err
+		}
+
+		//鏇存敼浠撳簱璁板綍閲岀殑浣嶇疆id
+		params.LocationId = locationId
+		err = models.NewWarehouseSearch().SetOrm(tx).SetID(params.Id).UpdateByMap(map[string]interface{}{"location_id": locationId})
+		if err != nil {
+			return err
+		}
+
 		//鍒涘缓涓変釜榛樿鎿嶄綔绫诲瀷
 		var types []*models.OperationType
 		inType := &models.OperationType{
@@ -82,9 +104,8 @@
 		err = models.NewOperationTypeSearch().SetOrm(tx).CreateBatch(types)
 		return err
 	})
+
 	if err != nil {
-		_ = models.NewLocationSearch().SetID(locationId).Delete()
-		logx.Errorf("warehouse create err: %v", err)
 		util.ResponseFormat(c, code.SaveFail, "鎻掑叆澶辫触")
 		return
 	}
@@ -109,7 +130,34 @@
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
-	err := models.NewWarehouseSearch().SetID(params.Id).Update(&params)
+	warehouse, err := models.NewWarehouseSearch().SetID(params.Id).First()
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "浠撳簱涓嶅瓨鍦�")
+		return
+	}
+	err = models.WithTransaction(func(db *gorm.DB) error {
+		//鏇存柊浣滀笟绫诲瀷鍚嶇О
+		if params.Name != warehouse.Name {
+			m := make(map[string]interface{})
+			m["name"] = params.Name + "-鍏ュ簱"
+			err := models.NewOperationTypeSearch().SetOrm(db).SetBaseOperationType(constvar.BaseOperationTypeIncoming).SetWarehouseId(params.Id).UpdateByMap(m)
+			if err != nil {
+				return err
+			}
+			m["name"] = params.Name + "-鍑哄簱"
+			err = models.NewOperationTypeSearch().SetOrm(db).SetBaseOperationType(constvar.BaseOperationTypeOutgoing).SetWarehouseId(params.Id).UpdateByMap(m)
+			if err != nil {
+				return err
+			}
+			m["name"] = params.Name + "-鍐呴儴璋冩嫧"
+			err = models.NewOperationTypeSearch().SetOrm(db).SetBaseOperationType(constvar.BaseOperationTypeInternal).SetWarehouseId(params.Id).UpdateByMap(m)
+			if err != nil {
+				return err
+			}
+		}
+		err = models.NewWarehouseSearch().SetID(params.Id).Update(&params)
+		return err
+	})
 
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触")
@@ -129,9 +177,27 @@
 	}
 	//鏇存柊浣嶇疆淇℃伅
 	if oldRecord != nil && params.Code != oldRecord.Code {
-		m := make(map[string]interface{})
-		m["joint_name"] = params.Code
-		err := models.NewLocationSearch().SetID(oldRecord.LocationId).UpdateByMap(m)
+		locations, err := models.NewLocationSearch().SetJointName(oldRecord.Code).FindNotTotal()
+		if err != nil {
+			return errors.New("鏌ヨ浣嶇疆淇℃伅澶辫触")
+		}
+
+		err = models.WithTransaction(func(db *gorm.DB) error {
+			for _, location := range locations {
+				m := make(map[string]interface{})
+				index := strings.Index(location.JointName, "/")
+				if index > 0 {
+					m["joint_name"] = params.Code + location.JointName[index:]
+				} else {
+					m["joint_name"] = params.Code
+				}
+				err = models.NewLocationSearch().SetOrm(db).SetID(location.Id).UpdateByMap(m)
+				if err != nil {
+					return err
+				}
+			}
+			return nil
+		})
 		if err != nil {
 			return errors.New("鏇存柊浣嶇疆淇℃伅澶辫触")
 		}
@@ -168,11 +234,11 @@
 		return
 	}
 	//鑾峰彇浣嶇疆淇℃伅
-	codes := make([]string, 0)
+	ids := make([]int, 0)
 	for _, warehouse := range list {
-		codes = append(codes, warehouse.Code)
+		ids = append(ids, warehouse.LocationId)
 	}
-	locations, err := models.NewLocationSearch().SetJointNames(codes).FindNotTotal()
+	locations, err := models.NewLocationSearch().SetIds(ids).FindNotTotal()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "浣嶇疆淇℃伅鏌ユ壘澶辫触")
 		return
@@ -180,7 +246,7 @@
 	for _, warehouse := range list {
 		for _, location := range locations {
 			if warehouse.LocationId == location.Id {
-				warehouse.WarehouseLocation = warehouse.Code + "/" + location.Name
+				warehouse.WarehouseLocation = location.Name
 				break
 			}
 		}

--
Gitblit v1.8.0