。

Aucma.Scada.UI/Aucma.Scada.UI.csproj

@@ -322,6 +322,15 @@
     <Content Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="config\App.Ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\Plc.Ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\PlcSpace.Ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

Aucma.Scada.UI/config/App.Ini

@@ -0,0 +1,44 @@
+[system]
+#数据库连接
+mesConnStr=Data Source=10.100.72.20/ORCLCDB;User ID=c##aucma_mes;Password=aucma
+scadaConnStr=Data Source=10.100.72.20/ORCLCDB;User ID=c##aucma_scada;Password=aucma
+
+#工位编号
+stationCode=1006
+#过点数据出库工位编号
+outstationCode=1011
+#工位名称
+stationName=泡后库
+
+#箱壳库编号
+shellStoreCode=XKK-001
+#内胆库编号
+linerStoreCode=NDK-001
+#泡后库编号
+foamStoreCode=PHK-001
+
+#泡后物料类型编号
+foamMaterialType=200
+
+#入库任务类型编号
+instoreTaskType=1
+#出库任务类型编号
+outstoreTaskType=2
+
+#泡后入库扫码器IP
+foamHikRobotIp=10.10.92.133
+#泡后出库扫码器IP
+foamOutHikRobotIp=10.10.92.134
+searchItems=208%SC233%SC234%310%%%%%%%
+
+#工位编号
+ProductlineCode=CX_02
+#班组代码
+TeamCode=
+#班组名称
+TeamName=
+#用户名
+Account=
+#用于配置登录界面可见班组信息，查询展示当前产线并且班组编号包含该配置的班组
+TeamConfig=ZOZH
+

Aucma.Scada.UI/config/Plc.Ini

@@ -1,6 +1,6 @@
 [plcSystem]
-ﾅﾝｺ<EFBFBD>LCIP=127.0.0.1
-ﾅﾝｺ<EFBFBD>LCｶﾋｿﾚ=6000
+ﾅﾝｺ<EFBFBD>LCIP=10.10.92.49
+ﾅﾝｺ<EFBFBD>LCｶﾋｿﾚ=2015
 [foam_inStore_address]
 Èë¿â»õµÀºÅ=D7000
 Èë¿âÓ¦´ð×Ö=D7010

Aucma.Scada.UI/config/PlcSpace.Ini

@@ -0,0 +1,46 @@
+#泡后库货道信息   #是否已满=D7221   #货道状态=D7231  仓库状态=D7300 #设备状态字,0未启动状态,1已自动运行,2维修调试状态,禁止启动
+[PHK-001_PH_001]
+在库数量=D7201
+在途数量=D7211
+入库完成=D7021
+出库完成=D7240
+[PHK-001_PH_002]
+在库数量=D7202
+在途数量=D7212
+入库完成=D7022
+出库完成=D7240
+[PHK-001_PH_003]
+在库数量=D7203
+在途数量=D7213
+入库完成=D7023
+出库完成=D7240
+[PHK-001_PH_004]
+在库数量=D7204
+在途数量=D7214
+入库完成=D7024
+出库完成=D7240
+[PHK-001_PH_005]
+在库数量=D7205
+在途数量=D7215
+入库完成=D7025
+出库完成=D7240
+[PHK-001_PH_006]
+在库数量=D7206
+在途数量=D7216
+入库完成=D7026
+出库完成=D7240
+[PHK-001_PH_007]
+在库数量=D7207
+在途数量=D7217
+入库完成=D7027
+出库完成=D7240
+[PHK-001_PH_008]
+在库数量=D7208
+在途数量=D7218
+入库完成=D7028
+出库完成=D7240
+[PHK-001_PH_009]
+在库数量=D7209
+在途数量=D7219
+入库完成=D7029
+出库完成=D7240

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt

@@ -723,3 +723,6 @@ E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\obj\Debug
 E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe
 E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb
 E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
+E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\bin\Debug\config\App.Ini
+E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\bin\Debug\config\Plc.Ini
+E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\bin\Debug\config\PlcSpace.Ini

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref

@@ -1,4 +1,4 @@
-
+E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
 FE:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\App.xaml;;
 FE:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
 FE:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;

Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,62 +1,2 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
+