Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs

@@ -420,7 +420,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
         {
-            var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
+            var _billNum = "HQFKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
             var result = await _exportImporter.ExtendExcelImport<WmsHQFKanbanOutPutDetial>(files, _excelImportService);
             List<WmsHQFKanbanOutPutDetial> _lst = new List<WmsHQFKanbanOutPutDetial>();
@@ -461,7 +461,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         equals
                         new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
                         select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
 
             var checkList = new List<ErrorExportDto>();
             foreach (var itm in errList)

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs

@@ -430,7 +430,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
         {
-            var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
+            var _billNum = "BHQF" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
             var result = await _exportImporter.ExtendExcelImport<WmsHQFSharePartOutPutDetial>(files, _excelImportService);
             List<WmsHQFSharePartOutPutDetial> _lst = new List<WmsHQFSharePartOutPutDetial>();
@@ -472,7 +472,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         equals
                         new { itm2.MaterialCode, itm2.OrderBillNum }
                         select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
 
             var checkList = new List<ErrorExportDto>();
             foreach (var itm in errList)

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs

@@ -421,7 +421,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
         {
-            var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
+            var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
             var result = await _exportImporter.ExtendExcelImport<WmsHQHKanbanOutPutDetial>(files, _excelImportService);
             List<WmsHQHKanbanOutPutDetial> _lst = new List<WmsHQHKanbanOutPutDetial>();
@@ -460,7 +460,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         equals
                         new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
                         select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
 
             var checkList = new List<ErrorExportDto>();
             foreach (var itm in errList)

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs

@@ -456,7 +456,7 @@ into temp1
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
         {
-            var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
+            var _billNum = "BHQH" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
             var result = await _exportImporter.ExtendExcelImport<WmsHQHSharePartOutPutDetial>(files, _excelImportService);
             List<WmsHQHSharePartOutPutDetial> _lst = new List<WmsHQHSharePartOutPutDetial>();

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs

@@ -188,7 +188,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         [Route("WmsSharePartOutPut")]
         public async Task<string> WmsSharePartOutPut(WmsJitRequestDto input)
         {
-            var _billNum = "BC" + DateTime.Now.ToString("yyyyMMddhhmmss");
+            var _billNum = "BCar" + DateTime.Now.ToString("yyyyMMddhhmmss");
             var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
             if (_joblist.Count() > 0)
             {
@@ -376,7 +376,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
         {
-            var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
+            var _billNum = "BCar" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
             var result = await _exportImporter.ExtendExcelImport<WmsHQCarOutPutDetial>(files, _excelImportService);
             List<WmsHQCarOutPutDetial> _lst = new List<WmsHQCarOutPutDetial>();

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs

@@ -380,7 +380,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         equals
                         new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine }
                         select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
 
             var checkList = new List<ErrorExportDto>();
             foreach (var itm in errList)

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs

@@ -475,7 +475,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         equals
                         new { itm2.MaterialCode }
                         select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
 
             var checkList = new List<ErrorExportDto>();
             foreach (var itm in errList)