台账查询bug处理

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -196,7 +196,7 @@ namespace Myshipping.Application
                  .WhereIF(!input.ISDel, x => x.IsDeleted == false)
                  .WhereIF(input.ISDel, x => x.IsDeleted == true)
                  .WhereIF(input.firstFlag, x => x.ETD <= etoday && x.ETD >= ftoday || x.ETD == null)
-                 .WhereIF(string.IsNullOrWhiteSpace(input.HBLNO), x => x.ParentId == 0 || x.ParentId == null)
+                 .Where(x => x.ParentId == 0 || x.ParentId == null) //台账只查询主单！！
                  .WhereIF(pidlist != null && pidlist.Count > 0, x => pidlist.Contains(x.Id))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.BSNO), u => u.BSNO.Contains(input.BSNO))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.BSSTATUS), u => u.BSSTATUS == input.BSSTATUS)
@@ -1623,7 +1623,7 @@ namespace Myshipping.Application
 
 
                 }
-                
+
 
 
 
@@ -2715,25 +2715,27 @@ namespace Myshipping.Application
                                             if (name.Split('.')[0].ToLower() == "order" && name.Split('.')[1].ToLower() == "_pkgs" && _name == "pkgs")
                                             {
                                                 var value = string.Empty;
-                                                if (order.PKGS!=null) {
-                                                    if (order.PKGS.ToString().Split('.').Count() > 1&&Convert.ToInt32(order.PKGS.ToString().Split('.')[1])>0)
+                                                if (order.PKGS != null)
+                                                {
+                                                    if (order.PKGS.ToString().Split('.').Count() > 1 && Convert.ToInt32(order.PKGS.ToString().Split('.')[1]) > 0)
                                                     {
                                                         value = string.Format("{0:F3}", order.PKGS);
                                                     }
-                                                    else {
+                                                    else
+                                                    {
                                                         value = order.PKGS.ToString().Split('.')[0];
                                                     }
-                                                    
+
                                                 }
                                                 ICell cell = row.GetCell(_cellNum - 1);
                                                 if (cell != null)
                                                 {
-                                                   
-                                                    row.Cells[_cellNum - 1].SetCellValue(value +  order.KINDPKGS );
+
+                                                    row.Cells[_cellNum - 1].SetCellValue(value + order.KINDPKGS);
                                                 }
                                                 else
                                                 {
-                                                    row.CreateCell(_cellNum - 1).SetCellValue(value + order.KINDPKGS );
+                                                    row.CreateCell(_cellNum - 1).SetCellValue(value + order.KINDPKGS);
                                                 }
 
                                             }