From ed3d45b189f102249eabd0cb5a0299bc66b0dea6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 controllers/operation.go |   63 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 1 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 60384dd..e467303 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -20,6 +20,7 @@
 	"wms/models"
 	"wms/opa"
 	"wms/pkg/logx"
+	"wms/pkg/mysqlx"
 	"wms/pkg/structx"
 	"wms/proto/client"
 	"wms/proto/init_client"
@@ -28,6 +29,7 @@
 	"wms/proto/purchase_wms"
 	"wms/proto/supplier"
 	"wms/request"
+	"wms/response"
 	"wms/service"
 	"wms/utils/http"
 	"wms/utils/upload"
@@ -75,8 +77,19 @@
 	}
 
 	params.Status = constvar.OperationStatus_Ready
-	params.Number = strconv.FormatInt(time.Now().Unix(), 10)
+	//params.Number = strconv.FormatInt(time.Now().Unix(), 10)
 	params.BaseOperationType = operationType.BaseOperationType
+
+	var numberNum int64
+	if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
+		util.ResponseFormat(c, code.RequestParamError, err.Error())
+		return
+	}
+	if numberNum > 0 {
+		util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
+		return
+	}
+
 	if err := models.NewOperationSearch().Create(&params); err != nil {
 		logx.Errorf("Operation create err: %v", err)
 		util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -141,6 +154,10 @@
 func (slf OperationController) CheckParams(params models.Operation) error {
 	if params.SourceNumber == "" {
 		return errors.New("璇峰～鍏ユ簮鍗曞彿")
+	}
+
+	if params.Number == "" {
+		return errors.New("璇峰～鍏ュ崟鍙�")
 	}
 
 	if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
@@ -558,6 +575,9 @@
 					SetLocationId(operation.FromLocationID).
 					FirstRes()
 				if res.Error != nil {
+					if res.Error == gorm.ErrRecordNotFound {
+						return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
+					}
 					return res.Error
 				}
 				if locAmount.Amount.LessThan(value) {
@@ -976,6 +996,7 @@
 		return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
 	}
 	readerCloser.Close()
+	defer f.Close()
 
 	style, _ := f.NewStyle(&excelize.Style{
 		Border: []excelize.Border{
@@ -1056,6 +1077,7 @@
 		return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
 	}
 	readerCloser.Close()
+	defer f.Close()
 
 	style, _ := f.NewStyle(&excelize.Style{
 		Border: []excelize.Border{
@@ -1152,3 +1174,42 @@
 	}
 	util.ResponseFormat(c, code.Success, resp.List)
 }
+
+// ListByCondition
+// @Tags      鍏ュ簱/鍑哄簱
+// @Summary   鍑哄叆搴撴槑缁�
+// @Produce   application/json
+// @Param     object  body  request.OperationCondition true  "鍙傛暟"
+// @Success   200 {object} util.Response "鎴愬姛"
+// @Router    /api-wms/v1/operation/listByCondition [post]
+func (slf OperationController) ListByCondition(c *gin.Context) {
+	var params request.OperationCondition
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+		return
+	}
+	if !params.PageInfo.Check() {
+		util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒")
+		return
+	}
+
+	db := mysqlx.GetDB().Table("wms_operation").Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation.from_location_id,from_location.`name` AS from_location,wms_operation.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").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").InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation.from_location_id").InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation.to_location_id")
+	if params.Condition != "" {
+		db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or from_location.`name` like ? or to_location.`name` like ?", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%")
+	}
+	var (
+		records = make([]*response.InventoryHistory, 0)
+		total   int64
+	)
+
+	if err := db.Count(&total).Error; err != nil {
+		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+		return
+	}
+
+	if err := db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize).Find(&records).Error; err != nil {
+		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+		return
+	}
+	util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
+}

--
Gitblit v1.8.0