From cdbda5e3895814b688bcc0e6b34b6067b0b9b773 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 九月 2023 20:17:08 +0800
Subject: [PATCH] fix
---
service/progress.go | 2 +-
model/production_progress.go | 2 +-
api/v1/task.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 1e961b8..11a1332 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -227,7 +227,7 @@
if err != nil {
return err
}
- return service.NewProgressService().Upsert(db, procedure, order)
+ return service.NewProgressService().Add(db, procedure, order)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
diff --git a/model/production_progress.go b/model/production_progress.go
index 166769e..898b186 100644
--- a/model/production_progress.go
+++ b/model/production_progress.go
@@ -12,7 +12,7 @@
ID int `gorm:"primarykey"`
WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"workOrderID"`
OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"orderID"`
- ProcedureID string `gorm:"uniqueIndex:idx_product_procedure;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
+ ProcedureID string `gorm:"type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
DeviceID string `gorm:"type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
FinishedQuantity int64 `gorm:"type:int;not null;comment:瀹屾垚鏁伴噺" json:"finishedQuantity"`
Position int `gorm:"type:int;comment:宸ヤ綔浣嶇疆" json:"position"` //姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
diff --git a/service/progress.go b/service/progress.go
index 7d39cfa..9f19ae6 100644
--- a/service/progress.go
+++ b/service/progress.go
@@ -13,7 +13,7 @@
return &ProgressService{}
}
-func (slf ProgressService) Upsert(db *gorm.DB, procedure *model.Procedures, order *model.Order) error {
+func (slf ProgressService) Add(db *gorm.DB, procedure *model.Procedures, order *model.Order) error {
_, err := model.NewProductionProgressSearch(db).SetProcedureId(procedure.ProcedureID).SetWorkOrderId(procedure.WorkOrderID).First()
if err == gorm.ErrRecordNotFound {
progress := &model.ProductionProgress{
--
Gitblit v1.8.0