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

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs

@@ -234,9 +234,7 @@ namespace Win.Sfs.SettleAccount.Entities
         [ImporterHeader(Name = "开票金额")]
         [ExporterHeader(DisplayName = "开票金额")]
         public decimal Amt { set; get; }
-
+       
-
-    }
 
 
     /// <summary>

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

@@ -376,6 +376,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsHQHKanbanOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsHQHKanbanOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -444,6 +444,7 @@ into temp1
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -329,7 +329,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         [HttpPost]
         [Route("WmsJitOutPutCancel")]
         [DisableRequestSizeLimit]
-
+        [UnitOfWork(false)]
         public async Task<bool> WmsJitCancel(List<Guid> ids)
         {
             var _joblist = await _job.Where(p => ids.Contains(p.Id) && p.FileName == "已确认").ToListAsync();

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

@@ -429,6 +429,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsKanbanOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -367,6 +367,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <returns></returns>
         [HttpPost]
         [Route("WmsKanbanOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -408,6 +408,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -569,6 +569,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
         {
             //没有有采购单据号的单子

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

@@ -378,6 +378,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <returns></returns>
         [HttpPost]
         [Route("WmsSharePartOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -399,6 +399,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <returns></returns>
         [HttpPost]
         [Route("WmsKanbanOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

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

@@ -339,6 +339,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <returns></returns>
         [HttpPost]
         [Route("WmsKanbanOutPut-Cancel")]
+        [UnitOfWork(false)]
         public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
         {
             if (input.Guids != null && input.Guids.Count() > 0)

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs

@@ -375,7 +375,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsJitOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				MaterialCode,\n" +
@@ -395,7 +395,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsKanbanOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				MaterialCode,\n" +
@@ -415,7 +415,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				SapMaterialCode,\n" +
@@ -435,7 +435,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsSharePartOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				MaterialCode,\n" +
@@ -455,7 +455,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsSharePart90OutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				MaterialCode,\n" +
@@ -475,7 +475,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsHQHKanbanOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				MaterialCode,\n" +
@@ -496,7 +496,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 0 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND Extend = '100113' \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -519,7 +519,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 1 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND Extend = '100113' \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -542,7 +542,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 0 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND Extend = '100053' \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -565,7 +565,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 1 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND Extend = '100053' \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -589,7 +589,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsOneTimeSaleOutPutDetial\n" +
 "  			WHERE\n" +
 "  				\n" +
-"  			    VERSION = '{0} AND STATE<>4' \n" +
+"  			    VERSION = '{0}' AND STATE<>4 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
 "  				SapMaterialCode,\n" +
@@ -635,7 +635,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsJitOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -656,7 +656,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsKanbanOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -677,7 +677,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -698,7 +698,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsSharePartOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -719,7 +719,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsSharePart90OutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -740,7 +740,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  			FROM\n" +
 "  				Set_WmsHQHKanbanOutPutDetial \n" +
 "  			WHERE\n" +
-"  				VERSION = '{0} AND STATE<>4' \n" +
+"  				VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +
@@ -762,7 +762,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 0 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  				AND Extend = '100113' \n" +
 "  			GROUP BY\n" +
@@ -786,7 +786,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 1 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  				AND Extend = '100113' \n" +
 "  			GROUP BY\n" +
@@ -810,7 +810,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 0 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  				AND Extend = '100053' \n" +
 "  			GROUP BY\n" +
@@ -834,7 +834,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsHQWithOutKanbanOutPutDetial \n" +
 "  			WHERE\n" +
 "  				IsBack = 1 \n" +
-"  				AND VERSION = '{0} AND STATE<>4' \n" +
+"  				AND VERSION = '{0}' AND STATE<>4 \n" +
 "  				AND State = 2 \n" +
 "  				AND Extend = '100053' \n" +
 "  			GROUP BY\n" +
@@ -859,7 +859,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "  				Set_WmsOneTimeSaleOutPutDetial\n" +
 "  			WHERE\n" +
 "  		\n" +
-"  				 VERSION = '{0} AND STATE<>4' \n" +
+"  				 VERSION = '{0}' AND STATE<>4 \n" +
 "				AND State = 2 \n" +
 "  			GROUP BY\n" +
 "  				BillNum,\n" +

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

@@ -308,9 +308,6 @@ namespace SettleAccount.Job.Services.Report
                             库位 = tm == null ? "" : tm.LocCode,
                             本月减少 = tm == null ? "" : tm.OutQty.ToString(),
                             本月增加 = tm == null ? "" : tm.InQty.ToString(),
-                            
-
-
 
 
                         };