Merge branch 'master' of http://git.dongkesoft.com:9001/hg5020/dk.hg5020.wcf.git

DK.Service/CMNModuleService/PLCWorkLogic..cs

@@ -170,6 +170,11 @@ namespace Dongke.IBOSS.PRD.Service.CMNModuleService
             //写入PLC
             using (SocketClient<SiemensS7_1200Model> plc = new SocketClient<SiemensS7_1200Model>())
             {
+                //测试静态数据 测试成功
+                //plc.Connect(ip, port);
+                //plc.Write<string>("D", "102.2", "2020070101");
+                //plc.Write<short>("D", "102.14", Convert.ToInt16(10));
+
                 //手动写
                 //plc.Connect(ip, port);
                 //plc.Write<string>("D", "102.2", plcPara["barcode"].ToString());

WCF.Service/WCF.Ex_HGS3_QRS/Ex_HGS3_QR.cs

@@ -101,7 +101,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 预干区（入）
                     // TODO
-                    procedureID = 5;
+                    procedureID = 82; //xuwei 2020-07-04 modify
                     switch (road_no)
                     {
                         case 1:
@@ -137,7 +137,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 阴干区（入）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 83; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
 
@@ -146,7 +146,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 烘干区（入）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 86; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
 
@@ -155,7 +155,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 烘干区（出）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 87; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
 
@@ -164,7 +164,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 毛坯库（入）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 91; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
                     if (road_no == 2)
@@ -177,7 +177,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 毛坯库（出）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 92; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
 
@@ -186,7 +186,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 精坯库（入）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 97; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
 
@@ -195,7 +195,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 釉坯库（入）
                     // TODO
-                    procedureID = 100;
+                    procedureID = 100; //xuwei 2020-07-04 modify
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";
 
@@ -204,7 +204,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 {
                     // 光瓷库（入）
                     // TODO
-                    procedureID = 0;
+                    procedureID = 106; //xuwei 2020-07-04 modify 成瓷库
                     sUserInfo.UserID = 4;
                     sUserInfo.UserCode = "SC35_4";