From 26a2ae9619dfff4c43487ca39307c06be635c23f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 21 十月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 controllers/product_controller.go |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 0d3f3af..54ac018 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -535,6 +535,10 @@
 		util.ResponseFormat(c, code.RequestParamError, "璇ヤ俊鎭棤娉曚慨鏀�")
 		return
 	}
+	if params.ProductId == "" {
+		util.ResponseFormat(c, code.RequestParamError, "璇烽�夋嫨鎶ュ簾浜у搧")
+		return
+	}
 	detail := &models.OperationDetails{
 		ProductId: params.ProductId,
 		//ProductName: params.ProductName,
@@ -542,15 +546,16 @@
 		//Unit:        params.Unit,
 	}
 	operation := models.Operation{
-		Id:              params.Id,
-		Number:          params.Number,
-		SourceNumber:    params.SourceNumber,
-		OperationTypeId: 0,
-		Status:          params.Status,
-		FromLocationID:  params.FromLocationId,
-		ToLocationID:    params.ToLocationId,
-		OperationDate:   params.OperationDate,
-		Details:         []*models.OperationDetails{detail},
+		Id:                params.Id,
+		Number:            params.Number,
+		SourceNumber:      params.SourceNumber,
+		OperationTypeId:   0,
+		Status:            params.Status,
+		FromLocationID:    params.FromLocationId,
+		ToLocationID:      params.ToLocationId,
+		OperationDate:     params.OperationDate,
+		Details:           []*models.OperationDetails{detail},
+		BaseOperationType: params.BaseOperationType,
 	}
 	if err := models.WithTransaction(func(tx *gorm.DB) error {
 		if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {

--
Gitblit v1.8.0