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 d2231235..d78b5460 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
@@ -347,6 +347,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
+ 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 f6e118ed..401a729c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
@@ -303,6 +303,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
+ 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 f030eafd..19fe5fb3 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
@@ -382,6 +382,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
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 8f700bd6..2013239c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
@@ -352,6 +352,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
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 883f4515..8c88c212 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
@@ -422,6 +422,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
+ 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 c740d0e6..0376f8f5 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
@@ -424,7 +424,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";
@@ -437,6 +437,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
+ 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 4d12f682..952a297b 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
@@ -361,6 +361,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
+ 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 63854263..c38f7e65 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
@@ -294,13 +294,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
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 e25cbe58..5dc1222c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
@@ -300,6 +300,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, input.AccountDate.ToShortDateString())
+ );
+
+
+
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 46092ff8..0286a7d7 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, input.AccountDate.ToShortDateString())
+ );
+
+
+
return true;
}
[HttpPost]