From 5956ba57437a85d99afd609cfdb5210f809009f8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 08 十月 2023 15:52:55 +0800
Subject: [PATCH] 增加工艺列表增加旧工艺返回

---
 api/v1/task.go |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index ef93b90..ac472cb 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -112,9 +112,11 @@
 	})
 
 	nowTs := time.Now().Unix()
+	flagMap := make(map[int32]struct{}, 0)
 	for _, task := range taskResponse.Tasks {
-		if !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
+		if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
 			task.CanStarted = true
+			flagMap[task.Channel] = struct{}{}
 		}
 	}
 
@@ -277,16 +279,15 @@
 	}
 	processModel, err := taskService.GetProcessParams(procedure, order)
 	if err != nil || processModel == nil || processModel.ParamsMap == nil {
-		ctx.Fail(ecode.UnknownErr)
+		ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
 		return
 	}
 
 	err = model.WithTransaction(func(db *gorm.DB) error {
-		err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
+		err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel)
 		if err != nil {
 			return err
 		}
-		procedure.Channel = params.Channel
 		err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
 		if err != nil {
 			return err
@@ -308,11 +309,10 @@
 	if err != nil {
 		logx.Errorf("SendProcessParams: %v", err.Error())
 		err = model.WithTransaction(func(db *gorm.DB) error {
-			err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Channel)
+			err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, procedure.Channel)
 			if err != nil {
 				return err
 			}
-			procedure.Channel = params.Channel
 			err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
 			if err != nil {
 				return err
@@ -322,12 +322,8 @@
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
 		return
 	}
-	if code != ecode.OK {
-		logx.Errorf("get plcConfig err: %v", err.Error())
-		return
-	}
 	plcConfig.CurrentTryTimes = 0
-	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
+	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
 	if err != nil {
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆")
 		return
@@ -350,6 +346,58 @@
 	ctx.Ok()
 }
 
+// UpdateProcessParams
+// @Tags      Task
+// @Summary   鏇存柊宸ヨ壓鍙傛暟锛堣繘琛屼腑鐨勪换鍔★級
+// @Produce   application/json
+// @Param     object  body    request.SendProcessParams true  "鏌ヨ鍙傛暟"
+// @Success   200   {object}  contextx.Response{}  "鎴愬姛"
+// @Router    /v1/task/updateProcessParams [post]
+func (slf *TaskApi) UpdateProcessParams(c *gin.Context) {
+	mutex.Lock()
+	defer mutex.Unlock()
+	var params request.SendProcessParams
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+	taskService := service.NewTaskService()
+	procedure, code := taskService.GetProcedureById(params.ProcedureId)
+	if code != ecode.OK {
+		ctx.Fail(code)
+		return
+	}
+	order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
+	if err != nil {
+		ctx.Fail(ecode.UnknownErr)
+		return
+	}
+
+	if procedure.Status != model.ProcedureStatusProcessing { //鍙兘杩涜涓殑鍙互鏇存柊
+		ctx.FailWithMsg(ecode.ParamsErr, "鍙兘杩涜涓殑宸ュ簭鍙互鏇存柊宸ヨ壓鍙傛暟")
+		return
+	}
+	processModel, err := taskService.GetProcessParams(procedure, order)
+	if err != nil || processModel == nil || processModel.ParamsMap == nil {
+		ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+		return
+	}
+
+	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+	if code != ecode.OK || plcConfig.Id == 0 {
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
+		return
+	}
+	plcConfig.MaxTryTimes = 2
+	err = SendParams(processModel.ParamsMap, plcConfig)
+	if err != nil {
+		logx.Errorf("update process params err: %v", err.Error())
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
+		return
+	}
+	ctx.Ok()
+}
+
 func SendParams(paramsMap map[string]interface{}, plcConfig *model.DevicePlc) error {
 	if len(paramsMap) == 0 {
 		return errors.New("empty params")

--
Gitblit v1.8.0