From 000d7434525d4b7743e4b8e1f6b2a6aa5357bf12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 四月 2024 15:11:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer
---
controllers/request/system_set.go | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/controllers/request/system_set.go b/controllers/request/system_set.go
index c87cd33..533098b 100644
--- a/controllers/request/system_set.go
+++ b/controllers/request/system_set.go
@@ -1,10 +1,14 @@
package request
-import "silkserver/constvar"
+import (
+ "github.com/shopspring/decimal"
+ "silkserver/constvar"
+)
type GetDictList struct {
PageInfo
- DictType constvar.DictType `json:"dictType"` //瀛楀吀绫诲瀷
+ DictType *constvar.DictType `json:"dictType" form:"dictType"` //瀛楀吀绫诲瀷
+ Keyword string `json:"keyword" form:"keyword"` //鎼滅储鍏抽敭瀛�
}
type AddDict struct {
@@ -25,8 +29,35 @@
KeyWord string `json:"keyWord"`
}
+type SaveRankStandard struct {
+ RankStandard []RankStandard `json:"rankStandard"`
+}
+
+type RankStandard struct {
+ LineId string `json:"lineId"` //琛宨d
+ CheckItem constvar.CheckItem `json:"checkItem"` //妫�鏌ラ」鐩悕绉�
+ StartFineness decimal.Decimal `json:"startFineness"` //寮�濮嬬氦搴�
+ EndFineness decimal.Decimal `json:"endFineness"` //缁撴潫绾ゅ害
+ RankA decimal.Decimal `json:"rankA"` //閲庣氦
+ RankB decimal.Decimal `json:"rankB"` //澶ч噹
+ RankC decimal.Decimal `json:"rankC"` //鐗归噹
+ DynamicsRanks []DynamicsRank `json:"dynamicsRanks"`
+}
+
+type DynamicsRank struct {
+ RankProp string `json:"rankProp"` //鍓嶇紑key
+ RankName string `json:"rankName"` //绛夌骇鍚嶇О
+ RankValue decimal.Decimal `json:"rankValue"` //绛夌骇鍊�
+}
+
// ---------------------------------------杞﹂棿---------------------------------
type GetWorkshopManage struct {
PageInfo
KeyWord string `json:"keyWord"`
}
+
+type GetWorkshopManageCar struct {
+ WorkshopName string `json:"workshopName"` //杞﹂棿鍚嶇О
+ GroupNumber int `json:"groupNumber"` //缁勫埆
+ MarketName string `json:"marketName"` ///搴勫彛鍚�
+}
--
Gitblit v1.8.0