Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
ce2c20171c
  1. 15
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
  2. 7
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
  3. 10
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
  4. 5
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
  5. 5
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
  6. 9
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
  7. 5
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
  8. 6
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
  9. 5
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs
  10. 5
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
  11. 5
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
  12. 12
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
  13. 11
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
  14. 11
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
  15. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs
  16. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs

15
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs

@ -363,6 +363,14 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsCustomerKanbanOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsCustomerKanbanOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
var sql = "DECLARE @return_value int\n" + var sql = "DECLARE @return_value int\n" +
"EXEC @return_value = [dbo].[p_wms_output]\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" +
" @billnum = N'{0}',\n" + " @billnum = N'{0}',\n" +
@ -389,6 +397,13 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsCustomerKanbanOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsCustomerKanbanOutPutCancel(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null && input.Guids.Count() > 0) if (input.Guids != null && input.Guids.Count() > 0)
{ {
List<string> _ls = new List<string>(); List<string> _ls = new List<string>();

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

@ -356,6 +356,13 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsHQFKanbanOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsHQFKanbanOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
var sql = "DECLARE @return_value int\n" + var sql = "DECLARE @return_value int\n" +
"EXEC @return_value = [dbo].[p_wms_output]\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" +
" @billnum = N'{0}',\n" + " @billnum = N'{0}',\n" +

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

@ -325,6 +325,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsHQFSharePartOutPutDetial> _ls = new List<WmsHQFSharePartOutPutDetial>(); List<WmsHQFSharePartOutPutDetial> _ls = new List<WmsHQFSharePartOutPutDetial>();
@ -364,6 +369,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input) public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0); var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
if (count > 0) if (count > 0)

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

@ -354,6 +354,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsHQHKanbanOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsHQHKanbanOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
var sql = "DECLARE @return_value int\n" + var sql = "DECLARE @return_value int\n" +
"EXEC @return_value = [dbo].[p_wms_output]\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" +
" @billnum = N'{0}',\n" + " @billnum = N'{0}',\n" +

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

@ -381,6 +381,11 @@ into temp1
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsHQHSharePartOutPutDetial> _ls = new List<WmsHQHSharePartOutPutDetial>(); List<WmsHQHSharePartOutPutDetial> _ls = new List<WmsHQHSharePartOutPutDetial>();

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

@ -489,8 +489,13 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Authorize(SettleAccountPermissions.WMSJIT.Create)] [Authorize(SettleAccountPermissions.WMSJIT.Create)]
public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
var sql = "DECLARE @return_value int\n" + {
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
var sql = "DECLARE @return_value int\n" +
"EXEC @return_value = [dbo].[p_wms_output]\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" +
" @billnum = N'{0}',\n" + " @billnum = N'{0}',\n" +
" @type = 0,\n" + " @type = 0,\n" +

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

@ -395,6 +395,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsKanbanOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsKanbanOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsKanbanOutPutDetial> _ls = new List<WmsKanbanOutPutDetial>(); List<WmsKanbanOutPutDetial> _ls = new List<WmsKanbanOutPutDetial>();

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

@ -511,7 +511,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
// checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) }); // checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) });
//} //}
//if (checkList.Count > 0) //if (checkList.Count > 0)
//{ //{
@ -519,7 +519,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
// return await ExportErrorReportAsync(checkList, "校验失败.xlsx"); // return await ExportErrorReportAsync(checkList, "校验失败.xlsx");
//} //}
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}

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

@ -374,6 +374,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsSharePart90OutPutDetial> _ls = new List<WmsSharePart90OutPutDetial>(); List<WmsSharePart90OutPutDetial> _ls = new List<WmsSharePart90OutPutDetial>();

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

@ -514,6 +514,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsSharePartOutPutDetial> _ls = new List<WmsSharePartOutPutDetial>(); List<WmsSharePartOutPutDetial> _ls = new List<WmsSharePartOutPutDetial>();

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

@ -314,6 +314,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsHQCarOutPutDetial> _ls = new List<WmsHQCarOutPutDetial>(); List<WmsHQCarOutPutDetial> _ls = new List<WmsHQCarOutPutDetial>();

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

@ -376,6 +376,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
// return await ExportErrorReportAsync(checkList,"校验失败.xlsx"); // return await ExportErrorReportAsync(checkList,"校验失败.xlsx");
//} //}
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (_ls.Count() > 0) if (_ls.Count() > 0)
{ {
@ -404,6 +409,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null && input.Guids.Count() > 0) if (input.Guids != null && input.Guids.Count() > 0)
{ {
List<string> _ls = new List<string>(); List<string> _ls = new List<string>();

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

@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
@ -272,6 +273,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsHQMKanbanOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsHQMKanbanOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
var sql = "DECLARE @return_value int\n" + var sql = "DECLARE @return_value int\n" +
"EXEC @return_value = [dbo].[p_wms_output]\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" +
" @billnum = N'{0}',\n" + " @billnum = N'{0}',\n" +
@ -297,6 +303,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[Route("WmsHQMKanbanOutPut-Cancel")] [Route("WmsHQMKanbanOutPut-Cancel")]
public async Task<bool> WmsHQMKanbanOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsHQMKanbanOutPutCancel(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null && input.Guids.Count() > 0) if (input.Guids != null && input.Guids.Count() > 0)
{ {
List<string> _ls = new List<string>(); List<string> _ls = new List<string>();

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

@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
@ -313,6 +314,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
{
throw new BusinessException("8989", "填写过账日期应该为当月!");
}
if (input.Guids != null) if (input.Guids != null)
{ {
List<WmsHQMSharePartOutPutDetial> _ls = new List<WmsHQMSharePartOutPutDetial>(); List<WmsHQMSharePartOutPutDetial> _ls = new List<WmsHQMSharePartOutPutDetial>();
@ -375,6 +381,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[Route("WmsSharePartOutPut-Cancel")] [Route("WmsSharePartOutPut-Cancel")]
public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
{ {
if (input.Guids != null && input.Guids.Count() > 0) if (input.Guids != null && input.Guids.Count() > 0)
{ {
List<string> _ls = new List<string>(); List<string> _ls = new List<string>();

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs

@ -343,7 +343,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
var _query = DbConnection.Query<UnSettleDiff>(_sql); var _query = DbConnection.Query<UnSettleDiff>(_sql, null, null, true, 1200, null);
return _query.ToList(); return _query.ToList();
} }

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs

@ -360,7 +360,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
string _sql = string.Format(sqlString, str, version); string _sql = string.Format(sqlString, str, version);
; ;
var _query = DbConnection.Query<UnSettleDetailReport1>(_sql); var _query = DbConnection.Query<UnSettleDetailReport1 > (_sql, null, null, true, 1200, null); ;
var _list = _query.ToList(); var _list = _query.ToList();

Loading…
Cancel
Save