From 7fb9d8f51979ae9df697a434e1a8c80533695904 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期三, 12 三月 2025 16:54:47 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 2 +-
Admin.NET/WCS.Application/PLC/PLCCommon.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCCommon.cs b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
index b6f1a9a..30162ee 100644
--- a/Admin.NET/WCS.Application/PLC/PLCCommon.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
@@ -29,7 +29,7 @@
}
// 鍚勫眰杈撻�佺嚎璺烘満鏀捐揣宸ヤ綅闆嗗悎
- var conveyList1 = new List<string>() { "152", "153", "160", "094","019","037","054" };
+ var conveyList1 = new List<string>() { "152", "153", "160", "094","019","037","054","078" };
var conveyList4 = new List<string>() { "266", "265"};
PlcTaskInfo taskInfo = new PlcTaskInfo();
@@ -242,7 +242,7 @@
{
string strIp = "";
startStation = startStation.PadLeft(3, '0');
- var conveyList1 = new List<string>() { "093", "094", "155", "160", "063", "072", "050", "045", "048", "052", "056", "055", "032", "027", "030", "034", "039", "038", "015", "010", "017", "021", "020", "003", "004", "097", "099", "105", "107", "113", "115", "123", "125", "131", "133", "139", "141", "152", "153", "019", "037", "054" };
+ var conveyList1 = new List<string>() { "078","093", "094", "155", "160", "063", "072", "050", "045", "048", "052", "056", "055", "032", "027", "030", "034", "039", "038", "015", "010", "017", "021", "020", "003", "004", "097", "099", "105", "107", "113", "115", "123", "125", "131", "133", "139", "141", "152", "153", "019", "037", "054" };
var conveyList4 = new List<string>() { "265", "266", "250", "253", "277" };
if (conveyList1.Contains(startStation))
{
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index d905aec..42ac0e4 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -2434,7 +2434,7 @@
//鎵樼洏杈惧埌鎷嗗灈宸ヤ綅锛學CS鍐欏叆鍝佺鍙峰苟鍐欏叆530
{
// 鑾峰彇鎵樼洏鏉＄爜閰嶇疆
- var modPalletNo = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鏉＄爜" && m.IsDelete == false);
+ var modPalletNo = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�" && m.IsDelete == false);
// 璇诲彇PLC鎵樼洏鏉＄爜鍙�
var (res, palletVal) = plcConn.GetPlcDBValue(modPalletNo.PosType, modDevice.DbNumber, modPalletNo.PlcPos);
string palletNo = palletVal.ToString();
--
Gitblit v1.8.0