fix

WCS.PLC/BaseWorkflow.cs

@@ -968,9 +968,9 @@ namespace WCS.PLC
         /// </summary>
         /// <param name="param"></param>
         /// <returns></returns>
-        public static bool GetMatureContinueMode(GetMatureContinueParam param, string convNo, WCS_PLC plc, int judge)
+        public static bool GetMatureContinueMode(GetMatureContinueParam param)
         {
-            bool result = true;
+            bool result = false;
             try
             {
                 var reply = Current.WmsInterface.I_WCS_GetMatureContinueMode(param);
@@ -981,23 +981,24 @@ namespace WCS.PLC
                 }
                 else
                 {
-                    var conveyor = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == convNo);
-                    var cs = conveyor.EquSignal_Conv;
+                    #region tion
+                    //var converywrite = new WCSWriteToConveyorSignal();
+                    //converywrite.Plc = plc.Plc;
+                    //converywrite.DBName = plc.WriteDBName;
+                    //converywrite.ConveyorNo = convNo;
+                    //converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+                    //if (judge == 1)//写入开始确认信号
+                    //{
+                    //    converywrite.Confirm = true;
+                    //}
+                    //else if (judge == 2)//写入结束确认信号
+                    //{
+                    //    converywrite.TaskDelete = true;
+                    //}
 
-                    var converywrite = new WCSWriteToConveyorSignal();
-                    converywrite.Plc = plc.Plc;
-                    converywrite.DBName = plc.WriteDBName;
-                    converywrite.ConveyorNo = convNo;
-                    converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
-                    if (judge == 1)//写入开始确认信号
-                    {
-                        converywrite.Confirm = true;
-                    }
-                    else if (judge == 2)//写入结束确认信号
-                    {
-                        converywrite.TaskDelete = true;
-                    }
-                    WriteTaskToBuffer(converywrite);
+                    //WriteTaskToBuffer(converywrite);
+                    #endregion
+                    result = true;
                 }
             }
             catch (Exception ex)

WCS.Service/appsettings.json

@@ -49,6 +49,8 @@
     "PutDevInfo": "http://192.168.249.101:8006/api/Task/I_WCS_PutDevInfo",
     //重量上传
     "GetWeight": "http://192.168.249.101:8006/api/Task/I_WCS_GetWeight",
+    //上传连续熟化开始结束时间
+    "GetMatureContinueMode": "http://192.168.249.101:8006/api/Task/I_WCS_GetMatureContinueMode",
     //入库位置是否补空料箱
     "IsOutEmptyBox": false,
     "TaskStatusUpdateConNoStr": "1133,1140,1142,1215,1216,1217,1218,1199,1168,1169,1170,1171",

WCS.Workflow/ConvPlc04.cs

@@ -50,6 +50,7 @@ namespace WCS.Workflow
             WCSWorkflow.RefreshData();
             //上传熟化开始结束时间信息
             ThreadHelper.TaskThread(MatureSignalGet);
+            //MatureSignalGet();
             //更新熟化连续模式
             ThreadHelper.TaskThread(UploadMatureMode);
             //堆垛机出口执行
@@ -165,7 +166,18 @@ namespace WCS.Workflow
                                 MatureEndTime = null,
                                 MatureFrameNum = num
                             };
-                            BaseWorkflow.GetMatureContinueMode(param, item, plc, 1);
+                            //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 = item;
+                                converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+
+                                converywrite.Confirm = true;
+                                WriteTaskToBuffer(converywrite);
+                            }
                         }
                         if (cs.DB521_L_Outside && !cs.DB520_TaskDelete)////结束熟化标志  DB520_TaskDelete 结束确认标志
                         {
@@ -178,7 +190,18 @@ namespace WCS.Workflow
                                 MatureEndTime = DateTime.Now,
                                 MatureFrameNum = num
                             };
-                            BaseWorkflow.GetMatureContinueMode(param, item, plc, 2);
+                            //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 = item;
+                                converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+
+                                converywrite.TaskDelete = true;
+                                WriteTaskToBuffer(converywrite);
+                            }
                         }
                     }
                 }
@@ -192,6 +215,88 @@ namespace WCS.Workflow
                 }
             }
         }
+        //private void MatureSignalGet()
+        //{           
+        //        try
+        //        {
+        //            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);
+        //                var conveyor = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == item);
+        //                var cs = conveyor.EquSignal_Conv;
+        //                // 开始与结束信号已被PLC复位，同时开始与结束确认信号为置位状态，开始复位确认信号
+        //                if (!cs.DB521_B_Outside && !cs.DB521_L_Outside && cs.DB520_Confirm && cs.DB520_TaskDelete)
+        //                {
+        //                    var converywrite = new WCSWriteToConveyorSignal();
+        //                    converywrite.Plc = plc.Plc;
+        //                    converywrite.DBName = plc.WriteDBName;
+        //                    converywrite.ConveyorNo = item;
+        //                    converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+        //                    converywrite.Confirm = false;
+        //                    converywrite.TaskDelete = false;
+        //                    WriteTaskToBuffer(converywrite);
+        //                }
+        //                string matureNo = item == "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;//熟化架数量
+        //                if (cs.DB521_B_Outside && !cs.DB520_Confirm)//开始熟化标志    DB520_Confirm  开始确认标志
+        //                {
+        //                    //调用上传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 = item;
+        //                        converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+
+        //                        converywrite.Confirm = true;
+        //                        WriteTaskToBuffer(converywrite);
+        //                    }
+        //                }
+        //                if (cs.DB521_L_Outside && !cs.DB520_TaskDelete)////结束熟化标志  DB520_TaskDelete 结束确认标志
+        //                {
+        //                    //调用上传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 = item;
+        //                        converywrite.WriteStartAddress = cs.EquDbInfo_ReadWrite.DBReadIndox;
+
+        //                        converywrite.TaskDelete = true;
+        //                        WriteTaskToBuffer(converywrite);
+        //                    }
+        //                }
+        //            }
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            LogMessageHelper.RecordLogMessage(ex);
+        //        }               
+            
+        //}
 
         private static int _uploadMode = 0;
 
@@ -211,7 +316,7 @@ namespace WCS.Workflow
                         string matureNo = item == "1164" ? "A" : "B";
                         var value = s + matureNo;
                         //获取连续模式值
-                        var plcValue = cs.DB521_F_Outside.ToString();
+                        var plcValue = cs.DB521_F_Outside ? "1" : "0";
                         var sysset = SugarBase.DB.Queryable<WCS_SYSSET>().Where(v => v.SET_ID == value).First();
                         if (sysset != null)
                         {