修复bug

src/WMS.Web.Domain/Services/InStockService.cs

@@ -522,7 +522,9 @@ namespace WMS.Web.Domain.Services
             });
 
             var all_boxIds = dto.Boxs.Select(s => s.BoxId).ToList();
-            //2.1判断箱是否上架过了
+            //2.1判断箱是否上架过了 按箱出货才判断
+            if (dto.ShelfMethod == 1)
+            {
                 var boxInventoryList = await _boxInventoryRepositories.GetList(all_boxIds);
                 foreach (var b in dto.Boxs)
                 {
@@ -532,6 +534,7 @@ namespace WMS.Web.Domain.Services
                         return Result<InStock>.ReFailure($"{b.BoxBillNo} 箱号已上架入库", 80000);
                     }
                 }
+            }
 
             //1.获取来源单
             var task = await _inStockTaskRepositories.Get(dto.TaskId);

src/WMS.Web.Domain/Services/OutStockTaskService.cs

@@ -601,9 +601,25 @@ namespace WMS.Web.Domain.Services
                 response.Details.Add(infoDetail);
             }
             //排序和加序号值
-            response.Details = response.Details.OrderByDescending(s => s.Specifications)
+            //response.Details = response.Details.OrderByDescending(s => s.Specifications)
-                .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList();
+            //    .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList();
-            response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1);
+            // response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1);
+            response.Details = response.Details.OrderByDescending(s => s.Method)
+                .ThenByDescending(s => s.BoxBillNo).ThenByDescending(s => s.BoxLength).ToList();
+
+            for (int i = 0; i < response.Details.Count(); i++)
+            {
+                if (i == 0)
+                    response.Details[0].IndexNumber = 1;
+                else
+                {
+                    //和上一个箱子比 如果是相同的箱子序号一样
+                    if (response.Details[i].BoxBillNo == response.Details[i - 1].BoxBillNo)
+                        response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber;
+                    else
+                        response.Details[i].IndexNumber = response.Details[i - 1].IndexNumber + 1;
+                }
+            }
 
             return Result<OutStockTaskInfoResponse>.ReSuccess(response);
         }