Bläddra i källkod

加入清理完成标志

yc_t 6 år sedan
förälder
incheckning
701ef42db1

+ 1 - 1
PLCLinker/centralController/App.config

@@ -19,7 +19,7 @@
     <add key="filterRatio" value="0.7"/>
     <!--PLC基本配置-->
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
-    <add key="plcIpAddress" value="192.168.10.60" />
+    <add key="plcIpAddress" value="192.168.0.1" />
     <add key="plcRack" value="0" />
     <add key="plcSlot" value="1" />
     <!--PLCdb块,分别对应终端、中控、车位-->

+ 1 - 0
PLCLinker/centralController/Monitor/SystemInitializer.cs

@@ -213,6 +213,7 @@ namespace Monitor
                             mbs.licenseReceived = (short)-1;
                             mbs.bookParkCmd = (short)-1;
                             mbs.bookFetchCmd = (short)-1;
+                            mbs.processCompleted = (short)-1;
                             Monitor.PLC.WriteToPLC(mbs, PLCDataType.central);
                         }
                         Thread.Sleep(500);

+ 20 - 0
PLCLinker/centralController/Terminal/Terminal.cs

@@ -485,6 +485,7 @@ namespace Terminal
                                 centralHearbeat = (short)-1,
                                 bookParkCmd = -1,
                                 bookFetchCmd = -1,
+                                processCompleted = (short)-1,
                                 licenseReceived = (short)2
                             };
                             Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
@@ -541,6 +542,7 @@ namespace Terminal
                                 centralHearbeat = -1,
                                 bookFetchCmd = -1,
                                 bookParkCmd = -1,
+                                processCompleted = (short)-1,
                                 licenseReceived = (short)numReceivedStatus
                             };
                             Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
@@ -657,6 +659,15 @@ namespace Terminal
                     //}
                     //中控清除车牌、凭证号、号牌验证等信息
                     ClearTerminal(term.terminalID);
+                    MainBlockStru mb = new MainBlockStru
+                    {
+                        centralHearbeat = (short)-1,
+                        bookParkCmd = -1,
+                        bookFetchCmd = -1,
+                        processCompleted = (short)0,
+                        licenseReceived = (short)-1
+                    };
+                    Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
                     try { idLicMap.Remove(currentTerm); }
                     catch { }
                     Monitor.Monitor.SetNotification(license + " 数据库已更新,停车流程结束", parkMonitor.model.TextColor.Info);
@@ -1229,6 +1240,15 @@ namespace Terminal
                                     FetchInfo fi = null;
                                     UpdateAllParkingSpace(false);
                                     ClearTerminal(terminalInfo[termIndex].terminalID);
+                                    MainBlockStru mb = new MainBlockStru
+                                    {
+                                        centralHearbeat = (short)-1,
+                                        bookParkCmd = -1,
+                                        bookFetchCmd = -1,
+                                        processCompleted = (short)0,
+                                        licenseReceived = (short)-1
+                                    };
+                                    Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
                                     if (fetchInfoMap.ContainsKey(terminalInfo[termIndex].terminalID))
                                     {
                                         fi = fetchInfoMap[terminalInfo[termIndex].terminalID];

+ 2 - 0
PLCLinker/centralController/WebServer/WebServer.cs

@@ -351,6 +351,7 @@ namespace centralController.WebServer
                             centralHearbeat = -1,
                             bookParkCmd = parking ? (short)0 : (short)-1,
                             bookFetchCmd = !parking ? (short)0 : (short)-1,
+                            processCompleted = (short)-1,
                             licenseReceived = -1
                         };
                         Monitor.Monitor.PLC.WriteToPLC(mbs, PLCDataType.central);
@@ -363,6 +364,7 @@ namespace centralController.WebServer
                     centralHearbeat = -1,
                     bookParkCmd = parking ? (short)state : (short)-1,
                     bookFetchCmd = !parking ? (short)state : (short)-1,
+                    processCompleted = (short)-1,
                     licenseReceived = -1
                 };
                 Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);

BIN
PLCLinker/centralController/sdk/PLC/PLCS7.dll