From 19e95f4acc328bbf62a0427fe658d00268019e66 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 10:14:34 +0800
Subject: [PATCH] 修改IIS配置
---
Wms/WMS.BLL/LogServer/TaskServer.cs | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/LogServer/TaskServer.cs b/Wms/WMS.BLL/LogServer/TaskServer.cs
index 7f5958b..3177aa7 100644
--- a/Wms/WMS.BLL/LogServer/TaskServer.cs
+++ b/Wms/WMS.BLL/LogServer/TaskServer.cs
@@ -3,9 +3,12 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using Model.InterFaceModel;
using Model.ModelDto.BllSoDto;
using Model.ModelDto.LogDto;
+using Newtonsoft.Json;
using SqlSugar;
+using Utility.Tools;
using WMS.DAL;
using WMS.Entity.Context;
using WMS.Entity.LogEntity;
@@ -119,11 +122,15 @@
}
}
- public string GetTaskOrderType(string taskNo)
+ public string GetTaskOrderType(string taskNo,string tasktype)
{
try
{
- var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo);
+ if (tasktype == "1")
+ {
+ taskNo = taskNo.Substring(0, taskNo.Length - 3);
+ }
+ var task = Db.Queryable<LogTask>().OrderByDescending(m=>m.Id).First(m => m.TaskNo == taskNo);
if (task == null)
{
throw new Exception($"鏈煡璇㈠埌{taskNo}浠诲姟鍙风殑浠诲姟淇℃伅");
@@ -154,5 +161,35 @@
throw new Exception(e.Message);
}
}
+
+ /// <summary>
+ /// AGV鍏ュ簱鏀捐揣璇锋眰涓嬪彂鑷砏CS
+ /// </summary>
+ /// <param name="port"></param> 鍏ュ簱鍙�
+ /// <param name="url"></param> 璇锋眰鍦板潃
+ /// <returns></returns>
+ public string GetWcsPuttype(string taskno,string url)
+ {
+ try
+ {
+ var port = Db.Queryable<LogTask>().First(m => m.TaskNo == taskno).EndLocat;
+ var data = new
+ {
+ Port = port,
+ TaskNo = taskno
+ };
+ var jsonData = JsonConvert.SerializeObject(data);
+ var res = HttpHelper.DoPost(url, jsonData, "璇锋眰WCS"+ port+"鍏ュ簱鍙ｆ斁璐�", "WCS");
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var ret = JsonConvert.DeserializeObject<WcsModel>(res);
+ return ret.StatusCode.ToString();
+ }
+ catch (Exception ex)
+ {
+
+ throw ex;
+ }
+ }
}
}
--
Gitblit v1.8.0