diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs index 6988dd6..3c42508 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs @@ -81,7 +81,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_ var detail = new OutFactoryRecord_Detail(); detail.OutDate = outDateColumn.GetNullableValue(row); detail.CustomerName = customerColumn.GetStringValue(row); - detail.GoodsName = customerColumn.GetStringValue(row); + detail.GoodsName = goodsNameColumn.GetStringValue(row); detail.Number = numberColumn.GetNullableValue(row); detail.SaleUnit = saleUnitColumn.GetStringValue(row); detail.AnimalTest = animalTestColumn.GetStringValue(row); @@ -108,7 +108,12 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_ query.Where.Conditions.Add(DQCondition.EQ("Date", Dmo.Date)); query.Columns.Add(DQSelectColumn.Field("Supplier_Name", weight)); query.Range = SelectRange.Top(5); - return string.Join(",", query.EExecuteList()) + ",……"; + var result = query.EExecuteList(); + var name = string.Join(",", result); + if (result.Count > 5) + return name + ",……"; + else + return name; } } }