Skip to content

顾剑亮 / SmartShelfLight

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1f5d3085 由 顾剑亮
选项

添加大料架转移功能

1 个父辈 a68faf17
全部展开
内嵌 并排
正在显示 38 个修改的文件 包含 156 行增加 和 206 行删除
._亮灯料架IP分配.xlsx 0 → 100644
此文件类型无法预览
SmartShelfLight/App.config
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</appender> </appender>
<logger name="SmartShelfLight"> <logger name="SmartShelfLight">
<level value="Debug" /> <level value="Info" />
<appender-ref ref="SmartShelfLight" /> <appender-ref ref="SmartShelfLight" />
</logger> </logger>
<logger name="Hao_Bin"> <logger name="Hao_Bin">
...@@ -52,10 +52,11 @@ ...@@ -52,10 +52,11 @@
</logger> </logger>
</log4net> </log4net>
<appSettings> <appSettings>
<!--<add key="WebService" value="http://10.85.196.40:8088/"/>--> <add key="WebService" value="http://10.85.196.40:8088/"/>
<add key="WebService" value="http://127.0.0.1:8088/"/> <!--<add key="WebService" value="http://127.0.0.1:8088/"/>-->
<add key="FirstLED" value=""/> <add key="FirstLED" value=""/>
<add key="RFIDPort" value="12000"/> <add key="RFIDPort1" value="12000"/>
<add key="RFIDPort2" value="12001"/>
<add key="DwellTime" value="5"/> <add key="DwellTime" value="5"/>
<add key ="StatusLedDmx" value ="0"/> <add key ="StatusLedDmx" value ="0"/>
<add key ="ColorRuleConfig" value ="RGB"/> <add key ="ColorRuleConfig" value ="RGB"/>
......
SmartShelfLight/Common.cs
...@@ -48,7 +48,7 @@ namespace SmartShelfLight ...@@ -48,7 +48,7 @@ namespace SmartShelfLight
public static log4net.ILog log; public static log4net.ILog log;
//public static Asa.RFID.ReadAll rfid; //public static Asa.RFID.ReadAll rfid;
public static Asa.RFID.ReadAll1 reader1; public static Asa.RFID.ReadAll1 reader1;
public static Asa.RFID.ReadAll2 reader2; public static Asa.RFID.ReadAll reader3;
/// <summary> /// <summary>
/// RFID公司，浩斌，第一次使用的设备 /// RFID公司，浩斌，第一次使用的设备
...@@ -189,7 +189,7 @@ namespace SmartShelfLight ...@@ -189,7 +189,7 @@ namespace SmartShelfLight
public struct Line public class Line
{ {
/// <summary> /// <summary>
/// 产线名称 /// 产线名称
...@@ -227,6 +227,13 @@ namespace SmartShelfLight ...@@ -227,6 +227,13 @@ namespace SmartShelfLight
/// RFID类型 /// RFID类型
/// </summary> /// </summary>
public string[] RFID_Type; public string[] RFID_Type;
public List<string[]> TransferPlace;
public Line()
{
TransferPlace = new List<string[]>();
}
} }
......
SmartShelfLight/FrmMain.Designer.cs
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewButtonColumn(); this.Column2 = new System.Windows.Forms.DataGridViewButtonColumn();
this.Column5 = new System.Windows.Forms.DataGridViewButtonColumn();
((System.ComponentModel.ISupportInitialize)(this.DgvLight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvLight)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -64,7 +65,8 @@ ...@@ -64,7 +65,8 @@
this.Column1, this.Column1,
this.Column4, this.Column4,
this.Column3, this.Column3,
this.Column2}); this.Column2,
this.Column5});
this.DgvLight.Location = new System.Drawing.Point(12, 42); this.DgvLight.Location = new System.Drawing.Point(12, 42);
this.DgvLight.Name = "DgvLight"; this.DgvLight.Name = "DgvLight";
this.DgvLight.ReadOnly = true; this.DgvLight.ReadOnly = true;
...@@ -120,11 +122,18 @@ ...@@ -120,11 +122,18 @@
// //
// Column2 // Column2
// //
this.Column2.HeaderText = "修改"; this.Column2.HeaderText = "修改RFID";
this.Column2.Name = "Column2"; this.Column2.Name = "Column2";
this.Column2.ReadOnly = true; this.Column2.ReadOnly = true;
this.Column2.Width = 80; this.Column2.Width = 80;
// //
// Column5
//
this.Column5.HeaderText = "灭灯";
this.Column5.Name = "Column5";
this.Column5.ReadOnly = true;
this.Column5.Width = 80;
//
// FrmMain // FrmMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -152,6 +161,7 @@ ...@@ -152,6 +161,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
private System.Windows.Forms.DataGridViewButtonColumn Column2; private System.Windows.Forms.DataGridViewButtonColumn Column2;
private System.Windows.Forms.DataGridViewButtonColumn Column5;
} }
} }
SmartShelfLight/FrmMain.cs
...@@ -73,7 +73,7 @@ namespace SmartShelfLight ...@@ -73,7 +73,7 @@ namespace SmartShelfLight
private void Rfid_Received(string ip, string id) private void Rfid_Received(string ip, string id)
{ {
Common.log.Debug("RFID Received[" + ip + "] " + id); Common.log.Info("RFID Received[" + ip + "] " + id);
bool rtn = Common.FindRfidIP(ip, out int lineIndex, out int rfidIndex); bool rtn = Common.FindRfidIP(ip, out int lineIndex, out int rfidIndex);
if (!rtn) return; if (!rtn) return;
...@@ -93,11 +93,26 @@ namespace SmartShelfLight ...@@ -93,11 +93,26 @@ namespace SmartShelfLight
Common.ClearRfidID(id); Common.ClearRfidID(id);
Common.lines[lineIndex].RFID_ID[rfidIndex] = id; Common.lines[lineIndex].RFID_ID[rfidIndex] = id;
Common.lines[lineIndex].RFID_DwellTime[rfidIndex] = DateTime.Now.Ticks; Common.lines[lineIndex].RFID_DwellTime[rfidIndex] = DateTime.Now.Ticks;
Common.log.Info(Common.lines[lineIndex].Name + " RFID=" + id);
//应该改成所有的更新 //来新架子先灭灯
int[] index = new int[92];
for (int i = 0; i < index.Length; i++)
index[i] = i;
Common.lines[lineIndex].LED.LightOff(rfidIndex, index);
Common.lines[lineIndex].LED_Place = new bool[92];
Common.log.Info(Common.lines[lineIndex].Name + "-" + (rfidIndex + 1).ToString() + " 来新架子，灭灯");
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
DgvLight.Rows[lineIndex * 4 + i].Cells[1].Value = Common.lines[lineIndex].RFID_ID[i]; DgvLight.Rows[lineIndex * 4 + i].Cells[1].Value = Common.lines[lineIndex].RFID_ID[i];
Common.log.Info(Common.lines[lineIndex].Name + " RFID=" + id);
//料架改变后关闭这个料架区域的所有灯
//int[] index = new int[92];
//for (int i = 0; i < index.Length; i++)
// index[i] = i;
//Common.lines[lineIndex].LED.LightOff(rfidIndex, index);
//Common.lines[lineIndex].LED_Place = new bool[92];
//DgvLight.Rows[lineIndex * 4 + rfidIndex].Cells[2].Value = "";
//保存RFID到文件 //保存RFID到文件
Common.SaveRfidID(); Common.SaveRfidID();
...@@ -133,19 +148,6 @@ namespace SmartShelfLight ...@@ -133,19 +148,6 @@ namespace SmartShelfLight
private void FrmMain_Load(object sender, EventArgs e) private void FrmMain_Load(object sender, EventArgs e)
{ {
////托盘菜单
//notifyMenu = new ContextMenuStrip();
//ToolStripMenuItem itemShow = new ToolStripMenuItem("显示(&S)");
//itemShow.Click += ItemShow_Click;
//ToolStripMenuItem itemExit = new ToolStripMenuItem("退出(&X)");
//itemExit.Click += ItemExit_Click;
//notifyMenu.Items.Add(itemShow);
//notifyMenu.Items.Add(itemExit);
////托盘控件
//notify = new NotifyIcon { Icon = Icon, Visible = true, ContextMenuStrip = notifyMenu, Text = Text };
//notify.MouseDoubleClick += Notify_MouseDoubleClick;
Asa.WindowsForm.Load(this); Asa.WindowsForm.Load(this);
//读取保存的RFID //读取保存的RFID
...@@ -173,13 +175,14 @@ namespace SmartShelfLight ...@@ -173,13 +175,14 @@ namespace SmartShelfLight
{ {
if (Common.lines[i].RFID_Type[j] == Common.RFID_PuYue) if (Common.lines[i].RFID_Type[j] == Common.RFID_PuYue)
ip.Add(Common.lines[i].RFID_IP[j]); ip.Add(Common.lines[i].RFID_IP[j]);
int n = DgvLight.Rows.Add(Common.lines[i].Name, Common.lines[i].RFID_ID[j], "", "修改"); int n = DgvLight.Rows.Add(Common.lines[i].Name, Common.lines[i].RFID_ID[j], "", "修改", "灭灯");
DgvLight.Rows[n].HeaderCell.Value = (n + 1).ToString(); DgvLight.Rows[n].HeaderCell.Value = (n + 1).ToString();
DgvLight.Rows[n].DefaultCellStyle.BackColor = (i % 2 == 0 ? bg1 : bg2); DgvLight.Rows[n].DefaultCellStyle.BackColor = (i % 2 == 0 ? bg1 : bg2);
} }
} }
int port = Convert.ToInt32(Common.appConfig.AppSettings.Settings["RFIDPort"].Value); int port1 = Convert.ToInt32(Common.appConfig.AppSettings.Settings["RFIDPort1"].Value);
int port2 = Convert.ToInt32(Common.appConfig.AppSettings.Settings["RFIDPort2"].Value);
Common.service.UpdateLight += Service_UpdateLight; Common.service.UpdateLight += Service_UpdateLight;
//Common.rfid = new Asa.RFID.ReadAll("ShelfRFID"); //Common.rfid = new Asa.RFID.ReadAll("ShelfRFID");
//Common.rfid.Received += Rfid_Received; //Common.rfid.Received += Rfid_Received;
...@@ -187,12 +190,12 @@ namespace SmartShelfLight ...@@ -187,12 +190,12 @@ namespace SmartShelfLight
Common.reader1 = new Asa.RFID.ReadAll1(Common.RFID_HaoBin); Common.reader1 = new Asa.RFID.ReadAll1(Common.RFID_HaoBin);
Common.reader1.Received += Rfid_Received; Common.reader1.Received += Rfid_Received;
Common.reader1.Start(port); Common.reader1.Start(port1);
Common.reader2 = new Asa.RFID.ReadAll2(Common.RFID_PuYue);
Common.reader2.Received += Rfid_Received;
Common.reader2.Start(ip.ToArray());
Common.reader3 = new Asa.RFID.ReadAll(Common.RFID_PuYue);
Common.reader3.Received += Rfid_Received;
//Common.reader3.Start(ip.ToArray());
Common.reader3.Start(port2);
} }
...@@ -212,7 +215,7 @@ namespace SmartShelfLight ...@@ -212,7 +215,7 @@ namespace SmartShelfLight
if (Asa.WindowsForm.Close(e)) if (Asa.WindowsForm.Close(e))
{ {
Common.reader1.Stop(); Common.reader1.Stop();
Common.reader2.Stop(); Common.reader3.Stop();
} }
} }
...@@ -225,17 +228,31 @@ namespace SmartShelfLight ...@@ -225,17 +228,31 @@ namespace SmartShelfLight
private void DgvLight_CellContentClick(object sender, DataGridViewCellEventArgs e) private void DgvLight_CellContentClick(object sender, DataGridViewCellEventArgs e)
{ {
int row = e.RowIndex; int row = e.RowIndex;
int idx1 = row / 4;
int idx2 = row % 4;
if (e.ColumnIndex == 3) //修改 if (e.ColumnIndex == 3) //修改
{ {
string s = Microsoft.VisualBasic.Interaction.InputBox("RFID", "输入", ""); string s = Microsoft.VisualBasic.Interaction.InputBox("RFID", "输入", "");
int idx1 = row / 4; if (s == "") return; //取消
int idx2 = row % 4;
s = s.Replace(" ", "");
Common.log.Info("手动修改RFID " + Common.lines[idx1].RFID_ID[idx2] + "=>" + s);
Common.lines[idx1].RFID_ID[idx2] = s; Common.lines[idx1].RFID_ID[idx2] = s;
DgvLight.Rows[row].Cells[1].Value = s; DgvLight.Rows[row].Cells[1].Value = s;
Common.SaveRfidID(); Common.SaveRfidID();
} }
else if (e.ColumnIndex == 4) //灭灯
{
int[] index = new int[92];
for (int i = 0; i < index.Length; i++)
index[i] = i;
Common.lines[idx1].LED.LightOff(idx2, index);
Common.lines[idx1].LED_Place = new bool[92];
DgvLight.Rows[row].Cells[2].Value = "";
Common.log.Info("手动灭灯 LineIndex=" + idx1 + " RfidIndex=" + idx2);
}
} }
} }
......
SmartShelfLight/FrmMain.resx
...@@ -129,6 +129,9 @@ ...@@ -129,6 +129,9 @@
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
SmartShelfLight/FrmTest.cs
...@@ -27,15 +27,19 @@ namespace SmartShelfLight ...@@ -27,15 +27,19 @@ namespace SmartShelfLight
private void BtnAllLightOn_Click(object sender, EventArgs e) private void BtnAllLightOn_Click(object sender, EventArgs e)
{ {
if (CboIP.Text.Length == 0) return; if (CboIP.Text.Length == 0) return;
string[] ip = CboIP.Text.Split(' '); string[] arr = CboIP.Text.Split(' ');
LEDBaseModule.GetModule(ip[ip.Length - 1]).AllLightOn(); string ip = arr[arr.Length - 1];
LEDManager.GetLedModule(ip).AllLightOn();
Common.log.Info("测试 LED[" + ip + "] 全部点亮");
} }
private void BtnAllLightOff_Click(object sender, EventArgs e) private void BtnAllLightOff_Click(object sender, EventArgs e)
{ {
if (CboIP.Text.Length == 0) return; if (CboIP.Text.Length == 0) return;
string[] ip = CboIP.Text.Split(' '); string[] arr = CboIP.Text.Split(' ');
LEDBaseModule.GetModule(ip[ip.Length - 1]).AllLightOff(); string ip = arr[arr.Length - 1];
LEDManager.GetLedModule(ip).AllLightOff();
Common.log.Info("测试 LED[" + ip + "] 全部灭灯");
} }
} }
} }
SmartShelfLight/Program.cs
...@@ -19,7 +19,6 @@ namespace SmartShelfLight ...@@ -19,7 +19,6 @@ namespace SmartShelfLight
log4net.Config.XmlConfigurator.Configure(); log4net.Config.XmlConfigurator.Configure();
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
if (Asa.WindowsForm.IsRun()) return; if (Asa.WindowsForm.IsRun()) return;
if (!Asa.WindowsForm.IsAdmin()) return; if (!Asa.WindowsForm.IsAdmin()) return;
...@@ -65,6 +64,16 @@ namespace SmartShelfLight ...@@ -65,6 +64,16 @@ namespace SmartShelfLight
Common.lines.Add(line); Common.lines.Add(line);
} }
path = Environment.CurrentDirectory + "\\Config\\Transfer.csv";
arr = System.IO.File.ReadAllLines(path, System.Text.Encoding.UTF8);
for (int i = 1; i < arr.Length; i++) //第一行是标题
{
string[] tt = arr[i].Split(',');
int idx = Common.lines.FindIndex(s => s.Name == tt[0]);
if (idx == -1) continue;
Common.lines[idx].TransferPlace.Add(new string[] { tt[1], tt[2], tt[3] });
}
Common.log.Info("读取配置完成"); Common.log.Info("读取配置完成");
} }
catch (Exception ex) catch (Exception ex)
......
SmartShelfLight/SmartShelfLight.csproj
...@@ -41,21 +41,19 @@ ...@@ -41,21 +41,19 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.RFID.HFRead"> <Reference Include="Asa.RFID.HFRead">
<HintPath>..\..\RFID\RFID\bin\Debug\Asa.RFID.HFRead.dll</HintPath> <HintPath>..\..\..\DLL\RFID\Asa.RFID.HFRead.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.RFID.HiStation, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Asa.RFID.HiStation">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\DLL\RFID\Asa.RFID.HiStation.dll</HintPath>
<HintPath>..\..\RFID\RFID-HiStation\bin\Debug\Asa.RFID.HiStation.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.RFID.IReadAll, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Asa.RFID.IReadAll">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\DLL\RFID\Asa.RFID.IReadAll.dll</HintPath>
<HintPath>..\..\RFID\RFID_Interface\bin\Debug\Asa.RFID.IReadAll.dll</HintPath>
</Reference> </Reference>
<Reference Include="ClassFormParent"> <Reference Include="ClassFormParent">
<HintPath>..\..\ClassFormParent\ClassFormParent\bin\Debug\ClassFormParent.dll</HintPath> <HintPath>..\..\..\DLL\ClassFormParent\ClassFormParent.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\..\..\..\DLL\log4net.dll</HintPath> <HintPath>..\..\..\DLL\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" /> <Reference Include="System" />
......
SmartShelfLight/bin/Debug/Asa.RFID.HFRead.xml deleted 100644 → 0
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.RFID.HFRead</name>
</assembly>
<members>
<member name="T:Asa.RFID.ReadAll1">
<summary>
读取所有RFID
</summary>
</member>
<member name="M:Asa.RFID.ReadAll1.#ctor(System.String)">
<summary>
读取所有RFID
</summary>
<param name="logName">日志名称</param>
</member>
<member name="M:Asa.RFID.ReadAll1.Start(System.Int32)">
<summary>
开启
</summary>
<param name="port">RFID设备的端口</param>
</member>
<member name="M:Asa.RFID.ReadAll1.Stop">
<summary>
停止
</summary>
</member>
<member name="M:Asa.RFID.ReadAll1.Read(System.String)">
<summary>
读取ID号
</summary>
<param name="ip"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.ReadAll1.Clear(System.String)">
<summary>
清除缓存
</summary>
<param name="ip"></param>
</member>
</members>
</doc>
SmartShelfLight/bin/Debug/Config/RFID_Cache.csv
10.85.196.1, 
10.85.196.2,
10.85.196.3,
10.85.196.4,
10.85.196.6,
10.85.196.7,
10.85.196.8,
10.85.196.9,
10.85.196.11,
10.85.196.12,
10.85.196.13,
10.85.196.14,
10.85.196.16,
10.85.196.17,
10.85.196.18,
10.85.196.19,
10.85.196.21,
10.85.196.22,
10.85.196.23,
10.85.196.24,
10.85.196.26,
10.85.196.27,
10.85.196.28,
10.85.196.29,
10.85.196.31,
10.85.196.32,
10.85.196.33,
10.85.196.34,
10.85.196.36,
10.85.196.37,
10.85.196.38,
10.85.196.39,
10.85.196.42,
10.85.196.43,
10.85.196.44,
10.85.196.45,
10.85.196.47,
10.85.196.48,
10.85.196.48,
10.85.196.50,
10.85.196.52,
10.85.196.53,
10.85.196.54,
10.85.196.55,
10.85.196.57,
10.85.196.58,
10.85.196.59,
10.85.196.60,
10.85.196.62,
10.85.196.63,
10.85.196.64,
10.85.196.65,
10.85.196.67,
10.85.196.68,
10.85.196.69,
10.85.196.70,
\ No newline at end of file \ No newline at end of file
SmartShelfLight/bin/Debug/Config/Shelf.csv
Name,Vendor1,Vendor2,Vendor3,Vendor4,RFID1,RFID2,RFID3,RFID4,LED Name,Vendor1,Vendor2,Vendor3,Vendor4,RFID1,RFID2,RFID3,RFID4,LED
D1,Hao_Bin,Hao_Bin,Hao_Bin,Hao_Bin,10.85.196.1,10.85.196.2,10.85.196.3,10.85.196.4,10.85.196.72 C1,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.11,10.85.197.12,10.85.197.13,10.85.197.14,10.85.197.15
D2,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.6,10.85.196.7,10.85.196.8,10.85.196.9,10.85.196.10 C2,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.16,10.85.197.17,10.85.197.18,10.85.197.19,10.85.197.20
D3,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.11,10.85.196.12,10.85.196.13,10.85.196.14,10.85.196.15 C3,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.21,10.85.197.22,10.85.197.23,10.85.197.24,10.85.197.25
D4,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.16,10.85.196.17,10.85.196.18,10.85.196.19,10.85.196.20 C4,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.26,10.85.197.27,10.85.197.28,10.85.197.29,10.85.197.30
D5,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.21,10.85.196.22,10.85.196.23,10.85.196.24,10.85.196.25 C5,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.31,10.85.197.32,10.85.197.33,10.85.197.34,10.85.197.35
D6,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.26,10.85.196.27,10.85.196.28,10.85.196.29,10.85.196.30 C6,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.36,10.85.197.37,10.85.197.38,10.85.197.39,10.85.197.41
D8,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.31,10.85.196.32,10.85.196.33,10.85.196.34,10.85.196.35 C7,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.42,10.85.197.43,10.85.197.44,10.85.197.45,10.85.197.46
D9,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.36,10.85.196.37,10.85.196.38,10.85.196.39,10.85.196.41 C8,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.47,10.85.197.48,10.85.197.49,10.85.197.50,10.85.197.51
D10,Pu_Yue,Pu_Yue,Pu_Yue,Hao_Bin,10.85.196.42,10.85.196.43,10.85.196.44,10.85.196.45,10.85.196.46 C9,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.52,10.85.197.53,10.85.197.54,10.85.197.55,10.85.197.56
D11,Hao_Bin,Hao_Bin,Hao_Bin,Hao_Bin,10.85.196.47,10.85.196.48,10.85.196.48,10.85.196.50,10.85.196.51 C10,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.197.57,10.85.197.58,10.85.197.59,10.85.197.60,10.85.197.61
D12,Pu_Yue,Pu_Yue,Pu_Yue,Pu_Yue,10.85.196.52,10.85.196.53,10.85.196.54,10.85.196.55,10.85.196.56
D14,Hao_Bin,Hao_Bin,Hao_Bin,Hao_Bin,10.85.196.57,10.85.196.58,10.85.196.59,10.85.196.60,10.85.196.61
D15,Hao_Bin,Hao_Bin,Hao_Bin,Hao_Bin,10.85.196.62,10.85.196.63,10.85.196.64,10.85.196.65,10.85.196.66
D16,Hao_Bin,Hao_Bin,Hao_Bin,Hao_Bin,10.85.196.67,10.85.196.68,10.85.196.69,10.85.196.70,10.85.196.71
SmartShelfLight/bin/Debug/Config/Transfer.csv 0 → 100644
line,place,dmxId,Index
D1,1,4,0
D1,2,4,1
D1,3,4,2
D1,4,4,3
D2,1,4,0
D2,2,4,1
D2,3,4,2
D2,4,4,3
SmartShelfLight/bin/Debug/SmartShelfLight.exe.config
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</appender> </appender>
<logger name="SmartShelfLight"> <logger name="SmartShelfLight">
<level value="Debug" /> <level value="Info" />
<appender-ref ref="SmartShelfLight" /> <appender-ref ref="SmartShelfLight" />
</logger> </logger>
<logger name="Hao_Bin"> <logger name="Hao_Bin">
...@@ -52,10 +52,11 @@ ...@@ -52,10 +52,11 @@
</logger> </logger>
</log4net> </log4net>
<appSettings> <appSettings>
<!--<add key="WebService" value="http://10.85.196.40:8088/"/>--> <add key="WebService" value="http://10.85.196.40:8088/"/>
<add key="WebService" value="http://127.0.0.1:8088/"/> <!--<add key="WebService" value="http://127.0.0.1:8088/"/>-->
<add key="FirstLED" value=""/> <add key="FirstLED" value=""/>
<add key="RFIDPort" value="12000"/> <add key="RFIDPort1" value="12000"/>
<add key="RFIDPort2" value="12001"/>
<add key="DwellTime" value="5"/> <add key="DwellTime" value="5"/>
<add key ="StatusLedDmx" value ="0"/> <add key ="StatusLedDmx" value ="0"/>
<add key ="ColorRuleConfig" value ="RGB"/> <add key ="ColorRuleConfig" value ="RGB"/>
......
SmartShelfLight/bin/Debug/logs/Hao_Bin.log deleted 100644 → 0
[2020-08-15 14:09:39,084][1]INFO Server Start
[2020-08-15 14:09:52,815][1]INFO Server Stop
[2020-08-15 14:09:52,832][7]ERROR Socket Close
[2020-08-15 14:10:40,050][1]INFO Server Start
[2020-08-15 14:15:13,343][1]INFO Server Start
[2020-08-15 14:16:06,326][1]INFO Server Stop
[2020-08-15 14:16:06,354][7]ERROR Socket Close
[2020-08-15 14:16:17,715][1]INFO Server Start
[2020-08-15 14:17:02,652][1]INFO Server Stop
[2020-08-15 14:17:02,668][7]ERROR Socket Close
SmartShelfLight/bin/Debug/logs/Hao_Bin.log2020-08-14 deleted 100644 → 0
[2020-08-14 17:52:53,335][1]INFO Server Start
[2020-08-14 17:53:29,416][1]INFO Server Stop
[2020-08-14 17:53:29,443][8]ERROR Socket Close
SmartShelfLight/bin/Debug/logs/Pu_Yue.log deleted 100644 → 0
此文件的差异太大，无法显示。
SmartShelfLight/bin/Debug/logs/SmartShelfLight.log deleted 100644 → 0
[2020-08-15 14:09:34,791][1]INFO =====Load=====
[2020-08-15 14:09:35,590][1]INFO 读取配置完成
[2020-08-15 14:09:38,838][1]INFO Web服务已开启
[2020-08-15 14:09:56,110][1]INFO Web服务已关闭
[2020-08-15 14:09:56,110][1]INFO =====Exit=====
[2020-08-15 14:10:39,388][1]INFO =====Load=====
[2020-08-15 14:10:39,572][1]INFO 读取配置完成
[2020-08-15 14:10:39,944][1]INFO Web服务已开启
[2020-08-15 14:15:12,780][1]INFO =====Load=====
[2020-08-15 14:15:13,012][1]INFO 读取配置完成
[2020-08-15 14:15:13,205][1]INFO Web服务已开启
[2020-08-15 14:16:08,198][1]INFO Web服务已关闭
[2020-08-15 14:16:08,199][1]INFO =====Exit=====
[2020-08-15 14:16:17,221][1]INFO =====Load=====
[2020-08-15 14:16:17,374][1]INFO 读取配置完成
[2020-08-15 14:16:17,555][1]INFO Web服务已开启
[2020-08-15 14:17:04,551][1]INFO Web服务已关闭
[2020-08-15 14:17:04,551][1]INFO =====Exit=====
SmartShelfLight/bin/Debug/logs/SmartShelfLight.log2020-08-14 deleted 100644 → 0
[2020-08-14 17:52:51,151][1]INFO =====Load=====
[2020-08-14 17:52:51,232][1]INFO 读取配置完成
[2020-08-14 17:52:51,593][1]INFO Web服务已开启
[2020-08-14 17:53:30,907][1]INFO Web服务已关闭
[2020-08-14 17:53:30,907][1]INFO =====Exit=====
SmartShelfLight/obj/Debug/SmartShelfLight.csproj.CoreCompileInputs.cache
6f9e7f004d8a797affe37db438e4d714a7024fd8 7188c8c0d08329c1acc83713f7cab49f7e3acfe2
SmartShelfLight/obj/Debug/SmartShelfLight.csproj.FileListAbsolute.txt
...@@ -30,3 +30,23 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight ...@@ -30,3 +30,23 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight
D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight\bin\Debug\ClassFormParent.pdb D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight\bin\Debug\ClassFormParent.pdb
D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.FrmTest.resources D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.FrmTest.resources
D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.csprojAssemblyReference.cache D:\OneDrive - 上海挚锦科技有限公司\SMD\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.csprojAssemblyReference.cache
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\SmartShelfLight.exe.config
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\SmartShelfLight.exe
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\SmartShelfLight.pdb
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\Asa.RFID.HFRead.dll
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\Asa.RFID.HiStation.dll
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\Asa.RFID.IReadAll.dll
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\ClassFormParent.dll
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\log4net.dll
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\Asa.RFID.HFRead.pdb
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\Asa.RFID.HiStation.pdb
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\Asa.RFID.IReadAll.pdb
D:\Neotel\SmartShelfLight\SmartShelfLight\bin\Debug\ClassFormParent.pdb
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.FrmMain.resources
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.FrmTest.resources
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.Properties.Resources.resources
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.csproj.GenerateResource.cache
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.csproj.CoreCompileInputs.cache
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.csproj.CopyComplete
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.exe
D:\Neotel\SmartShelfLight\SmartShelfLight\obj\Debug\SmartShelfLight.pdb
大料架库位转移.txt 0 → 100644
大料架库位转移亮灯接口，TransferLight
大料架库位转移灭灯接口，TransferDark
接口前面的http和亮灯料架是同一个
Get
TransferLight?line=D1&place=1
TransferDark?line=D1&place=1
Post
TransferLight
Body：line=D1&place=1
TransferDark
Body：line=D1&place=1
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!