From b94bef381946e22fd1038f24e6d9de911d194640 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期三, 31 七月 2024 23:33:48 +0800
Subject: [PATCH] 功能修改,工资计算调整,通过前端配置公式进行计算

---
 models/payroll_production_car.go |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/models/payroll_production_car.go b/models/payroll_production_car.go
index 51f6e17..36e3b47 100644
--- a/models/payroll_production_car.go
+++ b/models/payroll_production_car.go
@@ -19,9 +19,10 @@
 	PayrollProductionCar struct {
 		BaseModelInt
 		Cycle          string `json:"cycle" gorm:"index;size:20;not null;comment:缁熻鍛ㄦ湡锛堝勾鏈堟棩锛�"` //缁熻鍛ㄦ湡锛堝勾鏈堟棩锛�
-		WorkshopNumber string `json:"workshopNumber" gorm:"size:255;not null;comment:杞﹂棿缂栧彿"`  // 杞﹂棿缂栧彿
-		GroupNumber    int    `json:"groupNumber" gorm:"size:11;not null;comment:缁勫埆"`        // 缁勫埆
-		CarNumber      int    `json:"carNumber"  gorm:"size:11;not null;comment:杞﹀彴鍙�"`        // 杞﹀彴鍙�
+		WorkshopId     uint   `json:"workshopId" gorm:"type:int(11);comment:杞﹂棿Id"`
+		WorkshopNumber string `json:"workshopNumber" gorm:"size:255;not null;comment:杞﹂棿缂栧彿"` // 杞﹂棿缂栧彿
+		GroupNumber    int    `json:"groupNumber" gorm:"size:11;not null;comment:缁勫埆"`       // 缁勫埆
+		CarNumber      int    `json:"carNumber"  gorm:"size:11;not null;comment:杞﹀彴鍙�"`       // 杞﹀彴鍙�
 
 		CarWorkQuantity int    `json:"carWorkQuantity"  gorm:"size:11;default:1;comment:杞﹀彴鍏宠仈浜哄憳鏁伴噺"` // 杞﹀彴鍏宠仈浜哄憳鏁伴噺
 		CarWorkIds      string `json:"carWorkIds"  gorm:"size:255;comment:杞﹀彴鍏宠仈鎸¤溅宸D"`              // 杞﹀彴鍏宠仈鎸¤溅宸D

--
Gitblit v1.8.0