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

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs

@@ -52,8 +52,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// <summary>
     /// 大众准时化结算明细导入-R3已结
     /// </summary>
-    [Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-    //[AllowAnonymous]
+    //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+    [AllowAnonymous]
     [Route("api/settleaccount/SettleAccount")]
     public class SettleAccountAppService : SettleAccountApplicationBase<SettleAccount>, ISettleAccountAppService
     {

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

@@ -348,6 +348,36 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
          
         }
         /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 5,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
+            return true;
+        }
+        /// <summary>
         ///出库界面功能， 撤销核准出库
         /// </summary>
         /// <param name="ids"></param>

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

@@ -55,8 +55,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// 红旗F平台备件-出库
     /// </summary>
 
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
+    [AllowAnonymous]
+    //[Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/wmsHQFSharePartoutput")]
     public class WMSHQFSharePartAppService :
          SettleAccountApplicationBase<WmsHQFSharePartOutPutDetial>
@@ -304,6 +304,40 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             return true;
         }
+
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 6,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
+            return true;
+        }
+
+
+
         /// <summary>
         ///出库界面功能， 撤销核准出库
         /// </summary>

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

@@ -383,6 +383,36 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
             }
 
+            return true;
+        }
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 3,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
             return true;
         }
         [HttpPost]

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

@@ -353,6 +353,36 @@ into temp1
                        string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString()));
                 }
             }
+            return true;
+        }
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 4,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
             return true;
         }
         /// <summary>

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

@@ -424,6 +424,46 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
             return true;
         }
+
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 0,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
+            return true;
+        }
+
+
+
+
+
+
+
+
+
         /// <summary>
         ///出库界面功能， 撤销核准出库
         /// </summary>

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

@@ -425,7 +425,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                           "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
                           "     @Guids ={0}, \n" +
                           "		@billnum = N'{1}',\n" +
-                          "		@type = 2,\n" +
+                          "		@type = 1,\n" +
                           "     @accountdate = N'{2}'\n" +
                           "SELECT	'Return Value' = @return_value";
 
@@ -438,6 +438,39 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             return true;
         }
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 1,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
+            return true;
+        }
+
+
+
         [HttpPost]
         [Route("ExcelImport")]
         [DisableRequestSizeLimit]

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

@@ -362,6 +362,39 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             return true;
         }
+
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 2,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
+            return true;
+        }
+
+
         [HttpPost]
         [Route("ExcelImport")]
         [DisableRequestSizeLimit]

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

@@ -295,13 +295,44 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                     var sql = "DECLARE	@return_value int\n" +
                          "EXEC	@return_value = [dbo].[p_wms_output]\n" +
                          "		@billnum = N'{0}',\n" +
-                         "		@type = 4\n" +
+                         "		@type = 9\n" +
+                         "		@date = '{1}'\n" +
                          "SELECT	'Return Value' = @return_value";
                     await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum));
+                       string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString()));
 
                 }
             }
+            return true;
+        }
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 9,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
             return true;
         }
         /// <summary>

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

@@ -301,6 +301,36 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
             }
 
+            return true;
+        }
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 7,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
             return true;
         }
         [HttpPost]

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

@@ -366,6 +366,36 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                    sql
                  );
             }
+            return true;
+        }
+        /// <summary>
+        /// 出库界面功能删除
+        /// </summary>
+        /// <param name="version"></param>
+        /// <param name="p_list"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("WmsOutPutDelete")]
+        [UnitOfWork(false)]
+        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
+        {
+            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
+
+            if (count > 0)
+            {
+                return false;
+            }
+            var sql = "DECLARE	@return_value int\n" +
+                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
+                      "		@billnum = N'{0}',\n" +
+                      "		@type = 8,\n" +
+                      "SELECT	'Return Value' = @return_value";
+            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+               string.Format(sql, input.BillNum)
+             );
+
+
+
             return true;
         }
         [HttpPost]

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@@ -1737,6 +1737,14 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQFKanbanAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQFKanbanAppService.WmsHQFKanbanOutPutCancel(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
              <summary>
             出库界面功能， 撤销核准出库
@@ -1797,6 +1805,14 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSHQFSharePartAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSHQFSharePartAppService.WmsSharePartOutPutCancel(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
              <summary>
             出库界面功能， 撤销核准出库
@@ -1872,6 +1888,14 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHKanbanAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService">
             <summary>
             红旗M平台备件-出库
@@ -1931,6 +1955,14 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService.WmsSharePartOutPutCancel(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
              <summary>
             出库界面功能， 撤销核准出库
@@ -1998,6 +2030,14 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSJitAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSJitAppService.WmsJitOutPutCancel(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
              <summary>
             出库界面功能， 撤销核准出库
@@ -2074,6 +2114,14 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSKanbanAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService">
             <summary>
             wms出库
@@ -2134,6 +2182,14 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePart.SettlementPakAndSparePartsAppService">
             <summary>
             结算包与散件对应关系服务
@@ -2745,6 +2801,14 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQCarAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQCarAppService.WmsSharePartOutPutCancel(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
              <summary>
             出库界面功能， 撤销核准出库
@@ -2813,6 +2877,14 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMKanbanAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartAppService">
             <summary>
             红旗H平台备件-出库
@@ -2880,6 +2952,14 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartAppService.WmsOutPutDelete(Win.Sfs.SettleAccount.Entities.Wms.WmsJitRequestDto)">
+            <summary>
+            出库界面功能删除
+            </summary>
+            <param name="version"></param>
+            <param name="p_list"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.FISes.FISAppService">
             <summary>
             区域相关应用服务