baocun

APPQ5/QMAPP.FJC.Web/Controllers/DictController.cs

@@ -1175,7 +1175,13 @@ namespace QMAPP.FJC.Web.Controllers
         public ActionResult GetMachineList(string workcentercode)
         {
             QMAPP.FJC.Entity.Basic.MachineInfo info = new Entity.Basic.MachineInfo();
-            info.WORKCENTER_CODE = workcentercode.Replace("PA","");
+            if (workcentercode == "VW371PA_FOAMAREA")
+            {
+                info.WORKCENTER_CODE = "VW371_FOAMAREA";
+            }
+            else
+                info.WORKCENTER_CODE = workcentercode;
+
             List<QMAPP.FJC.Entity.Basic.MachineInfo> list = new List<QMAPP.FJC.Entity.Basic.MachineInfo>();
             ServiceAgent wcfAgent = this.GetServiceAgent();
             try
@@ -1186,7 +1192,7 @@ namespace QMAPP.FJC.Web.Controllers
                     ("MachineInfoBLL_GetMachineInfoList", info);
                 foreach (QMAPP.FJC.Entity.Basic.MachineInfo item in dataResult)
                 {
-                    if (workcentercode.Contains("PA"))
+                    if (workcentercode == "VW371PA_FOAMAREA")
                     {
                         if (item.MACHINECODDE.Contains("PA"))
                         {
@@ -1194,7 +1200,7 @@ namespace QMAPP.FJC.Web.Controllers
                             list.Add(item);
                         }
                     }
-                    else
+                    else if (workcentercode == "VW371_FOAMAREA")
                     {
                         if (!item.MACHINECODDE.Contains("PA"))
                         {
@@ -1202,6 +1208,11 @@ namespace QMAPP.FJC.Web.Controllers
                             list.Add(item);
                         }
                     }
+                    else
+                    {
+                        item.MACHINENAME = item.MACHINECODDE + "/" + item.MACHINENAME;
+                        list.Add(item);
+                    }
                 }
                 //}
                 list.Insert(0, new QMAPP.FJC.Entity.Basic.MachineInfo() { MACHINECODDE = "", MACHINENAME = this.EmptyItemTitle });