diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
index 1831a1fd..fdf24732 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
@@ -52,8 +52,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
///
/// 大众准时化结算明细导入-R3已结
///
- [Authorize(SettleAccountPermissions.SettleAccounts.Default)]
- //[AllowAnonymous]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ [AllowAnonymous]
[Route("api/settleaccount/SettleAccount")]
public class SettleAccountAppService : SettleAccountApplicationBase, ISettleAccountAppService
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
index dbb4006c..3411fdda 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
@@ -348,6 +348,36 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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;
+ }
+ ///
///出库界面功能, 撤销核准出库
///
///
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
index 523d76f6..4d160c68 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
@@ -55,8 +55,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// 红旗F平台备件-出库
///
- //[AllowAnonymous]
- [Authorize(SettleAccountPermissions.WMSHQ.Default)]
+ [AllowAnonymous]
+ //[Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/wmsHQFSharePartoutput")]
public class WMSHQFSharePartAppService :
SettleAccountApplicationBase
@@ -304,6 +304,40 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
return true;
}
+
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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;
+ }
+
+
+
///
///出库界面功能, 撤销核准出库
///
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
index 623ddb50..2b14895d 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
@@ -383,6 +383,36 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
+ return true;
+ }
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
index 71f439f5..b58fe31a 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
+++ b/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;
+ }
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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;
}
///
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
index 8f46a36f..21c1dbb0 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
@@ -424,6 +424,46 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
return true;
}
+
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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;
+ }
+
+
+
+
+
+
+
+
+
///
///出库界面功能, 撤销核准出库
///
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
index 8ec6484d..a6aacb88 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
+++ b/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;
}
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
index 8b6c68a8..59637ba8 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
@@ -362,6 +362,39 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
return true;
}
+
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
index 5681b6a0..95f09a8e 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
+++ b/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;
+ }
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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;
}
///
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
index dc22e08c..65cfd927 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
@@ -301,6 +301,36 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
}
+ return true;
+ }
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
index 4ac68daa..c566b8be 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
@@ -366,6 +366,36 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
sql
);
}
+ return true;
+ }
+ ///
+ /// 出库界面功能删除
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsOutPutDelete")]
+ [UnitOfWork(false)]
+ public async Task 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]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 3e4dd54c..a65ee43c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -1737,6 +1737,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
出库界面功能, 撤销核准出库
@@ -1797,6 +1805,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
出库界面功能, 撤销核准出库
@@ -1872,6 +1888,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
红旗M平台备件-出库
@@ -1931,6 +1955,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
出库界面功能, 撤销核准出库
@@ -1998,6 +2030,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
出库界面功能, 撤销核准出库
@@ -2074,6 +2114,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
wms出库
@@ -2134,6 +2182,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
结算包与散件对应关系服务
@@ -2745,6 +2801,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
出库界面功能, 撤销核准出库
@@ -2813,6 +2877,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
红旗H平台备件-出库
@@ -2880,6 +2952,14 @@
+
+
+ 出库界面功能删除
+
+
+
+
+
区域相关应用服务