From 254b140b88bc4bd545292aec4499107db0912be0 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 21 十二月 2023 14:40:55 +0800
Subject: [PATCH] crm出库单添加用户信息

---
 controllers/operation.go |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index b5067b3..3d9a5fa 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -77,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())
@@ -143,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 {
@@ -574,7 +589,7 @@
 				}
 			}
 			if operation.Source != "" {
-				go UpdateOutStatus(operation.Source, operation.Number, 4)
+				go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
 			}
 		}
 
@@ -912,7 +927,7 @@
 	}
 	//鏇存柊aps鐗╂枡鐢宠鐘舵��
 	if operation.Source == "APS_APPLY_MATERIAL" {
-		go UpdateOutStatus(operation.Source, operation.Number, 3)
+		go UpdateOutStatus(operation.Source, operation.SourceNumber, 3)
 	}
 	util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
 }
@@ -1178,7 +1193,7 @@
 		return
 	}
 
-	db := mysqlx.GetDB().Table("wms_operation").Select("wms_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")
+	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+"%")
 	}

--
Gitblit v1.8.0