From 610ae3fb0df083e4b2649dcb7956e50b7159836a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 11 四月 2024 17:00:12 +0800
Subject: [PATCH] 产量登记表格式修改
---
controllers/request/yield_register_request.go | 8 ++++++--
controllers/yield_register_controller.go | 14 ++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/controllers/request/yield_register_request.go b/controllers/request/yield_register_request.go
index 1fd45b0..5da71e9 100644
--- a/controllers/request/yield_register_request.go
+++ b/controllers/request/yield_register_request.go
@@ -52,11 +52,15 @@
YieldRegisterId uint `json:"yieldRegisterId"` //浜ч噺鐧昏琛╥d
CarNumber int `json:"carNumber"` //杞﹀彿
Circle int `json:"circle"` //鍥炴暟
- PieceNumber int `json:"pieceNumber"` //鐗囨暟
- Value decimal.Decimal `json:"value"` //鍊�
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 {
diff --git a/controllers/yield_register_controller.go b/controllers/yield_register_controller.go
index 6a5c9db..a5412f6 100644
--- a/controllers/yield_register_controller.go
+++ b/controllers/yield_register_controller.go
@@ -35,6 +35,20 @@
util.ResponseFormat(c, code.RequestParamError, "鏁版嵁杞崲澶辫触")
return
}
+ circles := make([]*models.YieldRegisterCircle, 0)
+ for _, circle := range yield.Circles {
+ for _, circleInfo := range params.Circles {
+ if circle.CarNumber == circleInfo.CarNumber {
+ for _, number := range circleInfo.PieceNumbers {
+ data := *circle
+ data.PieceNumber = number.PieceNumber
+ data.Value = number.Value
+ circles = append(circles, &data)
+ }
+ }
+ }
+ }
+ yield.Circles = circles
if yield.ID > 0 {
//鏇存柊
err = models.WithTransaction(func(db *gorm.DB) error {
--
Gitblit v1.8.0