From 8ea7380ee486d842bdd96824ac490ba53b454b58 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 30 十月 2024 08:22:59 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCCommon.cs | 128 +++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCCommon.cs b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
index 1fe2a42..2cc7b0b 100644
--- a/Admin.NET/WCS.Application/PLC/PLCCommon.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
@@ -355,13 +355,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)
{
@@ -373,35 +373,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)
{
@@ -427,7 +427,7 @@
}
}
- }
+ //}
PlcTaskInfo taskInfo = new PlcTaskInfo();
taskInfo.EndPai = paiVal.ToString();
@@ -826,36 +826,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 = 2;
- }
- else
- {
- paiVal = 1;
- }
- }
+ //// 鍒ゆ柇宸烽亾濂囧伓鏁�
+ //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)
{
@@ -881,7 +881,7 @@
}
}
- }
+ //}
if (paiVal == 0)
{
Log.Error("鎺掕浆鎹㈠け璐�!");
--
Gitblit v1.8.0