Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.sfs.SmartSettlementSystem.PG

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

@@ -444,10 +444,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         {
             var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsHQHKanbanOutPutDetial>(files, _excelImportService);
+            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsHQHKanbanOutPutDetial>(files, _excelImportService);
+            var filteResult = result.Where(p => p.Kanban != "");//过滤掉看板号为空的数据
             List<WmsHQHKanbanOutPutDetial> _lst = new List<WmsHQHKanbanOutPutDetial>();
             var _lsCopy = new List<WmsHQHKanbanOutPutDetial>();
-            foreach (var itm in result)
+            foreach (var itm in filteResult)
             {
                 WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial(
                 GuidGenerator.Create(),

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

@@ -57,7 +57,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
 
     [Route("api/settleaccount/wmskanbanoutput")]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
+    //[Authorize(SettleAccountPermissions.WMSJIT.Default)]
     public class WMSKanbanAppService :
         SettleAccountApplicationBase<WmsKanbanOutPutDetial>
     {
@@ -678,10 +678,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         {
             var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsKanbanOutPutDetial>(files, _excelImportService);
+            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsKanbanOutPutDetial>(files, _excelImportService);
+            var filteResult = result.Where(p => p.Kanban != "");
             List<WmsKanbanOutPutDetial> _lst = new List<WmsKanbanOutPutDetial>();
             var _lsCopy = new List<WmsKanbanOutPutDetial>();
-            foreach (var itm in result)
+            foreach (var itm in filteResult)
             {
                 WmsKanbanOutPutDetial _detail = new WmsKanbanOutPutDetial(
                 GuidGenerator.Create(),
@@ -754,7 +755,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
-            return _billNum;
+            //return _billNum;
+            return ApplicationConsts.SuccessStr;
         }
 
 

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

@@ -478,11 +478,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         {
             var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss");
             ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsSharePart90OutPutDetial>(files, _excelImportService);
+            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsSharePart90OutPutDetial>(files, _excelImportService);
+            var filteResult = result.Where(p => p.OrderBillNum != "");//过滤掉订单号为空的数据，限制这样数据导入
             List<WmsSharePart90OutPutDetial> _lst = new List<WmsSharePart90OutPutDetial>();
 
             var _lsCopy = new List<WmsSharePart90OutPutDetial>();
-            foreach (var itm in result)
+            foreach (var itm in filteResult)
             {
                 WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial(
                 GuidGenerator.Create(),

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

@@ -741,7 +741,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 List<WmsSharePart90OutPutDetial> _lst = new List<WmsSharePart90OutPutDetial>();
 
                 var _lsCopy = new List<WmsSharePart90OutPutDetial>();
-                foreach (var itm in result_withbill)
+                var filte_result_withbill = result_withbill.Where(p => p.OrderBillNum != "");//采购单号为空的过滤掉
+                foreach (var itm in filte_result_withbill)
                 {
                     WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial(
                     GuidGenerator.Create(),