Skip to content

李娜 / VerticalStore

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

开关门写反了

1 个父辈 ad54abf3
内嵌 并排
正在显示 5 个修改的文件 包含 56 行增加 和 44 行删除
source/DeviceLibrary/acVerticalStore/DoorBean.cs
...@@ -105,7 +105,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -105,7 +105,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private static bool UseDoor = true; private static bool UseDoor = true;
public static bool StartOpen(StoreMoveInfo moveInfo) public static bool StartClose(StoreMoveInfo moveInfo)
{ {
if (!UseDoor) if (!UseDoor)
{ {
...@@ -127,7 +127,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -127,7 +127,7 @@ namespace OnlineStore.DeviceLibrary
return Start(IO_Type.Door_Down, IO_Type.Door_Down); return Start(IO_Type.Door_Down, IO_Type.Door_Down);
} }
public static bool StartClose(StoreMoveInfo moveInfo) public static bool StartOpen(StoreMoveInfo moveInfo)
{ {
if (!UseDoor) if (!UseDoor)
{ {
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -40,11 +40,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -40,11 +40,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string SafetyLightCurtains = "SafetyLightCurtains"; public static string SafetyLightCurtains = "SafetyLightCurtains";
/// <summary> /// <summary>
/// DI,升降门上升端,Door_Up,3,192.168.200.21,升降门上升端,X04,X04,,,,,,,,,, /// DI,升降门上升/打开端,Door_Up,3,192.168.200.21,升降门上升/打开端,X04,X04,,,,,,,,,,
/// </summary> /// </summary>
public static string Door_Up = "Door_Up"; public static string Door_Up = "Door_Up";
/// <summary> /// <summary>
/// DI,升降门下降端,Door_Down,4,192.168.200.21,升降门下降端,X05,X05,,,,,,,,,, /// DI,升降门下降/关闭端,Door_Down,4,192.168.200.21,升降门下降/关闭端,X05,X05,,,,,,,,,,
/// </summary> /// </summary>
public static string Door_Down = "Door_Down"; public static string Door_Down = "Door_Down";
/// <summary> /// <summary>
......
source/VerticalStoreClinet/App.config
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections> </configSections>
<appSettings> <appSettings>
<!--是否开机自动启动料仓--> <!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="1"/> <add key="App_AutoRun" value="1" />
<add key="App_Title" value="垂直货柜"/> <add key="App_Title" value="垂直货柜" />
<add key="ACBaudRate" value="115200" />
<add key ="ACBaudRate" value ="115200"/>
<!--Server address--> <!--Server address-->
<!--<add key="http.server" value="http://localhost:80/"/>--> <!--<add key="http.server" value="http://localhost:80/"/>-->
<!--storeType--> <!--storeType-->
<add key="store_count" value="1"/> <add key="store_count" value="1" />
<!--start one store config--> <!--start one store config-->
<add key="Store_Position_Config" value="\StoreConfig\linePositions.csv"/> <add key="Store_Position_Config" value="\StoreConfig\linePositions.csv" />
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv"/> <add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
<add key="Store_Type" value="RC_AC_SA_Vertical"/> <add key="Store_Type" value="RC_AC_SA_Vertical" />
<add key="Store_CID" value="RC1275"/> <add key="Store_CID" value="RC1275" />
<!--end one store config--> <!--end one store config-->
<!--摄像机名称列表配置，用#分割--> <!--摄像机名称列表配置，用#分割-->
<add key="CameraName" value="GigE:MV-CE100-30GC (00C69898483)"/> <add key="CameraName" value="GigE:MV-CE100-30GC (00C69898483)" />
<!--二维码类型列表配置，用#分割，二维码：QR Code#Data Matrix ECC 200#Micro QR Code，一维码=Barcode--> <!--二维码类型列表配置，用#分割，二维码：QR Code#Data Matrix ECC 200#Micro QR Code，一维码=Barcode-->
<add key="CodeType" value="QR Code"/> <add key="CodeType" value="QR Code" />
<!--二维码参数文件所在路径，文件名与二维码类型名一样--> <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\CodeParam\"/> <add key="CodeParamPath" value="\CodeParam\" />
<add key="InOutDefaultPosition" value="8000"/> <add key="InOutDefaultPosition" value="8000" />
<add key="Config_Pwd" value="123456"/> <add key="Config_Pwd" value="123456" />
<!--出库等待料盘拿走的时间，秒--> <!--出库等待料盘拿走的时间，秒-->
<add key="OutStoreWaitSeconds" value="10"/> <add key="OutStoreWaitSeconds" value="10" />
<!--温控器类型，0=壁挂王字壳温湿度变送器，1=妙昕温湿度记录仪--> <!--温控器类型，0=壁挂王字壳温湿度变送器，1=妙昕温湿度记录仪-->
<add key="HumitureControllerType" value="0"/> <add key="HumitureControllerType" value="0" />
<add key ="DefaultPWD" value ="123456"/> <add key="DefaultPWD" value="123456" />
<!--<add key="UseAIOBOX" value="1"/>--> <!--<add key="UseAIOBOX" value="1"/>-->
<!--是否使用蜂鸣器--> <!--是否使用蜂鸣器-->
<add key ="UseBuzzer" value ="1"/> <add key="UseBuzzer" value="1" />
</appSettings> <add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file type="log4net.Util.PatternString" value="logs/Store-%property{fname}.log"/> <file type="log4net.Util.PatternString" value="logs/Store-%property{fname}.log" />
<param name="Encoding" value="UTF-8"/> <param name="Encoding" value="UTF-8" />
<appendToFile value="true"/> <appendToFile value="true" />
<rollingStyle value="Date"/> <rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd"/> <datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n"/> <conversionPattern value="[%date][%t]%-5p %m%n" />
</layout> </layout>
</appender> </appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender"> <appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file type="log4net.Util.PatternString" value="logs/aoi/AIOBOX.log"/> <file type="log4net.Util.PatternString" value="logs/aio/AIOBOX.log" />
<param name="Encoding" value="UTF-8"/> <param name="Encoding" value="UTF-8" />
<appendToFile value="true"/> <appendToFile value="true" />
<rollingStyle value="Date"/> <rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd"/> <datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n"/> <conversionPattern value="[%date][%t]%-5p %m%n" />
</layout> </layout>
</appender> </appender>
<logger name="RollingLogFileAppender"> <logger name="RollingLogFileAppender">
...@@ -71,14 +70,25 @@ ...@@ -71,14 +70,25 @@
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender" />
</root> </root>
<root> <root>
<level value="Info"/> <level value="Info" />
<appender-ref ref="RollingLogFileAppender"/> <appender-ref ref="RollingLogFileAppender" />
</root> </root>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
<!-- 部署服务库项目时，必须将配置文件的内容添加到 <!-- 部署服务库项目时，必须将配置文件的内容添加到
主机的 app.config 文件中。System.Configuration 不支持库的配置文件。 --> 主机的 app.config 文件中。System.Configuration 不支持库的配置文件。 -->
<system.web>
</configuration> <membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>
\ No newline at end of file \ No newline at end of file
source/VerticalStoreClinet/FrmIOStatus.cs
...@@ -179,7 +179,7 @@ namespace OnlineStore.TinPasteStore ...@@ -179,7 +179,7 @@ namespace OnlineStore.TinPasteStore
} }
foreach (string key in this.DOControlList.Keys) foreach (string key in this.DOControlList.Keys)
{ {
IOTextControl control = DOControlList[key]; IOTextControl control = DOControlList[key];
int iov = (int)IOManager.instance.GetIOValue(boxBean.Config.StoreDOList[key]); int iov = (int)IOManager.instance.GetIOValue(boxBean.Config.StoreDOList[key]);
if (iov != control.IOValue) if (iov != control.IOValue)
{ {
......
source/VerticalStoreClinet/VerticalStoreClient.csproj
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
...@@ -24,7 +25,6 @@ ...@@ -24,7 +25,6 @@
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup> </PropertyGroup>
...@@ -66,8 +66,10 @@ ...@@ -66,8 +66,10 @@
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\dll\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!