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

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

@@ -521,6 +521,46 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             return ApplicationConsts.SuccessStr;
         }
 
+        private async Task<bool> CheckIsOutPut(List<WmsSharePart90OutPutDetial> p_list)
+        {
+            if (p_list.Count() > 0)
+            {
+              var entity=  p_list.FirstOrDefault();
+              var day = entity.OrderBillNum.Right(3);
+                int _count = 0;
+                if (day == "D60")
+                {
+                    _count= _wmsRepository.Count(p => p.Version == entity.Version && p.OrderBillNum.Contains("D30") && p.State!=2);
+                }
+                if (day == "D90")
+                {
+                   _count = _wmsRepository.Count(p => p.Version == entity.Version && p.State != 2 && (p.OrderBillNum.Contains("D60") || p.OrderBillNum.Contains("D30")));
+                }
+                if (_count > 0)
+                {
+                    return false;
+                }
+            }
+            return true;
+         
+        }
+
+        public async Task<List<string>> GetBillList(string version)
+        {
+            var _list=_wmsRepository.Where(p => p.Version == version && p.State != 2
+            && (p.OrderBillNum.Contains("D60") 
+            || p.OrderBillNum.Contains("D30") 
+            || p.OrderBillNum.Contains("D90"))).Select(p=>p.OrderBillNum).Distinct().ToList();
+            return _list;
+
+        }
+
+
+
+
+
+
+
 
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs

@@ -190,9 +190,7 @@ namespace SettleAccount.Job.Services
             .Append(report1List, "按物料价格差异明细表")
             .SeparateBySheet()
             .Append(report2List.ToList(), "差异汇总验证表")
-          
             .ExportAppendDataAsByteArray();        
-            
             result.ShouldNotBeNull();
             _fileContainer.SaveAsync(_filename, result.Result, true);