chenxy 6 lat temu
rodzic
commit
822cdfe1d0

+ 1 - 8
DK.PLC.IMEX.sln

@@ -8,18 +8,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{DDBDAE69-CEE2-418A-AFEE-88DF8E93EA03}"
 	ProjectSection(SolutionItems) = preProject
 		lib\Curtain.Core.dll = lib\Curtain.Core.dll
-		lib\Curtain.Core.xml = lib\Curtain.Core.xml
 		lib\Curtain.DataAccess.dll = lib\Curtain.DataAccess.dll
-		lib\Curtain.DataAccess.xml = lib\Curtain.DataAccess.xml
 		lib\Curtain.Framework.dll = lib\Curtain.Framework.dll
-		lib\Curtain.Framework.xml = lib\Curtain.Framework.xml
-		lib\Curtain.Net.Sockets.dll = lib\Curtain.Net.Sockets.dll
 		lib\Curtain.Net.Sockets.net4.dll = lib\Curtain.Net.Sockets.net4.dll
-		lib\Curtain.Net.Sockets.net4.xml = lib\Curtain.Net.Sockets.net4.xml
-		lib\Curtain.Net.Sockets.xml = lib\Curtain.Net.Sockets.xml
 		lib\ICSharpCode.SharpZipLib.dll = lib\ICSharpCode.SharpZipLib.dll
 		lib\Newtonsoft.Json.dll = lib\Newtonsoft.Json.dll
-		lib\Newtonsoft.Json.xml = lib\Newtonsoft.Json.xml
 		lib\Oracle.ManagedDataAccess.dll = lib\Oracle.ManagedDataAccess.dll
 	EndProjectSection
 EndProject
@@ -57,7 +50,7 @@ Global
 		{96481BCC-1C63-49FE-BFE6-0B313282C68A} = {C340FEF9-3D80-48B2-9CAA-3516411511DB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		VisualSVNWorkingCopyRoot = .
 		SolutionGuid = {FE9A9CED-4A11-4731-A68A-5602F1847C6B}
+		VisualSVNWorkingCopyRoot = .
 	EndGlobalSection
 EndGlobal

+ 1 - 2
imex/PLC_S/PLC_S.csproj

@@ -75,11 +75,10 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="PLC_S_INI\PLC_S_GC.ini" />
     <None Include="PLC_S_INI\PLC_S_PW.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="PLC_S_S.ini">
+    <None Include="PLC_S_INI\PLC_S_S.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 1 - 1
imex/PLC_S/PLC_S_INI/PLC_S_GC.ini

@@ -1,5 +1,5 @@
 
-[GC101]
+[GC201]
 IP=127.0.0.1
 Port=5001
 Add_Code=D

+ 0 - 8
imex/PLC_S/PLC_S_INI/PLC_S_GL.ini

@@ -1,8 +0,0 @@
-
-[GL01]
-IP=127.0.0.1
-Port=5001
-Add_Code=D
-Add_CodeNum=100
-Add_Error=D
-Add_ErrorNum=200

+ 1 - 1
imex/PLC_S/PLC_S_INI/PLC_S_PW.ini

@@ -1,5 +1,5 @@
 
-[PW101]
+[PW201]
 P_ID=16
 USER_CDOE=F3,F4
 IP=127.0.0.1

+ 5 - 6
imex/PLC_S/PLC_S_S.ini → imex/PLC_S/PLC_S_INI/PLC_S_S.ini

@@ -6,9 +6,8 @@ Database=dkmes
 UserName=mes
 Password=etLHPkLTOLw=
 
-
 [iBOSS.MES]
-IP=127.0.0.1
+IP=10.0.8.2
 Port=1234
 AccountCode=imex
 UserCode=dk
@@ -19,9 +18,9 @@ ServiceName=DKService
 #GC 产品型号 HPG 高压注浆 PW 工序计件 KL 登窑 KI 入窑 KUL 卸窑
 PLCServiceType=PW
 AutoStart=False
-Port=6200
-Description=imex 二期 贺翔施釉臂 2#施釉
-DisplayName=[PW][6200]2#施釉
-ServiceName=[PW][6200]
+Port=6201
+Description=imex 二期 贺翔施釉臂 DongkePLC[6201]2#施釉
+DisplayName=DongkePLC[6201]2#施釉
+ServiceName=DK.PLC[PW][6201]
 S_Name=DK.PLC
 D_Name='Dongke PLC '

+ 2 - 2
imex/PLC_WF/F_Main.cs

@@ -34,11 +34,11 @@ namespace PLC_WF
             dataTable.Columns.Add("code");
             dataTable.Columns.Add("name");
             dataTable.Columns.Add("description");
-            dataTable.Rows.Add("GC", "产品型号", "提供产品型号的服务【】");
+            //dataTable.Rows.Add("GC", "产品型号", "提供产品型号的服务【】");
             //dataTable.Rows.Add("GL", "产品等级", "提供产品等级的服务【】");
 
             //dataTable.Rows.Add("HPG", "高压注浆", "自动高压注浆的服务【】");
-            dataTable.Rows.Add("PW", "工序计件", "工序自动计件的服务【】");
+            dataTable.Rows.Add("PW", "施釉工序计件", "工序自动计件的服务【】");
             //dataTable.Rows.Add("KL", "登窑", "自动登窑的服务【】");
             //dataTable.Rows.Add("KI", "入窑", "自动入窑的服务【】");
             //dataTable.Rows.Add("KUL", "卸窑", "自动卸窑的服务【】");