From 8633a0b6e52d9899fda4f3ec2decc1c39b960e5f Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 27 五月 2025 14:42:00 +0800
Subject: [PATCH] 恢复拍照模块，优化任务号生成机制
---
Dispatch/GZRobot.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Dispatch/GZRobot.cs b/Dispatch/GZRobot.cs
index 4479bcf..3542475 100644
--- a/Dispatch/GZRobot.cs
+++ b/Dispatch/GZRobot.cs
@@ -2,25 +2,19 @@
using System.Collections.Generic;
using System.IdentityModel.Protocols.WSTrust;
using System.Threading.Tasks;
-
using HH.WCS.Mobox3.AnGang.config;
-using HH.WCS.Mobox3.AnGang.Helper;
-using HH.WCS.Mobox3.AnGang.Helpers;
-using HH.WCS.Mobox3.AnGang.Models;
-using HH.WCS.Mobox3.AnGang.Services;
-
+using HH.WCS.Mobox3.AnGang.core;
+using HH.WCS.Mobox3.AnGang.models;
using Newtonsoft.Json;
+using static HH.WCS.Mobox3.AnGang.api.ApiModel;
-using static HH.WCS.Mobox3.AnGang.Controllers.ApiModel;
-using static HH.WCS.Mobox3.AnGang.Dtos.Request.AgvRequest;
-
-namespace HH.WCS.Mobox3.AnGang.Dispatch {
+namespace HH.WCS.Mobox3.AnGang.dispatch {
/// <summary>
/// 鍥借嚜璋冨害杈呭姪绫� /// </summary>
public class GZRobot {
private static readonly HttpHelper apiHelper = new HttpHelper();
- private static readonly string baseUrl = AppStart.Settings.Config.RCSApiUrl;//閰嶇疆鏂囦欢鑾峰彇鍥借嚜璋冨害鍦板潃
+ private static readonly string baseUrl = Settings.RCSApiUrl;//閰嶇疆鏂囦欢鑾峰彇鍥借嚜璋冨害鍦板潃
//private static readonly string logName = "guozi";
public static List<IOState> GetIO() {
var result = apiHelper.Get(baseUrl + "api/engine/view/iostates/");
@@ -32,7 +26,6 @@
var result = apiHelper.Post(baseUrl + "api/engine/tasks/iostates/", JsonConvert.SerializeObject(data));
var dataResult = JsonConvert.DeserializeObject<gzResult<IOStatesInfoResult>>(result);
}
-
public static int CreateOrder(string taskNo, int priority, string param, string ts = "churuku", string created_user = "hanhe") {
LogHelper.Info($"CreateOrder鍙傛暟淇℃伅:taskNo:{taskNo},priority:{priority},param:{param},ts:{ts}锛宑reated_user锛歿created_user}", "API");
@@ -113,6 +106,7 @@
/// </summary>
/// <returns></returns>
public static GzResult orderStatusReport(orderStatusReportParme model) {
+ LogHelper.Info("RCS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
GzResult result = new GzResult();
AgvTaskState agv = new AgvTaskState();
@@ -156,7 +150,14 @@
if (agv.state != 0) {
agv.task_no = model.orderName;
agv.forklift_no = model.agvIDList;
- AgvService.OperateAgvTaskStatus(agv);
+ WCSCore.OperateAgvTaskStatus(agv);
+ }
+ else {
+ result.resultCode = 2;
+ result.orderID = model.orderID;
+ result.msg = "鍙嶉璁㈠崟鐘舵�澶辫触锛宱rderStatus鍙傛暟涓嶆纭�;
+ LogHelper.Info(result.msg, "API");
+ return result;
}
result.resultCode = 0;
@@ -256,7 +257,6 @@
if (data.data != null) {
res = data.data;
}
-
}
catch (Exception ex) {
Console.WriteLine(ex.Message);
--
Gitblit v1.9.1