From 70e86bec4055bdc2fdbff8e1aa8e8bc41c32b2f0 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 21 十月 2023 17:42:42 +0800
Subject: [PATCH] 产品添加限制修改
---
controllers/product_controller.go | 8 --------
controllers/report_forms_controller.go | 6 +++---
docs/docs.go | 2 ++
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index b9c02b5..0d3f3af 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -38,10 +38,6 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧鍚嶇О涓嶈兘涓虹┖")
return
}
- if params.SalePrice.IntPart() <= 0 {
- util.ResponseFormat(c, code.RequestParamError, "浜у搧鍞环涓嶈兘灏忎簬绛変簬闆�")
- return
- }
if params.Model == "" {
util.ResponseFormat(c, code.RequestParamError, "鐗╂枡绫诲瀷涓嶈兘涓虹┖")
return
@@ -137,10 +133,6 @@
}
if params.Name == "" {
util.ResponseFormat(c, code.RequestParamError, "浜у搧鍚嶇О涓嶈兘涓虹┖")
- return
- }
- if params.SalePrice.IntPart() <= 0 {
- util.ResponseFormat(c, code.RequestParamError, "浜у搧鍞环涓嶈兘灏忎簬绛変簬闆�")
return
}
if params.Model == "" {
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index b3a8e53..f5c38c4 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -69,11 +69,11 @@
dbIn := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}).
Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id").
Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeIncoming).
- Where("wms_operation.status in (?)", []int{3, 4})
+ Where("wms_operation.status = ?", constvar.OperationStatus_Finish)
dbOut := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}).
Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id").
- Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeOutgoing).
- Where("wms_operation.status in (?)", []int{3, 4})
+ Where("wms_operation.base_operation_type in (?)", []int{2, 4}).
+ Where("wms_operation.status = ?", constvar.OperationStatus_Finish)
if len(locationIds) > 0 {
dbIn.Where("wms_operation.to_location_id in (?)", locationIds)
dbOut.Where("wms_operation.from_location_id in (?)", locationIds)
diff --git a/docs/docs.go b/docs/docs.go
index 61803f5..5255a2b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3721,6 +3721,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0