|
@@ -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
|
|
|
{
|