From ddd9612ed7cefe12c8ea33ced0711a0b9a3feb99 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期日, 16 二月 2025 18:18:42 +0800
Subject: [PATCH] 修改接口
---
Admin.NET/WCS.Application/PLC/PLCCommon.cs | 147 +++++++++++++++++++++++++-----------------------
1 files changed, 76 insertions(+), 71 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCCommon.cs b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
index e020f08..b1be205 100644
--- a/Admin.NET/WCS.Application/PLC/PLCCommon.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
@@ -1,4 +1,5 @@
锘縰sing Elastic.Clients.Elasticsearch.Tasks;
+using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
using System;
@@ -23,7 +24,7 @@
public static PlcTaskInfo GetCTaskInfo(string endLocat,string taskType,string roadWay,string endRoadWay)
{
// 鍚勫眰杈撻�佺嚎璺烘満鏀捐揣宸ヤ綅闆嗗悎
- var conveyList1 = new List<string>() { "033", "039", "044", "051", "059" };
+ var conveyList1 = new List<string>() { "033", "039", "044", "051", "059","009" };
var conveyList2 = new List<string>() { "205", "234" };
var conveyList3 = new List<string>() { "440", "443" };
@@ -327,10 +328,11 @@
/// <returns></returns>
public static PLCUtil GetPlcIp(string startStation)
{
+ startStation = startStation.PadLeft(3, '0');
string strIp = "";
- var conveyList1 = new List<string>() { "147", "145", "139", "137", "129", "127", "121", "119", "111", "109", "103", "101", "093", "091", "085", "083", "075", "073", "067", "065","033" };
+ var conveyList1 = new List<string>() { "147", "145", "139", "137", "129", "127", "121", "119", "111", "109", "103", "101", "093", "091", "085", "083", "075", "073", "067", "065","033","039","044" ,"051","059","009"};
var conveyList2 = new List<string>() { "205", "234", "252", "254", "260", "262", "270", "272", "278", "280", "288", "290", "294", "301", "307", "309", "315", "317", "325", "327", "331", "337" };
- var conveyList3 = new List<string>() { "401", "402", "405", "406", "409", "410", "413", "414", "417", "418", "421", "422", "425", "426", "429", "430", "433", "434", "437", "438" };
+ var conveyList3 = new List<string>() { "401", "402", "405", "406", "409", "410", "413", "414", "417", "418", "421", "422", "425", "426", "429", "430", "433", "434", "437", "438", "440", "443" };
if (conveyList1.Contains(startStation))
{
strIp = "10.18.51.110";
@@ -354,13 +356,13 @@
}
/// <summary>
- /// 鏍规嵁wms鐩爣鍦板潃杞崲涓篜lc鐩爣鍦板潃
+ /// 鏍规嵁wms鐩爣鍦板潃杞崲涓篜lc鐩爣鍦板潃 03010301
/// </summary>
- /// <param name="road">宸烽亾</param>
- /// <param name="lie">鍒�</param>
- /// <param name="pai">鎺�</param>
+ /// <param name="road">宸烽亾02</param>
+ /// <param name="lie">鍒�01</param>
+ /// <param name="pai">鎺�03</param>
/// <param name="ceng">灞�</param>
- /// <param name="dept">娣卞害</param>
+ /// <param name="dept">娣卞害01</param>
/// <returns></returns>
public static PlcTaskInfo GetEndPai(string road,string lie, string pai,string ceng, string dept)
{
@@ -372,35 +374,35 @@
var paiVal = 0;
// 鍒ゆ柇宸烽亾濂囧伓鏁�
- if (roadNum % 2 == 0)// 鍋舵暟
- {
- // 鍒ゆ柇鎺掑鍋舵暟
- if (paiNum % 2 == 0)
- {
- if (deptNum == 1)
- {
- paiVal = 3;
- }
- else
- {
- paiVal = 4;
- }
- }
- else
- {
- if (deptNum == 1)
- {
- paiVal = 1;
- }
- else
- {
- paiVal = 2;
- }
- }
+ //if (roadNum % 2 == 0)// 鍋舵暟
+ //{
+ // // 鍒ゆ柇鎺掑鍋舵暟
+ // if (paiNum % 2 == 0)
+ // {
+ // if (deptNum == 1)
+ // {
+ // paiVal = 3;
+ // }
+ // else
+ // {
+ // paiVal = 4;
+ // }
+ // }
+ // else
+ // {
+ // if (deptNum == 1)
+ // {
+ // paiVal = 2;
+ // }
+ // else
+ // {
+ // paiVal = 1;
+ // }
+ // }
- }
- else // 濂囨暟
- {
+ //}
+ //else // 濂囨暟
+ //{
// 鍒ゆ柇鎺掑鍋舵暟
if (paiNum % 2 == 0)
{
@@ -426,7 +428,7 @@
}
}
- }
+ //}
PlcTaskInfo taskInfo = new PlcTaskInfo();
taskInfo.EndPai = paiVal.ToString();
@@ -603,6 +605,8 @@
/// <returns>璺烘満鑱旀満</returns>
public static string GetRoadwayByStation(string StationNum)
{
+ StationNum = StationNum.PadLeft(3, '0');
+
string value = "";
var conveyList1 = new List<string>() { "147", "145", "252", "254", "401", "402", };
var conveyList2 = new List<string>() { "139", "137", "260", "262", "405", "406", };
@@ -812,11 +816,11 @@
/// <summary>
- /// 鏍规嵁鍌ㄤ綅鎺掕幏鍙栬泛鏈哄搴旂殑鍦板潃鎺�
+ /// 鏍规嵁鍌ㄤ綅鎺掕幏鍙栬泛鏈哄搴旂殑鍦板潃鎺�03010302
/// </summary>
- /// <param name="road">鎺�</param>
- /// <param name="pai">鎺�</param>
- /// <param name="dept">娣卞害</param>
+ /// <param name="road">鎺�02</param>
+ /// <param name="pai">鎺�03</param>
+ /// <param name="dept">娣卞害02</param>
/// <returns></returns>
public static int GetDjAdress(string road, string pai, string dept)
{
@@ -825,36 +829,36 @@
var deptNum = int.Parse(dept);
var paiVal = 0;
- // 鍒ゆ柇宸烽亾濂囧伓鏁�
- if (roadNum % 2 == 0)// 鍋舵暟
- {
- // 鍒ゆ柇鎺掑鍋舵暟
- if (paiNum % 2 == 0)
- {
- if (deptNum == 1)
- {
- paiVal = 3;
- }
- else
- {
- paiVal = 4;
- }
- }
- else
- {
- if (deptNum == 1)
- {
- paiVal = 1;
- }
- else
- {
- paiVal = 2;
- }
- }
+ //// 鍒ゆ柇宸烽亾濂囧伓鏁�
+ //if (roadNum % 2 == 0)// 鍋舵暟
+ //{
+ // // 鍒ゆ柇鎺掑鍋舵暟
+ // if (paiNum % 2 == 0)
+ // {
+ // if (deptNum == 1)
+ // {
+ // paiVal = 3;
+ // }
+ // else
+ // {
+ // paiVal = 4;
+ // }
+ // }
+ // else
+ // {
+ // if (deptNum == 1)
+ // {
+ // paiVal = 2;
+ // }
+ // else
+ // {
+ // paiVal = 1;
+ // }
+ // }
- }
- else // 濂囨暟
- {
+ //}
+ //else // 濂囨暟
+ //{
// 鍒ゆ柇鎺掑鍋舵暟
if (paiNum % 2 == 0)
{
@@ -880,9 +884,10 @@
}
}
- }
+ //}
if (paiVal == 0)
{
+ Log.Error("鎺掕浆鎹㈠け璐�!");
throw new Exception("鎺掕浆鎹㈠け璐�");
}
return paiVal;
--
Gitblit v1.8.0