From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口

---
 service/progress.go |   71 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/service/progress.go b/service/progress.go
index bb0d859..7d39cfa 100644
--- a/service/progress.go
+++ b/service/progress.go
@@ -13,44 +13,61 @@
 	return &ProgressService{}
 }
 
-func (slf ProgressService) AddProgress(db *gorm.DB, procedure *model.Procedures, order *model.Order) error {
-	progress := &model.ProductionProgress{
-		WorkOrderID:   procedure.WorkOrderID,
-		OrderID:       procedure.OrderID,
-		ProcedureID:   procedure.ProceduresInfo.ProcedureID,
-		DeviceID:      procedure.DeviceID,
-		TotalQuantity: order.Amount.IntPart(),
-	}
-	err := model.NewProductionProgressSearch(db).Create(progress)
-	if err != nil {
-		return err
-	}
-	ProgressCacheSet(progress)
-	return nil
-}
-
-func (slf ProgressService) UpdateProgress(finishedQuantity int64) (err error) {
-	var progressCache *model.ProductionProgress
-	progressCache, ok := ProgressCacheGet()
-	if !ok {
-		progressCache, err = model.NewProductionProgressSearch(nil).SetOrder("id desc").First()
-		if err == gorm.ErrRecordNotFound {
-			return errors.New("progress cache not found")
+func (slf ProgressService) Upsert(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{
+			WorkOrderID:   procedure.WorkOrderID,
+			OrderID:       procedure.OrderID,
+			ProcedureID:   procedure.ProceduresInfo.ProcedureID,
+			DeviceID:      procedure.DeviceID,
+			TotalQuantity: order.Amount.IntPart(),
+			Position:      procedure.Position,
 		}
+		err := model.NewProductionProgressSearch(db).Create(progress)
 		if err != nil {
 			return err
 		}
-		if progressCache.FinishedQuantity < progressCache.TotalQuantity {
-			ProgressCacheSet(progressCache)
-		}
+		ProgressCacheSet(procedure.Position, progress)
+	}
+
+	return nil
+}
+
+func (slf ProgressService) UpdateProgress(position int, finishedQuantity int64) (err error) {
+	progressCache, err := slf.GetCurrentProgress(position)
+	if err != nil {
+		return err
 	}
 	if progressCache == nil {
 		return errors.New("progress cache not found")
 	}
 	if finishedQuantity > progressCache.FinishedQuantity { //褰撴湁鍙樺寲鏃舵墠鏇存柊
 		progressCache.FinishedQuantity = finishedQuantity
-		ProgressCacheSet(progressCache)
+		ProgressCacheSet(position, progressCache)
 		return model.NewProductionProgressSearch(nil).SetId(progressCache.ID).Save(progressCache)
 	}
 	return nil
 }
+
+func (slf ProgressService) GetCurrentProgress(position int) (progressCache *model.ProductionProgress, err error) {
+	var ok bool
+	progressCache, ok = ProgressCacheGet(position)
+	if !ok {
+		progressCache, err = model.NewProductionProgressSearch(nil).SetPosition(position).SetOrder("id desc").First()
+		if err == gorm.ErrRecordNotFound {
+			return nil, errors.New("progress not found")
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		if progressCache.FinishedQuantity >= progressCache.TotalQuantity { //濡傛灉瀹屾垚閲忓ぇ浜庣瓑浜庢�婚噺灏辫鏄庢槸涓婁竴涓凡瀹屾垚鐨勪换鍔★紝涓嶆槸褰撳墠杩涜涓殑浠诲姟銆�
+			progressCache = nil
+		}
+		if progressCache != nil {
+			ProgressCacheSet(position, progressCache)
+		}
+	}
+	return
+}

--
Gitblit v1.8.0