Преглед на файлове

简化 wareCell 获取逻辑

注释掉 `warehouseCodes` 列表的初始化和使用。
注释掉根据 `mach.WarehouseCode` 填充 `warehouseCodes` 的 `switch` 语句。
新增代码直接从 `wareCellList` 中按 `ProductTime` 排序并获取第一个元素 `wareCell`。
删除原先按 `warehouseCodes` 优先级排序并再按 `ProductTime` 排序获取 `wareCell` 的代码。
林豪 左 преди 1 година
родител
ревизия
047b572016
променени са 1 файла, в които са добавени 24 реда и са изтрити 25 реда
  1. 24 25
      wms.service/Service/FJService.cs

+ 24 - 25
wms.service/Service/FJService.cs

@@ -2744,37 +2744,36 @@ namespace wms.service.Service
                     return res;
                 }
 
-                var warehouseCodes = new List<string>();
-                switch (mach.WarehouseCode)
-                {
-                    case "1N":
-                        warehouseCodes.AddRange(new List<string>() { "1N", "1S", "2N", "2S", "3N", "3S" });
-                        break;
+                //var warehouseCodes = new List<string>();
+                //switch (mach.WarehouseCode)
+                //{
+                //    case "1N":
+                //        warehouseCodes.AddRange(new List<string>() { "1N", "1S", "2N", "2S", "3N", "3S" });
+                //        break;
 
-                    case "1S":
-                        warehouseCodes.AddRange(new List<string>() { "1S", "1N", "2S", "2N", "3S", "3N" });
-                        break;
+                //    case "1S":
+                //        warehouseCodes.AddRange(new List<string>() { "1S", "1N", "2S", "2N", "3S", "3N" });
+                //        break;
 
-                    case "2N":
-                        warehouseCodes.AddRange(new List<string>() { "2N", "2S", "1N", "1S", "3N", "3S" });
-                        break;
+                //    case "2N":
+                //        warehouseCodes.AddRange(new List<string>() { "2N", "2S", "1N", "1S", "3N", "3S" });
+                //        break;
 
-                    case "2S":
-                        warehouseCodes.AddRange(new List<string>() { "2S", "2N", "1S", "1N", "3S", "3N" });
-                        break;
+                //    case "2S":
+                //        warehouseCodes.AddRange(new List<string>() { "2S", "2N", "1S", "1N", "3S", "3N" });
+                //        break;
 
-                    case "3N":
-                        warehouseCodes.AddRange(new List<string>() { "3N", "3S", "2N", "2S", "1N", "1S" });
-                        break;
+                //    case "3N":
+                //        warehouseCodes.AddRange(new List<string>() { "3N", "3S", "2N", "2S", "1N", "1S" });
+                //        break;
 
-                    case "3S":
-                        warehouseCodes.AddRange(new List<string>() { "3S", "3N", "2S", "2N", "1S", "1N" });
-                        break;
-                }
+                //    case "3S":
+                //        warehouseCodes.AddRange(new List<string>() { "3S", "3N", "2S", "2N", "1S", "1N" });
+                //        break;
+                //}
+
+                var wareCell = wareCellList.OrderBy(x => x.ProductTime).FirstOrDefault();//按照优先级排序
 
-                var wareCell = wareCellList.OrderBy(x => warehouseCodes.IndexOf(x.WarehouseCode))//按照优先级排序
-                    .ThenBy(x => x.ProductTime)
-                    .FirstOrDefault();
 
                 try
                 {