Commit 972f6287 刘韬

添加mycronic料架禁用保存

1 个父辈 be302243
...@@ -30,7 +30,8 @@ namespace DeviceLibrary ...@@ -30,7 +30,8 @@ namespace DeviceLibrary
{ {
try try
{ {
File.WriteAllText("Config\\TowerList.json", JsonConvert.SerializeObject(List)); File.Copy("Config\\TowerList.json", "Config\\TowerList.json.bck",true);
ConfigHelper.Config.FileSave(JsonConvert.SerializeObject(List), "Config\\TowerList.json");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
...@@ -61,7 +61,7 @@ namespace DeviceLibrary ...@@ -61,7 +61,7 @@ namespace DeviceLibrary
binding.AllowCookies = false; binding.AllowCookies = false;
Uri baseAddress = new Uri(Setting_Init.Device_StoreServerURL); Uri baseAddress = new Uri(Setting_Init.Device_StoreServerURL);
EndpointAddress endpointAddress = new EndpointAddress(baseAddress.ToString()); EndpointAddress endpointAddress = new EndpointAddress(baseAddress.ToString());
towerAppWSClient = new MydataWcfServiceTest.ServiceReference2.TowerAppWSClient(binding, endpointAddress); towerAppWSClient = new MydataWcfServiceTest.ServiceReference3.WSInterfaceClient(binding, endpointAddress);
} }
private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
...@@ -590,7 +590,7 @@ namespace DeviceLibrary ...@@ -590,7 +590,7 @@ namespace DeviceLibrary
return true; return true;
} }
MydataWcfServiceTest.ServiceReference2.TowerAppWSClient towerAppWSClient; MydataWcfServiceTest.ServiceReference3.WSInterfaceClient towerAppWSClient;
/// <summary> /// <summary>
/// 存储MyCronic料仓的剩余容量 7X8=1000;7X12=345;13X32=100; /// 存储MyCronic料仓的剩余容量 7X8=1000;7X12=345;13X32=100;
/// </summary> /// </summary>
......
...@@ -183,7 +183,7 @@ public class ReelParam ...@@ -183,7 +183,7 @@ public class ReelParam
public int HeightPos = 0; public int HeightPos = 0;
public string RFID = ""; public string RFID = "";
public ReelParam clone() public virtual ReelParam clone()
{ {
ReelParam dstobject; ReelParam dstobject;
using (MemoryStream mStream = new MemoryStream()) using (MemoryStream mStream = new MemoryStream())
...@@ -215,7 +215,7 @@ public class ReelParam ...@@ -215,7 +215,7 @@ public class ReelParam
/// </summary> /// </summary>
/// <param name="NgPos"></param> /// <param name="NgPos"></param>
/// <param name="isInstore"></param> /// <param name="isInstore"></param>
public void logresult(int NgPos = 0,bool isInstore=true) public virtual void logresult(int NgPos = 0,bool isInstore=true)
{ {
if (!islog) if (!islog)
{ {
......
...@@ -41,10 +41,6 @@ ...@@ -41,10 +41,6 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.PrintLabel, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\PrintLabel\PrintLabel\bin\Debug\Asa.PrintLabel.dll</HintPath>
</Reference>
<Reference Include="Asa.RFID.PuYue, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Asa.RFID.PuYue, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\RFID\RFID_PuYue\bin\Debug\Asa.RFID.PuYue.dll</HintPath> <HintPath>..\..\RFID\RFID_PuYue\bin\Debug\Asa.RFID.PuYue.dll</HintPath>
......
...@@ -93,6 +93,7 @@ namespace TheMachine.device.Other ...@@ -93,6 +93,7 @@ namespace TheMachine.device.Other
// 更新 TowerInfo 对象的 enable 属性 // 更新 TowerInfo 对象的 enable 属性
tower.Enable = checkBox.Checked; tower.Enable = checkBox.Checked;
TowerList.SaveTowerInfo();
} }
private void Crc_LanguageChangeEvent(object sender, EventArgs e) private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!