Zhang-Hong-Lin
昨天 ac2920c6c36227646c03a38c76a335120b449817
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -305,13 +305,12 @@
                //}
                if (workTpe.Equals("In"))
                {
                    //OrderByDescending(闄嶅簭鎺掑簭)
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu || v.TaskType == (int)TaskInboundTypeEnum.Inbound) && v.TaskState == (int)TaskInStatusEnum.InNew).OrderBy(v => v.CreateDate).First();
                    Dt_Task tasks = new Dt_Task();
                    //OrderBy(鍗囧簭鎺掑簭)
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu || v.TaskType == (int)TaskInboundTypeEnum.Inbound) && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).First();
                }
                else if (workTpe.Equals("Out"))
                {
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || v.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu || v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || v.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu || v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderByDescending(v => v.Grade).First();
                }
            }
@@ -1033,7 +1032,7 @@
                    stock.LocationCode = nawtask.TargetAddress;
                    stock.StockStatus = (int)stockEnum.Free;
                    stock.BatchNo = batck.InBatch;
                    stock.Remark = 3;
                    stock.Remark = (int)MateTypeEnum.TiChu;
                    //淇敼璐т綅淇℃伅
                    var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
                    location.LocationStatus = (int)LocationStatusEnum.InStock;
@@ -1428,7 +1427,7 @@
                if (oldhtytask == null)
                {
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.Remark = (int)MateTypeEnum.TiChu;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu;
@@ -1484,7 +1483,7 @@
                {
                    task.SourceAddress = wei;
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.Remark = (int)MateTypeEnum.TiChu;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskOutboundTypeEnum.TiChuChuKu;
@@ -1529,7 +1528,7 @@
                {
                    task.TargetAddress = wei;
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.Remark = (int)MateTypeEnum.TiChu;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskInboundTypeEnum.TiChuRuKu;