Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9d713b21 由 LN
选项

1

1 个父辈 dd418320
内嵌 并排
正在显示 6 个修改的文件 包含 55 行增加 和 55 行删除
source/ACSingleStore/App.config
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<add key="HumitureControllerType" value="0"/> <add key="HumitureControllerType" value="0"/>
<add key="UseAIOBOX" value="1"/> <add key="UseAIOBOX" value="1"/>
<!--流水线地址和端口配置--> <!--流水线地址和端口配置-->
<!--<add key ="LineServerIp" value ="192.168.1.110"/>--> <add key ="LineServerIp" value ="192.168.1.110"/>
<add key ="LineServerPort" value ="5246"/> <add key ="LineServerPort" value ="5246"/>
<!--是否调试状态--> <!--是否调试状态-->
<add key ="IsInDebug" value ="1"/> <add key ="IsInDebug" value ="1"/>
......
source/ACSingleStore/FormManager.cs
...@@ -15,57 +15,57 @@ namespace OnlineStore.ACSingleStore ...@@ -15,57 +15,57 @@ namespace OnlineStore.ACSingleStore
//#03A9F4 //#03A9F4
public static Color buttonColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); //public static Color buttonColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
//public static Color buttonColor = System.Drawing.SystemColors.ActiveCaption; //public static Color buttonColor = System.Drawing.SystemColors.ActiveCaption;
//public static Color buttonColor = System.Drawing.Color.FromArgb(((int)((0x00))), ((int)((0x66))), ((int)(0xFF))); //public static Color buttonColor = System.Drawing.Color.FromArgb(((int)((0x00))), ((int)((0x66))), ((int)(0xFF)));
//private static string skinFileName = Application.StartupPath + @"\Skins\Wave.ssk"; //private static string skinFileName = Application.StartupPath + @"\Skins\Wave.ssk";
private static string skinFileName = Application.StartupPath + @"\Skins\DiamondBlue.ssk"; //private static string skinFileName = Application.StartupPath + @"\Skins\DiamondBlue.ssk";
public static string SkinFileName //public static string SkinFileName
{ //{
set // set
{ // {
} // }
get // get
{ // {
if (SkinsList.Count <= 0) // if (SkinsList.Count <= 0)
{ // {
SkinsList = GetSkinList(); // SkinsList = GetSkinList();
} // }
if (SkinsList.Count > 0 && index >= 0) // if (SkinsList.Count > 0 && index >= 0)
{ // {
return SkinsList[index]; // return SkinsList[index];
} // }
return skinFileName; // return skinFileName;
} // }
} //}
private static int index = -1; //private static int index = -1;
public static void DefaultSkin() //public static void DefaultSkin()
{ //{
index = -1; // index = -1;
} //}
public static void NextSkin() //public static void NextSkin()
{ //{
index++; // index++;
if (index >= SkinsList.Count) // if (index >= SkinsList.Count)
{ // {
index = 0; // index = 0;
} // }
} //}
public static List<string> SkinsList = new List<string>(); //public static List<string> SkinsList = new List<string>();
private static List<string> GetSkinList() //private static List<string> GetSkinList()
{ //{
List<string> returnList = new System.Collections.Generic.List<string>(); // List<string> returnList = new System.Collections.Generic.List<string>();
string[] fileList = Directory.GetFiles(Application.StartupPath + @"\Skins"); // string[] fileList = Directory.GetFiles(Application.StartupPath + @"\Skins");
foreach (string sr in fileList) // foreach (string sr in fileList)
{ // {
if (sr.Contains(".ssk")) // if (sr.Contains(".ssk"))
{ // {
returnList.Add(sr); // returnList.Add(sr);
} // }
} // }
return returnList; // return returnList;
} //}
private static FrmAxisDebug debug = null; private static FrmAxisDebug debug = null;
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -1349,7 +1349,7 @@ namespace OnlineStore.ACSingleStore ...@@ -1349,7 +1349,7 @@ namespace OnlineStore.ACSingleStore
private void button6_Click(object sender, EventArgs e) private void button6_Click(object sender, EventArgs e)
{ {
int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door); int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
LineConnect.SendHeart(StoreManager.Config.Id, StoreManager.Config.CID, (int)StoreStatus.StoreOnline, (int)StoreRunStatus.Runing, hasTray,""); LineConnect.SendHeart(StoreManager.Config.Id, StoreManager.Config.CID, (int)StoreStatus.StoreOnline, (int)StoreRunStatus.Runing, hasTray,(int)StoreAlarmType.None);
} }
private void chbDebug_CheckedChanged(object sender, EventArgs e) private void chbDebug_CheckedChanged(object sender, EventArgs e)
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1415,7 +1415,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1415,7 +1415,7 @@ namespace OnlineStore.DeviceLibrary
posID = StoreMove.MoveParam.PositionNum; posID = StoreMove.MoveParam.PositionNum;
} }
int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door); int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
LineConnect.SendHeart(Config.Id, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray, posID); LineConnect.SendHeart(Config.Id, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray, (int)alarmType);
} }
HumitureController.QueryData(); HumitureController.QueryData();
HumidityProcess(); HumidityProcess();
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -656,7 +656,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -656,7 +656,7 @@ namespace OnlineStore.DeviceLibrary
CloseDoor(); CloseDoor();
//发送消息给流水线 //发送消息给流水线
int hasTray =(int) IOManager.IOValue(IO_Type.TrayCheck_Door); int hasTray =(int) IOManager.IOValue(IO_Type.TrayCheck_Door);
LineConnect.OutStoreEnd(Config.Id, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray,StoreMove.MoveParam.PositionNum, StoreMove.MoveParam.PlateH,StoreMove.MoveParam.PlateW); LineConnect.OutStoreEnd(Config.Id, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray,(int)alarmType, StoreMove.MoveParam.PositionNum, StoreMove.MoveParam.PlateH,StoreMove.MoveParam.PlateW);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack) else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
{ {
......
source/DeviceLibrary/lineConnect/LineConnect.cs
...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary
return seq; return seq;
} }
public static void SendHeart(int id,string cid,int ss,int runs,int doorHasTray,string posid) public static void SendHeart(int id,string cid,int ss,int runs,int doorHasTray,int alarmType)
{ {
if (client == null) if (client == null)
{ {
...@@ -61,7 +61,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -61,7 +61,7 @@ namespace OnlineStore.DeviceLibrary
paramList.Add(ss); paramList.Add(ss);
paramList.Add(runs); paramList.Add(runs);
paramList.Add(doorHasTray); paramList.Add(doorHasTray);
paramList.Add(posid); paramList.Add(alarmType);
string heartMsg = ToParamStr(paramList); string heartMsg = ToParamStr(paramList);
client.send(heartMsg); client.send(heartMsg);
...@@ -70,7 +70,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -70,7 +70,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("SendHeart 出错："+ex.ToString()); LogUtil.error("SendHeart 出错："+ex.ToString());
} }
} }
public static void OutStoreEnd(int id, string cid, int ss, int runs, int doorHasTray, string posid, string plateH, string plateW) public static void OutStoreEnd(int id, string cid, int ss, int runs, int doorHasTray, int alarmType,string posid, string plateH, string plateW)
{ {
if (client == null) if (client == null)
{ {
...@@ -86,7 +86,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -86,7 +86,7 @@ namespace OnlineStore.DeviceLibrary
paramList.Add(ss); paramList.Add(ss);
paramList.Add(runs); paramList.Add(runs);
paramList.Add(doorHasTray); paramList.Add(doorHasTray);
paramList.Add(posid); paramList.Add(alarmType);
paramList.Add(posid); paramList.Add(posid);
paramList.Add(plateH); paramList.Add(plateH);
paramList.Add(plateW); paramList.Add(plateW);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!