改配修改

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs

@@ -184,32 +184,28 @@ namespace DS.WMS.Core.Op.Method
             var task = await tenantDb.Queryable<BusinessTask>().Where(x => x.BusinessId == id && x.TaskType == TaskBaseTypeEnum.WAIT_ORDER_AUDIT).FirstAsync();
             if (task.IsNull())
             { 
-                //return await Task.FromResult(DataResult<string>.Failed("此单未审，可直接编辑调整!"));
                 return await Task.FromResult(DataResult<string>.Success("未审单"));
             }
-            //if (task.IsNotNull() && task.TaskStatus == TaskStatusEnum.Create)
-            //{
-            //    return await Task.FromResult(DataResult<string>.Failed("此单未审，可直接编辑调整!"));
-            //}
-
-            //if (info.ETD.IsNotNull() && info.ETD < DateTime.Now)
-            //{
-            //    return await Task.FromResult(DataResult<string>.Failed("此单已开船，无法改配!"));
-            //}
-            if (task.TaskStatus == TaskStatusEnum.Complete && string.IsNullOrEmpty(info.MBLNO))
+            if (task.TaskStatus == TaskStatusEnum.Complete)
             {  
-                return await Task.FromResult(DataResult<string>.Success("已审未出号"));
-            }
-            else if (!string.IsNullOrEmpty(info.MBLNO) && (info.IsBooking == false && info.IsVGM == false))
-            {
-                return await Task.FromResult(DataResult<string>.Success("已出号未申报"));
-            }
-            else if (info.IsBooking == true || info.IsVGM == true)
-            {
-                return await Task.FromResult(DataResult<string>.Success("已申报"));
+                if (string.IsNullOrEmpty(info.MBLNO))
+                {
+                    return await Task.FromResult(DataResult<string>.Success("已审未出号"));
+                }
+                else
+                {
+                    if (info.IsBooking == true || info.IsVGM == true)
+                    {
+                        return await Task.FromResult(DataResult<string>.Success("已申报"));
+                    }
+                    else
+                    {
+                        return await Task.FromResult(DataResult<string>.Success("已出号未申报"));
+                    }
+                }
+
             }
             else { 
-
                 return await Task.FromResult(DataResult<string>.Success("未审单")); 
             }
         }
@@ -232,7 +228,8 @@ namespace DS.WMS.Core.Op.Method
             { 
                 return await Task.FromResult(DataResult.Failed("此单未审，可直接编辑调整!"));
             }
-            if (task.IsNotNull() && task.TaskStatus == TaskStatusEnum.Create)
+ 
+            if (task.IsNotNull() && task.TaskStatus != TaskStatusEnum.Complete)
             {
                 return await Task.FromResult(DataResult.Failed("此单未审，可直接编辑调整!"));
             }