From 230ce554d9a42e5c1e322bf13d186f87651edd96 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 一月 2024 10:49:03 +0800
Subject: [PATCH] 物料只查有库存的

---
 controllers/operation.go |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 2a0b25e..1dda2db 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -6,6 +6,7 @@
 	"errors"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	uuid "github.com/satori/go.uuid"
 	"github.com/shopspring/decimal"
 	"github.com/xuri/excelize/v2"
 	"gorm.io/gorm"
@@ -77,8 +78,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 +155,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 +590,7 @@
 				}
 			}
 			if operation.Source != "" {
-				go UpdateOutStatus(operation.Source, operation.Number, 4)
+				go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
 			}
 		}
 
@@ -912,7 +928,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, "鎿嶄綔鎴愬姛")
 }
@@ -1037,7 +1053,7 @@
 		return "", err
 	}
 
-	fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+	fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
 	if err != nil {
 		logx.Errorf("file upload err: %v", err)
 		return "", err
@@ -1114,7 +1130,7 @@
 		return "", err
 	}
 
-	fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+	fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
 	if err != nil {
 		logx.Errorf("file upload err: %v", err)
 		return "", err

--
Gitblit v1.8.0