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 | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 8476541..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"
@@ -29,6 +30,7 @@
"wms/proto/purchase_wms"
"wms/proto/supplier"
"wms/request"
+ "wms/response"
"wms/service"
"wms/utils/http"
"wms/utils/upload"
@@ -76,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(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -142,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 {
@@ -573,7 +590,7 @@
}
}
if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.Number, 4)
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
}
}
@@ -911,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, "鎿嶄綔鎴愬姛")
}
@@ -1036,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
@@ -1113,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
@@ -1163,7 +1180,7 @@
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鍑哄叆搴撴槑缁�
// @Produce application/json
-// @Param object body request.OperationAllList true "鍙傛暟"
+// @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) {
@@ -1177,12 +1194,12 @@
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").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+"%")
}
var (
- records = make([]*models.MoveHistory, 0)
+ records = make([]*response.InventoryHistory, 0)
total int64
)
--
Gitblit v1.8.0