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 | 107 +++++++----------------------------------------------
1 files changed, 14 insertions(+), 93 deletions(-)
diff --git a/Dispatch/GZRobot.cs b/Dispatch/GZRobot.cs
index f3a5d30..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();
@@ -132,11 +126,6 @@
case "source_finish":
//鍙栬揣瀹屾垚
agv.state = 4;
-
- //var checkWeightTask = Task.Run(() => {
- // ChooseFinalEndLoc(model);
- //});
-
break;
case "dest_finish":
//鍗歌揣瀹屾垚
@@ -161,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;
@@ -171,75 +167,9 @@
return result;
}
- //public static void ChooseFinalEndLoc(orderStatusReportParme model) {
-
- // var db = DbHelper.GetDbClient();
-
- // var tn_task = db.Queryable<TN_Task>().First(a => a.S_EQ_NO == model.agvIDList && a.S_END_AREA == "" && a.S_END_LOC == "" && a.S_TYPE == "浜у搧鍏ュ簱(PDA)");
-
- // // 鍙浠诲姟涓轰骇鍝佸叆搴�PDA)锛屽氨闇�閲嶆柊鎸囧畾缁堢偣锛堥粯璁ndLoc涓�"锛�- // if (tn_task.S_TYPE == "浜у搧鍏ュ簱(PDA)") {
-
- // var endLoc = new TN_Location();
-
- // // 鍙綋涔嬪墠鎸囧畾缁堢偣璐ф灦鍚庯紝鎵嶅皾璇曡绠楃粓鐐硅揣浣嶏紝鍚﹀垯浜ょ粰浜哄伐鍐冲畾
- // if (tn_task.S_END_AREA != "") {
- // if (tn_task.F_WEIGHT > 1500) {
- // // 閲嶉噺瓒呰繃1.5t锛岄渶瑕侀�鎷�-3灞傝揣鏋�- // endLoc = db.Queryable<TN_Location>().First(a => a.S_SHELF_CODE == tn_task.S_END_AREA && LocationHelper.IsFree(a) && a.N_CURRENT_NUM == 0 && a.N_HEIGHT <= 3);
- // }
- // else if (tn_task.F_WEIGHT > 0) {
- // // 閲嶉噺鏈秴杩�.5t锛屽湪鎸囧畾璐ф灦闅忎究閫夋嫨1涓�- // endLoc = db.Queryable<TN_Location>().First(a => a.S_SHELF_CODE == tn_task.S_END_AREA && LocationHelper.IsFree(a) && a.N_CURRENT_NUM == 0);
- // }
- // else {
- // // 娌℃湁鎺ユ敹鍒伴噸閲忥紝鎴栭噸閲忓嚭閿�- // endLoc = null;
- // LogHelper.Info($"閿欒鐨勯噸閲忎俊鎭細{tn_task.F_WEIGHT}");
- // }
-
- // // 濡傛灉娌℃湁绗﹀悎鏉′欢鐨勮揣浣嶏紝缃┖锛岀瓑寰匬DA閲嶆柊纭畾
- // if (endLoc == null) {
- // tn_task.S_END_AREA = "";
- // tn_task.S_END_LOC = "";
-
- // if (db.Updateable<TN_Task>(tn_task).ExecuteCommand() > 0) {
- // //LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�-
- // LogHelper.Info($"閲嶆柊璁＄畻鍚庢病鏈夊悎閫傝揣浣嶏紝浠诲姟 {tn_task.S_CODE} 淇敼鎴愬姛锛屼慨鏀圭粓鐐硅揣鏋跺拰璐т綅涓虹┖");
- // }
- // else {
- // LogHelper.Info($"閲嶆柊璁＄畻鍚庢病鏈夊悎閫傝揣浣嶏紝浠诲姟 {tn_task.S_CODE} 淇敼澶辫触锛屼慨鏀圭粓鐐硅揣鏋跺拰璐т綅涓虹┖");
- // }
- // }
- // else {
- // // 鎵惧埌鍚堥�鐨勮揣浣嶏紝鎺ㄩ�
- // tn_task.S_END_LOC = endLoc.S_CODE;
-
- // using (var trans = db.Ado.UseTran()) {
- // if (db.Updateable<TN_Task>(tn_task).ExecuteCommand() > 0) {
- // LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�-
- // trans.CommitTran();
- // LogHelper.Info($"璁＄畻璐т綅鎴愬姛锛屼换鍔�{tn_task.S_CODE} 淇敼鎴愬姛锛岀粓鐐硅揣鏋朵负 {endLoc.S_SHELF_CODE}锛屼慨鏀圭粓鐐逛綅缃负 {endLoc.S_CODE}");
- // }
- // else {
- // trans.RollbackTran();
-
- // LogHelper.Info($"璁＄畻璐т綅鎴愬姛锛屼换鍔�{tn_task.S_CODE} 淇敼澶辫触锛岀粓鐐硅揣鏋朵负 {endLoc.S_SHELF_CODE}锛屼慨鏀圭粓鐐逛綅缃负 {endLoc.S_CODE}");
- // }
- // }
-
-
- // }
- // }
- // }
- //}
-
public class CancelGZOrderInfo
{
public int order_id { get; set; }
-
public int order_command_type_id { get; set; }
}
@@ -327,7 +257,6 @@
if (data.data != null) {
res = data.data;
}
-
}
catch (Exception ex) {
Console.WriteLine(ex.Message);
@@ -343,14 +272,6 @@
}
}
-
- //public class CustomBufInfo {
- // public string app_name { get; set; }
- // public string version { get; set; }
- // public int code { get; set; }
- // public string msg { get; set; }
- // public List<CustomData> data { get; set; }
- //}
public class CustomData {
public string agv_id { get; set; }
--
Gitblit v1.9.1