agv任务状态显示优化

WCS_Client/Frm/MBtn_AgvTask/MBtn_AgvTask.cs

@@ -110,7 +110,7 @@ namespace WCS_Client.Frm
             string _SQLText = @"SELECT a.*,b.MEP_MAPPINGCHNAME AgvTaskTypeCh,c.MEP_MAPPINGCHNAME StatusCh,d.MEP_MAPPINGCHNAME AgvStatusCh  FROM dbo.WCS_AGVTask a
                                 left join dbo.WCS_MAPPINGENTRY b on a.TaskType=b.MEP_MAPPINGNO and b.MEP_MAPPINGTYPE='TaskType'
                                 left join dbo.WCS_MAPPINGENTRY c on a.Status=c.MEP_MAPPINGNO and c.MEP_MAPPINGTYPE='AGVStatus'
-                                left join dbo.WCS_MAPPINGENTRY d on a.AGVStatus=d.MEP_MAPPINGNO and d.MEP_MAPPINGTYPE='AGVStatus' Where 1=1 and Status < 99 ";
+                                left join dbo.WCS_MAPPINGENTRY d on a.AGVStatus=d.MEP_MAPPINGNO and d.MEP_MAPPINGTYPE='AGVStatus' Where 1=1 and Status < 100 ";
             string _Orderby = "a.CreateTime desc";
 
             PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, PageSize);
@@ -206,8 +206,8 @@ namespace WCS_Client.Frm
                     string msg = TryCachHelper.TryExecute((db) =>
                     {
                         var agvtask = db.Queryable<WCS_AGVTask>().First(v => v.ID == id);
-                        agvtask.Status = AGVTaskStatus.完成;
-                        agvtask.AGVStatus = AGVTaskStatus.完成;
+                        agvtask.Status = AGVTaskStatus.完成扫码;
+                        agvtask.AGVStatus = AGVTaskStatus.完成扫码;
                         agvtask.UpdateTime = DateTime.Now;
                         db.Updateable(agvtask).UpdateColumns(it => new { it.Status, it.AGVStatus, it.UpdateTime }).ExecuteCommand();
                     });

WCS_Client/Frm/MBtn_AgvTask_Dis/MBtn_AgvTask_Dis.cs

@@ -112,7 +112,7 @@ namespace WCS_Client.Frm.MBtn_AgvTaskDis
             string _SQLText = @"SELECT a.*,b.MEP_MAPPINGCHNAME AgvTaskTypeCh,c.MEP_MAPPINGCHNAME StatusCh,d.MEP_MAPPINGCHNAME AgvStatusCh  FROM dbo.WCS_AGVTask a 
                                 left join dbo.WCS_MAPPINGENTRY b on a.TaskType=b.MEP_MAPPINGNO and b.MEP_MAPPINGTYPE='TaskType' 
                                 left join dbo.WCS_MAPPINGENTRY c on a.Status=c.MEP_MAPPINGNO and c.MEP_MAPPINGTYPE='AGVStatus' 
-                                left join dbo.WCS_MAPPINGENTRY d on a.AGVStatus=d.MEP_MAPPINGNO and d.MEP_MAPPINGTYPE='AGVStatus' Where 1=1 and Status >= 99";
+                                left join dbo.WCS_MAPPINGENTRY d on a.AGVStatus=d.MEP_MAPPINGNO and d.MEP_MAPPINGTYPE='AGVStatus' Where 1=1 and Status >= 100";
             string _Orderby = "a.CreateTime desc";
 
             PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, PageSize);