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

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs

@@ -27,9 +27,9 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
     /// <summary>
     /// 总成与结算件关系
     /// </summary>
-    [AllowAnonymous]
+    //[AllowAnonymous]
 
-   // [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
+    [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
     [Route("api/settleaccount/MaterialRelationshipDetail")]
     public class MaterialRelationshipTHAppService : ApplicationService
     /*, IMaterialRelationshipTHAppService*/

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

@@ -367,7 +367,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 5,\n" +
+                      "		@type = 5\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -325,7 +325,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 6,\n" +
+                      "		@type = 6\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -405,7 +405,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 3,\n" +
+                      "		@type = 3\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -375,7 +375,7 @@ into temp1
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 4,\n" +
+                      "		@type = 4\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -445,7 +445,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 0,\n" +
+                      "		@type = 0\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -458,7 +458,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 1,\n" +
+                      "		@type = 1\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -383,7 +383,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 2,\n" +
+                      "		@type = 2\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -325,7 +325,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 9,\n" +
+                      "		@type = 9\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -323,7 +323,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 7,\n" +
+                      "		@type = 7\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)

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

@@ -388,7 +388,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             var sql = "DECLARE	@return_value int\n" +
                       "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
                       "		@billnum = N'{0}',\n" +
-                      "		@type = 8,\n" +
+                      "		@type = 8\n" +
                       "SELECT	'Return Value' = @return_value";
             await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
                string.Format(sql, input.BillNum)