提交

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs

@@ -1172,8 +1172,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                     itm.CreationTime = DateTime.Now;
                 }
                 _dbcontext.BulkInsert(detailext);
-
-
             }
             _dbcontext.BulkInsert(invlist);
             _dbcontext.BulkInsert(groupList);

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@@ -1581,16 +1581,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             "isnull([150],0) RETQty,\n" +
             "isnull([200],0) CANQty,\n" +
             "isnull([800],0) NOTQty,\n" +
-            "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)=0 then ISNULL([100],0)\n" +
+            "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)=0 then ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)\n" +
             "when ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) - ISNULL([200], 0) = ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) then 0\n"+
             "ELSE 0 END SE_SA_CAN_QTY,\n" +
-            "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([800],0)=0 then ISNULL([100],0)\n" +
+            "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([800],0)=0 then ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)\n" +
             "when ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) - ISNULL([800], 0) = ISNULL([10], 0) + isnull([20], 0) + isnull([100], 0) + ISNULL([150], 0) then 0\n"+
             "ELSE 0 END SE_SA_NOT_QTY,\n" +
             "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)>0 then ISNULL([100],0)\n" +
             "ElSE 0 END SE_SA_DIFF_QTY,\n" +
-            "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)=isnull([100],0)+ISNULL([150],0) then \n" +
-            "ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)\n" +
+            "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)=ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0) then \n" +
+            "ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)\n" +
             "ElSE 0 END ONLY_SE_QTY,\n" +
             "case when ISNULL([10],0)+isnull([20],0)+isnull([100],0)+ISNULL([150],0)-ISNULL([200],0)-ISNULL([800],0)=-ISNULL([200],0)-ISNULL([800],0) then \n" +
             "ISNULL([200],0)+ISNULL([800],0) \n" +
@@ -1780,14 +1780,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         
         public async Task<string> GetReceiveShipSum(RequestDto input)
         {
-
-
            var sebegin= input.Filters.Any(p => p.Column == "sebegin")? input.Filters.FirstOrDefault(p => p.Column == "sebegin").Value : "";
            var seend = input.Filters.Any(p => p.Column == "seend")? input.Filters.FirstOrDefault(p => p.Column == "seend").Value : "";
            var sabegin = input.Filters.Any(p => p.Column == "sabegin")? input.Filters.FirstOrDefault(p => p.Column == "sabegin").Value : "";
            var saend = input.Filters.Any(p => p.Column == "saend")? input.Filters.FirstOrDefault(p => p.Column == "saend").Value : "";
            var parcode = input.Filters.Any(p => p.Column == "partCode")? input.Filters.FirstOrDefault(p => p.Column == "partCode").Value : "";
-
             List<EnumBusinessType> list = new List<EnumBusinessType>();
             list.Add(EnumBusinessType.JisBBAC);
             list.Add(EnumBusinessType.JisHBPO);
@@ -1820,14 +1817,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             {
                 entities = entities.Where(p => p.PartCode == parcode).ToList();
             }
-
-
-
             await _recRepository.DbContext.BulkInsertAsync(entities).ConfigureAwait(false);
-
-
-
-
             IExporter _csv = new CsvExporter();
             IExporter _excel = new ExcelExporter();
             byte[] result = null;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/SHIP_REC_SUM.cs

@@ -29,6 +29,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         [Display(Name = "不可结数量")]
         public string NOTQty { set; get; }
         [Display(Name = "有发有结有价格数量")]
+
         public string SE_SA_CAN_QTY { set; get; }
         [Display(Name = "有发有结无价格数量")]
         public string SE_SA_NOT_QTY { set; get; }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs

@@ -27,9 +27,6 @@ namespace Win.Sfs.SettleAccount
         /// </summary>
         [Display(Name = "直供件BBAC")]
         ZhiGongJianBBAC = 3,
-
-
-        
         /// <summary>
         /// 直供件HBPO
         /// </summary>