2
schangxiang@126.com
2024-08-26 a0d2f70a2578ad8160bf4c9b983bf6b40c0f4f77
2
已修改1个文件
27 ■■■■ 文件已修改
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1020,14 +1020,25 @@
                            if (loginfo.WorkingProcedure.Equals("OP10"))
                            {
                                //修复 错误记录成OP05的问题 【Editby shaocx,2024-08-26】
                                /*
                                cur_db_info.WorkPieceCurrentPosition = cur_db_info.WorkingProcedureCurrent + "SPC";
                                loginfo2.WorkingProcedure = cur_db_info.WorkingProcedureCurrent;//解决OP10,OP40同一个的问题
                                loginfo.WorkingProcedure = cur_db_info.WorkingProcedureCurrent; //解决OP10,OP40同一个的问题
                                //*/
                                cur_db_info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
                                cur_db_info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "SPC";
                                loginfo2.WorkingProcedure = loginfo.WorkingProcedure = loginfo.WorkingProcedure;
                                var set_WorkingProcedureCurrent = "";
                                if (cur_db_info.WorkingProcedureCurrent != "OP10" && cur_db_info.WorkingProcedureCurrent != "OP40")
                                {
                                    if (cur_db_info.WorkingProcedureCurrent == "OP05")
                                    {
                                        set_WorkingProcedureCurrent = "OP10";
                                    }
                                    else if (cur_db_info.WorkingProcedureCurrent == "OP35")
                                    {
                                        set_WorkingProcedureCurrent = "OP40";
                                    }
                                }
                                else
                                {
                                    set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
                                }
                                cur_db_info.WorkPieceCurrentPosition = set_WorkingProcedureCurrent + "SPC";
                                loginfo2.WorkingProcedure = set_WorkingProcedureCurrent;//解决OP10,OP40同一个的问题
                                loginfo.WorkingProcedure = set_WorkingProcedureCurrent; //解决OP10,OP40同一个的问题
                            }
                            else
                            {