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/yield_register_request.go | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/controllers/request/yield_register_request.go b/controllers/request/yield_register_request.go
index 31dd4f0..5da71e9 100644
--- a/controllers/request/yield_register_request.go
+++ b/controllers/request/yield_register_request.go
@@ -2,6 +2,12 @@
import "github.com/shopspring/decimal"
+type GetYieldRegisterList struct {
+ PageInfo
+ KeyWord string `json:"keyWord"`
+ Number string `json:"number"` //浜ч噺鐧昏琛ㄧ紪鍙�
+}
+
type YieldRegisterInfo struct {
Id uint `json:"id"`
Number string `json:"number"` //缂栧彿
@@ -29,8 +35,8 @@
TwoBack string `json:"twoBack"` //绗簩鍥�
ThreeBack string `json:"threeBack"` //绗笁鍥�
Total decimal.Decimal `json:"total"` //鎬讳骇閲�
- ItemInfo []YieldRegisterItemInfo `json:"itemInfo"`
- CircleInfo []YieldRegisterCircleInfo `json:"circleInfo"`
+ Items []YieldRegisterItemInfo `json:"items"`
+ Circles []YieldRegisterCircleInfo `json:"circles"`
}
type YieldRegisterItemInfo struct {
@@ -46,8 +52,21 @@
YieldRegisterId uint `json:"yieldRegisterId"` //浜ч噺鐧昏琛╥d
CarNumber int `json:"carNumber"` //杞﹀彿
Circle int `json:"circle"` //鍥炴暟
- PieceNumber int `json:"pieceNumber"` //鐗囨暟
AllYield decimal.Decimal `json:"allYield"` //浜ч噺
OneYield decimal.Decimal `json:"oneYield"` //鍙颁骇
Reelingdiscount string `json:"reelingdiscount"` //缂姌
+ PieceNumbers []PieceInfo `json:"pieceNumbers"` //鐗囨暟淇℃伅
+}
+
+type PieceInfo struct {
+ PieceNumber int `json:"pieceNumber"`
+ Value decimal.Decimal `json:"value"`
+}
+
+type ChangeYieldRegister struct {
+ CreateTime string `json:"createTime"` //鍒涘缓鏃堕棿
+ MarketId uint `json:"marketId"` //搴勫彛id
+ WorkshopId uint `json:"workshopId"` //杞﹂棿id
+ GroupNumber int `json:"groupNumber"` //缁勫埆
+ Spec string `json:"spec"` //瑙勬牸
}
--
Gitblit v1.8.0