From 02a2176f7c5733a4e4c4429c2028bbb86a967ce7 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 06 二月 2024 10:13:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
model/test/material.go | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/model/test/material.go b/model/test/material.go
index 25053cb..257a277 100644
--- a/model/test/material.go
+++ b/model/test/material.go
@@ -26,7 +26,9 @@
MinPurchaseAmount decimal.Decimal `gorm:"type:decimal(35,18);comment:鏈�灏忛噰璐噺" json:"minPurchaseAmount"`
PurchaseType PurchaseType `gorm:"type:int(11);comment:閲囪喘绫诲瀷" json:"purchaseType"`
SalePrice decimal.Decimal `gorm:"type:decimal(35,18);comment:閿�鍞崟浠�" json:"salePrice"`
- CategoryName string `gorm:"type:varchar(255);comment:浜у搧绫诲埆鍚嶇О" json:"categoryName"` //浜у搧绫诲埆鍚嶇О
+ CategoryName string `gorm:"type:varchar(255);comment:浜у搧绫诲埆鍚嶇О" json:"categoryName"` //浜у搧绫诲埆鍚嶇О
+ IsStorage int `gorm:"type:tinyint(1);default:1;comment:鏄惁瀛樺簱(1鏄�2鍚�)" json:"isStorage"` //鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀
+ IsVirtual int `json:"isVirtual" gorm:"type:tinyint(1);default:2;comment:鏄惁铏氭嫙鐗╂枡(1鏄�2鍚�)"` //铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟
}
// PurchaseType 閲囪喘绫诲瀷
@@ -53,9 +55,10 @@
MaterialModeRaw MaterialMode = "鍘熸潗鏂�"
MaterialModeSemi MaterialMode = "鍗婃垚鍝�"
MaterialModeFinished MaterialMode = "鎴愬搧"
- MaterialModeAuxiliary MaterialMode = "杈呮枡" //杈呮枡
- MaterialModeConsumables MaterialMode = "鑰楁潗" //鑰楁潗
- MaterialModeOther MaterialMode = "鍏朵粬" //鍏朵粬
+ MaterialModeAuxiliary MaterialMode = "杈呮枡" //杈呮枡
+ MaterialModeConsumables MaterialMode = "鑰楁潗" //鑰楁潗
+ MaterialModeOther MaterialMode = "鍏朵粬" //鍏朵粬
+ MaterialModeVirtual MaterialMode = "铏氭嫙浠�" //铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘
)
func (t MaterialMode) Valid() bool {
@@ -64,7 +67,8 @@
t != MaterialModeAuxiliary &&
t != MaterialModeConsumables &&
t != MaterialModeOther &&
- t != MaterialModeFinished {
+ t != MaterialModeFinished &&
+ t != MaterialModeVirtual {
return false
}
return true
@@ -78,6 +82,14 @@
return MaterialTypeSemi
case MaterialModeFinished:
return MaterialTypeFinished
+ case MaterialModeAuxiliary:
+ return MaterialTypeAuxiliary
+ case MaterialModeConsumables:
+ return MaterialTypeConsumables
+ case MaterialModeOther:
+ return MaterialTypeOther
+ case MaterialModeVirtual:
+ return MaterialTypeVirtual
}
return MaterialType(0)
}
@@ -92,11 +104,12 @@
MaterialTypeAuxiliary //杈呮枡
MaterialTypeConsumables //鑰楁潗
MaterialTypeOther //鍏朵粬
+ MaterialTypeVirtual //铏氭嫙浠�
)
func (t MaterialType) Valid() bool {
if t < MaterialTypeRaw ||
- t > MaterialTypeFinished {
+ t > MaterialTypeVirtual {
return false
}
return true
--
Gitblit v1.8.0