合并，接口优化等

wangxinhui

2 天以前 57148c2264abe80bd3b472f2980104d90dad5c61

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

@@ -64,18 +64,18 @@
                    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;
                    }

                    Dt_LocationInfo? newLocation = _basicService.LocationInfoService.AssignLocation(needRelocationItem.RoadwayNo, task.PalletType, task.WarehouseId, needRelocationItem.LocationCode, heightType);
                    Dt_LocationInfo? newLocation = _basicService.LocationInfoService.AssignLocation(needRelocationItem.RoadwayNo, stockInfo.PalletType, task.WarehouseId, needRelocationItem.LocationCode, heightType);
                    if (newLocation != null)
                    {
                        Dt_Task newTask = new Dt_Task()
@@ -94,6 +94,7 @@
                            TaskStatus = 0,
                            TaskType = TaskTypeEnum.Relocation.ObjToInt()
                        };
                        
                        if (stockInfo.StockLength>0)
                        {
                            newTask.TaskLength = stockInfo.StockLength;