fix

WCS_Client/Frm/MBtn_Task/FrmWCS_Task.cs

@@ -26,6 +26,7 @@ namespace WCS_Client.Frm
             {
                 SuperGridUtil.Get_GridColumn("ID", "任务ID号", 80),
                 SuperGridUtil.Get_GridColumn("WMSTASK", "WMS任务号", 80),
+                SuperGridUtil.Get_GridColumn("TaskGroupKey", "任务组编号", 140),
                 SuperGridUtil.Get_GridColumn("task_comtypech", "任务类型", 80),
                 SuperGridUtil.Get_GridColumn("task_wkstatusch", "任务状态", 100),
                 SuperGridUtil.Get_GridColumn("BARCODE", "条码", 160),
@@ -37,9 +38,7 @@ namespace WCS_Client.Frm
                 SuperGridUtil.Get_GridColumn("DEVICE", "堆垛机编号", 80),
                 SuperGridUtil.Get_GridColumn("TUNNEL", "巷道", 70),
                 SuperGridUtil.Get_GridColumn("Priority", "优先级", 60),
-                SuperGridUtil.Get_GridColumn("PALLETTYPE", "托盘类型", 80),
                 //SuperGridUtil.Get_GridColumn("TASK_RGVNO", "RGV编号", 70),
-                SuperGridUtil.Get_GridColumn("GROUPTASK", "分组编号", 80),
                 SuperGridUtil.Get_GridColumn("AgvTask", "AGV任务号", 100),
                 SuperGridUtil.Get_GridColumn("TASK_ADDUSERNO", "创建用户", 100),
                 SuperGridUtil.Get_Datetime_GridColumn("CREATETIME", "创建时间", 130),
@@ -49,6 +48,7 @@ namespace WCS_Client.Frm
                 SuperGridUtil.Get_Datetime_GridColumn("UPDATETIME", "修改时间", 130),
                 SuperGridUtil.Get_GridColumn("PRODLINE", "产线", 100),
                 SuperGridUtil.Get_GridColumn("SRMSTATION", "站台号", 100),
+
                // SuperGridUtil.Get_GridColumn("SonTrayColorNo", "子托盘颜色", 100),
                // SuperGridUtil.Get_GridColumn("TASK_WEIGHT", "箱子重量", 100),
                //SuperGridUtil.Get_GridColumn("TASK_STACKINGTYPE", "垛型", 100)
@@ -57,34 +57,37 @@ namespace WCS_Client.Frm
             };
             List<LayoutControlItem> LCIList = new List<LayoutControlItem>();
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("ID", "WCS任务号:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("ID", "WCS任务号:", 10, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.ID like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("WMSTASK", "WMS任务号:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("WMSTASK", "WMS任务号:", 10, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "WMSTASK like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("BARCODE", "条码:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("TaskGroupKey", "任务组编号:", 15, SubmitMethods, null));
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "TaskGroupKey like '%{0}%'" };
+
+            LCIList.Add(LCItemUtil.Add_TextboxX("BARCODE", "条码:", 15, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "BARCODE like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRFROM", "起始地址:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRFROM", "起始地址:", 10, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRFROM like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRCURRENT", "当前地址:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRCURRENT", "当前地址:", 10, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRCURRENT like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRNEXT", "下个地址:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRNEXT", "下个地址:", 10, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRNEXT like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRTO", "目的地址:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("ADDRTO", "目的地址:", 10, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRTO like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("Position", "目标产线:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("Position", "目标产线:", 12, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Position like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("DEVICE", "堆垛机编号:", 20, SubmitMethods, null));
+            LCIList.Add(LCItemUtil.Add_TextboxX("DEVICE", "堆垛机编号:", 15, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "DEVICE like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_ComboBoxEx("TYPE", "任务类型:", 20, null, SubmitMethods));
+            LCIList.Add(LCItemUtil.Add_ComboBoxEx("TYPE", "任务类型:", 15, null, SubmitMethods));
             TryCachHelper.TryExecute((db) =>
             {
                 var dtsex = db.Queryable<WCS_MAPPINGENTRY>().Where(v => v.MEP_MAPPINGTYPE == "TYPE").ToList();
@@ -103,7 +106,7 @@ namespace WCS_Client.Frm
                 LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.TYPE like '%{0}%'" };
             });
 
-            LCIList.Add(LCItemUtil.Add_ComboBoxEx("ZONE", "区域:", 20, null, SubmitMethods));
+            LCIList.Add(LCItemUtil.Add_ComboBoxEx("ZONE", "区域:", 15, null, SubmitMethods));
             TryCachHelper.TryExecute((db) =>
             {
                 var dtsex = db.Queryable<WCS_MAPPINGENTRY>().Where(v => v.MEP_MAPPINGTYPE == "ZONE").ToList();
@@ -114,15 +117,35 @@ namespace WCS_Client.Frm
                 for (int i = 0; i < dtsex.Count; i++)
                 {
                     dr = dt.NewRow();
-                    dr["MEP_MAPPINGNO"] = dtsex[i].MEP_MAPPINGNO;
+                    switch (dtsex[i].MEP_MAPPINGNO)
+                    {
+                        case 1:
+                            dr["MEP_MAPPINGNO"] = ".ADDRTO IN ('G1561','G1538','G1574','G1509')";
+                            break;
+                        case 2:
+                            dr["MEP_MAPPINGNO"] = ".ADDRFROM IN ('1157','1158')";
+                            break;
+                        case 3:
+                            dr["MEP_MAPPINGNO"] = ".ADDRFROM IN ('3052','3053','3005','3004')";
+                            break;
+                        case 4:
+                            dr["MEP_MAPPINGNO"] = ".ADDRFROM IN ('1028','1029')";
+                            break;
+                        case 5:
+                            dr["MEP_MAPPINGNO"] = ".ADDRFROM IN ('1386','1387','1435','1436')";
+                            break;
+                        case 6:
+                            dr["MEP_MAPPINGNO"] = ".ADDRTO IN ('G1340')";
+                            break;
+                    }
                     dr["MEP_MAPPINGCHNAME"] = dtsex[i].MEP_MAPPINGCHNAME;
                     dt.Rows.Add(dr);
                 }
                 LCItemUtil.Refresh_LCItem(LCIList[LCIList.Count - 1], dt, "MEP_MAPPINGNO", "MEP_MAPPINGCHNAME");
-                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.TYPE like '%{0}%'" };
+                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t {0}" };
             });
 
-            LCIList.Add(LCItemUtil.Add_ComboBoxEx("STATUS", "任务状态:", 20, null, SubmitMethods));
+            LCIList.Add(LCItemUtil.Add_ComboBoxEx("STATUS", "任务状态:", 15, null, SubmitMethods));
             TryCachHelper.TryExecute((db) =>
             {
                 var dtsex = db.Queryable<WCS_MAPPINGENTRY>().Where(v => v.MEP_MAPPINGTYPE == "STATUS").ToList();
@@ -144,7 +167,7 @@ namespace WCS_Client.Frm
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", "查询", 100, 30, SubmitMethods));
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QClear", "重置", 100, 30, SubmitMethods));
             //if (CurrentHelper.User.Use_RoleId == 1)
-            if(CurrentHelper.User.Use_Name == "超级管理员")
+            if (CurrentHelper.User.Use_Name == "超级管理员")
             {
                 LCIList.Add(LCItemUtil.Add_ButtonX("btn_FinishTask", "手动完成任务", 100, 30, SubmitMethods));
                 LCIList.Add(LCItemUtil.Add_ButtonX("btn_ClearTask", "取消任务", 100, 30, SubmitMethods));
@@ -170,7 +193,7 @@ namespace WCS_Client.Frm
         //获取数据集
         private PageData QueryPageDataMethods(int PageIndex, int PageSize)
         {
-            string _SQLText = @"select t.*,m.MEP_MAPPINGCHNAME task_comtypech,me.MEP_MAPPINGCHNAME task_wkstatusch,Position from dbo.WCS_TASK t
+            string _SQLText = @"select t.*,m.MEP_MAPPINGCHNAME task_comtypech,me.MEP_MAPPINGCHNAME task_wkstatusch,REPLACE(Position, 'Opp_205_', '') AS Position from dbo.WCS_TASK t
 left join WCS_MAPPINGENTRY m on t.TYPE = m.MEP_MAPPINGNO and m.MEP_MAPPINGTYPE = 'TYPE'
 left join WCS_MAPPINGENTRY me on t.STATUS = me.MEP_MAPPINGNO and me.MEP_MAPPINGTYPE = 'STATUS' 
 left join WCS_AGVTask  agv on agv.ID=t.AgvTask