From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里
---
controllers/product_controller.go | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 565bf9a..606e381 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -16,6 +16,7 @@
"wms/models"
"wms/pkg/logx"
"wms/pkg/mysqlx"
+ "wms/pkg/structx"
"wms/request"
)
@@ -479,6 +480,7 @@
OperationDate: time.Now().Format("2006-01-02 15:04:05"),
Details: []*models.OperationDetails{detail},
BaseOperationType: constvar.BaseOperationTypeDisuse,
+ OperationTypeName: "搴撳瓨鎶ュ簾",
}
if err := models.NewOperationSearch().Create(&operation); err != nil {
logx.Errorf("Operation create err: %v", err)
@@ -508,7 +510,10 @@
db := models.NewOperationSearch().Orm.
Table("wms_operation").
- Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation_details.from_location_id,wms_operation_details.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").
+ Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation_details.from_location_id,"+
+ "wms_operation_details.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,"+
+ "wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,"+
+ "material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").
InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").
InnerJoins("inner join material on material.id=wms_operation_details.product_id").
Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)
@@ -767,7 +772,7 @@
// @Tags 浜у搧
// @Summary 鑾峰彇鍗曚綅淇℃伅
// @Produce application/json
-// @Success 200 {object} util.ResponseList{data=map[string]interface{}} "鎴愬姛"
+// @Success 200 {object} util.ResponseList{data=[]models.UnitDict} "鎴愬姛"
// @Router /api-wms/v1/product/getUnitInfo [get]
func (slf ProductController) GetUnitInfo(c *gin.Context) {
dicts, total, err := models.NewUnitDictSearch().Find()
@@ -777,3 +782,51 @@
}
util.ResponseFormatList(c, code.Success, dicts, int(total))
}
+
+// SaveUnitDict
+//
+// @Tags 鏁版嵁瀛楀吀
+// @Summary 鏇存柊璁￠噺鍗曚綅瀛楀吀
+// @Produce application/json
+// @Param object body request.SaveUnitDict true "鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/product/saveUnitDict [post]
+func (slf ProductController) SaveUnitDict(c *gin.Context) {
+ var reqParams request.SaveUnitDict
+ var params []*models.UnitDict
+ if err := c.BindJSON(&reqParams); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+ if err := structx.AssignTo(reqParams.Data, ¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲閿欒")
+ return
+ }
+
+ for i, v := range params {
+ if len(v.Name) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍚嶇О涓虹┖")
+ return
+ }
+ v.Sort = i + 1
+ }
+
+ err := models.WithTransaction(func(tx *gorm.DB) error {
+ err := models.NewUnitDictSearch().SetOrm(tx).Delete()
+ if err != nil {
+ return err
+ }
+
+ err = models.NewUnitDictSearch().SetOrm(tx).CreateBatch(params)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
--
Gitblit v1.8.0