fix

WCS.Workflow/ConvPlc04.cs

@@ -135,7 +135,7 @@ namespace WCS.Workflow
             {
                 try
                 {
-                    List<string> list = new List<string>() { Conv_1164,  Conv_1165 };
+                    List<string> list = new List<string>() { Conv_1164, Conv_1165 };
                     foreach (var item in list)//1164、1165
                     {
                         var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == PlcName);
@@ -178,7 +178,7 @@ namespace WCS.Workflow
                                 converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
 
                                 converywrite.Confirm = true;
-                                WriteTaskToBuffer(converywrite,true);
+                                WriteTaskToBuffer(converywrite, true);
                             }
                         }
                         if (cs.DB521_L_Outside && !cs.DB520_TaskDelete)////结束熟化标志  DB520_TaskDelete 结束确认标志
@@ -217,8 +217,9 @@ namespace WCS.Workflow
                 }
             }
         }
+
         //private void MatureSignalGet()
-        //{           
+        //{
         //        try
         //        {
         //            List<string> list = new List<string>() { Conv_1164, Conv_1165 };
@@ -296,8 +297,8 @@ namespace WCS.Workflow
         //        catch (Exception ex)
         //        {
         //            LogMessageHelper.RecordLogMessage(ex);
-        //        }               
-            
+        //        }
+
         //}
 
         private static int _uploadMode = 0;
