合并，接口优化等

wangxinhui

昨天 57148c2264abe80bd3b472f2980104d90dad5c61

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs

@@ -64,13 +64,13 @@
                    int heightType = 0;
                    if(needRelocationItem.Layer == 5)
                    {
                        heightType = 3;
                    }
                    else if(needRelocationItem.Layer == 4)
                    {
                        heightType = 2;
                    }
                    else if(needRelocationItem.Layer <= 3 && needRelocationItem.Layer >= 1)
                    //else if(needRelocationItem.Layer == 4)
                    //{
                    //    heightType = 2;
                    //}
                    else if(needRelocationItem.Layer <= 4 && needRelocationItem.Layer >= 1)
                    {
                        heightType = 1;
                    }
@@ -94,15 +94,7 @@
                            TaskStatus = 0,
                            TaskType = TaskTypeEnum.Relocation.ObjToInt()
                        };
                        string MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                        float Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                        string BatchNo = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                        if (MaterielCode != null && Quantity != null && BatchNo != null)
                        {
                            newTask.MaterielCode = MaterielCode;
                            newTask.Quantity = Quantity;
                            newTask.BatchNo = BatchNo;
                        }
                        
                        if (stockInfo.StockLength>0)
                        {
                            newTask.TaskLength = stockInfo.StockLength;