@@ -720,17 +721,20 @@ namespace WCS.Workflow
                 try
                 {
                     Thread.Sleep(60000);
-                    //if ((DateTime.Now.Hour == 8 && DateTime.Now.Minute >= 30) || (DateTime.Now.Hour > 8 && DateTime.Now.Hour < 14))
-                    //{
                     if (Current.SysSets.FirstOrDefault(v => v.SET_ID == Conv_1508).SET_VALUE == "0")
                     {
+                        //1164 f outside
+                        var conv_1164 = ConveyorHelper.GetConveyorSignal(PlcName, "1164");
+                        if (conv_1164.DB521_F_Outside) return;
                         ReqestInByMatureRoomItem(Conv_1508, Conv_1136);
                     }
                     if (Current.SysSets.FirstOrDefault(v => v.SET_ID == Conv_1509).SET_VALUE == "0")
                     {
+                        //1165 f outside
+                        var conv_1165 = ConveyorHelper.GetConveyorSignal(PlcName, "1165");
+                        if (conv_1165.DB521_F_Outside) return;
                         ReqestInByMatureRoomItem(Conv_1509, Conv_1138);
                     }
-                    //}
                 }
                 catch (Exception ex)
                 {
@@ -790,15 +794,15 @@ namespace WCS.Workflow
         private void UploadMatureTimeInfo(string conNo)
         {
             try
-            {        
-                    var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == PlcName);
-                    var conveyor = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == conNo);
-                    var cs = conveyor.EquSignal_Conv;
-                    // 开始与结束信号已被PLC复位，同时开始与结束确认信号为置位状态，开始复位确认信号
-                    if(!cs.DB521_B_Outside && !cs.DB521_L_Outside)
+            {
+                var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == PlcName);
+                var conveyor = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == conNo);
+                var cs = conveyor.EquSignal_Conv;
+                // 开始与结束信号已被PLC复位，同时开始与结束确认信号为置位状态，开始复位确认信号
+                if (!cs.DB521_B_Outside && !cs.DB521_L_Outside)
+                {
+                    if (cs.DB520_Confirm || cs.DB520_TaskDelete)
                     {
-                        if (cs.DB520_Confirm || cs.DB520_TaskDelete)
-                        {
                         var converywrite = new WCSWriteToConveyorSignal();
                         converywrite.Plc = plc.Plc;
                         converywrite.DBName = plc.WriteDBName;
@@ -808,67 +812,67 @@ namespace WCS.Workflow
                         converywrite.TaskDelete = false;
                         WriteTaskToBuffer(converywrite, true);
                         return;
-                        }
-                    }                 
-                    string matureNo = conNo == "1164" ? "A" : "B";
-                    if (!cs.DB521_B_Outside && !cs.DB521_L_Outside) return;
-                    int isContinueMode = cs.DB521_F_Outside == true ? 1 : 0;//是否连续熟化模式
-                    int num = cs.DB521_Goodstype;//熟化架数量
-                    //开始熟化信号true，开始确认信号、结束熟化信号false，此时上传开始熟化信息
-                    if (cs.DB521_B_Outside && !cs.DB520_Confirm && !cs.DB521_L_Outside)//开始熟化标志    DB520_Confirm  开始确认标志
+                    }
+                }
+                string matureNo = conNo == "1164" ? "A" : "B";
+                if (!cs.DB521_B_Outside && !cs.DB521_L_Outside) return;
+                int isContinueMode = cs.DB521_F_Outside == true ? 1 : 0;//是否连续熟化模式
+                int num = cs.DB521_Goodstype;//熟化架数量
+                                             //开始熟化信号true，开始确认信号、结束熟化信号false，此时上传开始熟化信息
+                if (cs.DB521_B_Outside && !cs.DB520_Confirm && !cs.DB521_L_Outside)//开始熟化标志    DB520_Confirm  开始确认标志
+                {
+                    //调用上传WMS的接口上传熟化房信息
+                    var param = new GetMatureContinueParam
                     {
-                        //调用上传WMS的接口上传熟化房信息
-                        var param = new GetMatureContinueParam
-                        {
-                            MatureRoomNo = matureNo,
-                            IsContinueMode = isContinueMode,
-                            MatureStartTime = DateTime.Now,
-                            MatureEndTime = null,
-                            MatureFrameNum = num
-                        };
-                        //BaseWorkflow.GetMatureContinueMode(param, cs, plc, 1, item);
-                        if (BaseWorkflow.GetMatureContinueMode(param))
-                        {
-                            var converywrite = new WCSWriteToConveyorSignal();
-                            converywrite.Plc = plc.Plc;
-                            converywrite.DBName = plc.WriteDBName;
-                            converywrite.ConveyorNo = conNo;
-                            converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+                        MatureRoomNo = matureNo,
+                        IsContinueMode = isContinueMode,
+                        MatureStartTime = DateTime.Now,
+                        MatureEndTime = null,
+                        MatureFrameNum = num
+                    };
+                    //BaseWorkflow.GetMatureContinueMode(param, cs, plc, 1, item);
+                    if (BaseWorkflow.GetMatureContinueMode(param))
+                    {
+                        var converywrite = new WCSWriteToConveyorSignal();
+                        converywrite.Plc = plc.Plc;
+                        converywrite.DBName = plc.WriteDBName;
+                        converywrite.ConveyorNo = conNo;
+                        converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
 
-                            converywrite.Confirm = true;
-                            WriteTaskToBuffer(converywrite, true);
-                        }
+                        converywrite.Confirm = true;
+                        WriteTaskToBuffer(converywrite, true);
                     }
-                    //开始、结束熟化信号为true，结束熟化确认信号false，此时上传结束熟化信息
-                    else if (cs.DB521_L_Outside && !cs.DB520_TaskDelete && cs.DB521_B_Outside)////结束熟化标志  DB520_TaskDelete 结束确认标志
+                }
+                //开始、结束熟化信号为true，结束熟化确认信号false，此时上传结束熟化信息
+                else if (cs.DB521_L_Outside && !cs.DB520_TaskDelete && cs.DB521_B_Outside)////结束熟化标志  DB520_TaskDelete 结束确认标志
+                {
+                    //调用上传WMS的接口上传熟化房信息
+                    var param = new GetMatureContinueParam
                     {
-                        //调用上传WMS的接口上传熟化房信息
-                        var param = new GetMatureContinueParam
-                        {
-                            MatureRoomNo = matureNo,
-                            IsContinueMode = isContinueMode,
-                            MatureStartTime = null,
-                            MatureEndTime = DateTime.Now,
-                            MatureFrameNum = num
-                        };
-                        //BaseWorkflow.GetMatureContinueMode(param, cs, plc, 2, item);
-                        if (BaseWorkflow.GetMatureContinueMode(param))
-                        {
-                            var converywrite = new WCSWriteToConveyorSignal();
-                            converywrite.Plc = plc.Plc;
-                            converywrite.DBName = plc.WriteDBName;
-                            converywrite.ConveyorNo = conNo;
-                            converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+                        MatureRoomNo = matureNo,
+                        IsContinueMode = isContinueMode,
+                        MatureStartTime = null,
+                        MatureEndTime = DateTime.Now,
+                        MatureFrameNum = num
+                    };
+                    //BaseWorkflow.GetMatureContinueMode(param, cs, plc, 2, item);
+                    if (BaseWorkflow.GetMatureContinueMode(param))
+                    {
+                        var converywrite = new WCSWriteToConveyorSignal();
+                        converywrite.Plc = plc.Plc;
+                        converywrite.DBName = plc.WriteDBName;
+                        converywrite.ConveyorNo = conNo;
+                        converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
 
-                            converywrite.TaskDelete = true;
-                            WriteTaskToBuffer(converywrite);
-                        }
-                    }        
+                        converywrite.TaskDelete = true;
+                        WriteTaskToBuffer(converywrite);
+                    }
+                }
             }
             catch (Exception ex)
             {
                 LogMessageHelper.RecordLogMessage(ex);
-            }         
+            }
         }
 
         private void RequestInByMatureConv(string convNo, string matureRoomNo)