PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

FoShanPG
yunfeng.liu 3 years ago
parent
001f3efaf4 9030a85470
commit
8a04fa41a3
8 changed files with 5175 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5073
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220107.txt
  2. 18
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json
  3. 20
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
  4. 2
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
  5. 34
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs
  6. 91
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
  7. 30
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
  8. 1
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs

5073
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220107.txt
View File

File diff suppressed because it is too large

18
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json
View File

@ -2,17 +2,17 @@
"App": { "App": {
"CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
}, },
"ConnectionStrings": {
"Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
"SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
},
//"ConnectionStrings": { //"ConnectionStrings": {
// "Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1", // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
// "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;" // "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
// //"Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
// //"SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
// //"Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
//}, //},
"ConnectionStrings": {
//"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
//"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;"
"Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
"SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
"Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
},
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

20
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
View File

@ -2,18 +2,18 @@
"App": { "App": {
"CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
}, },
"ConnectionStrings": {
"Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
"SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService1;user id=sa;Password=1q2w!@#;"
},
//"ConnectionStrings": { //"ConnectionStrings": {
// //"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1", // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
// //"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;", // "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService1;user id=sa;Password=1q2w!@#;"
// "Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
// "SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
// "Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
//}, //},
"ConnectionStrings": {
//"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
//"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;",
"Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
"SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
"Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
},
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

2
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
View File

@ -111,6 +111,8 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
public class WmsJitRequestDto public class WmsJitRequestDto
{ {
public DateTime AccountDate { set; get; }
public string BillNum { set; get; } public string BillNum { set; get; }
public string Version { set; get; } public string Version { set; get; }
public List<Guid> Guids { set; get; } public List<Guid> Guids { set; get; }

34
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs
View File

@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using SettleAccount.Job.Services;
using Shouldly; using Shouldly;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
@ -43,6 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs
[Route("api/settleaccount/Job")] [Route("api/settleaccount/Job")]
public class JobAppService: ApplicationService public class JobAppService: ApplicationService
{ {
private readonly TaskJobService _service; private readonly TaskJobService _service;
public JobAppService(TaskJobService service) public JobAppService(TaskJobService service)
{ {
@ -65,7 +67,37 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs
[UnitOfWork(false)] [UnitOfWork(false)]
virtual public async Task<List<JobDto>> GetListAsync(JobRequestDto input) virtual public async Task<List<JobDto>> GetListAsync(JobRequestDto input)
{ {
return await _service.GetListAsync(input);
if (input.Name == "看板结算输出")
{
}
if (input.Name == "准时化结算核对明细")
{
}
if (input.Name == "备件结算输出")
{
}
//SettleAccount.Job.Services.Report.SettleKBWithCodeExportService
//switch (input.ServiceName)
//{
// case typeof(InvoiceSettledDetailDiffExportService).FullName:
// break;
// case "":
// break;
// case "":
// break;
// case "":
// break;
//}
return await _service.GetListAsync(input);
} }

91
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
View File

@ -409,51 +409,18 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input)
{ {
if (input.Guids != null)
{
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" +
" @type = 0\n" + " @type = 0,\n" +
" @date = N'{1}'\n"+
"SELECT 'Return Value' = @return_value"; "SELECT 'Return Value' = @return_value";
await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
string.Format(sql,input.BillNum) string.Format(sql,input.BillNum,input.AccountDate)
); );
//List<WmsJitOutPutDetial> _ls = new List<WmsJitOutPutDetial>();
//if (input.Guids.Count() > 0)
//{
// _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State != 2).ToListAsync();
//}
//else
//{
// _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
//}
//if (_ls.Count() > 0)
//{
// //var _first = _ls.FirstOrDefault();
// //var _guid = GuidGenerator.Create();
// //foreach (var itm in _ls)
// //{
// // itm.TaskId = _guid;
// //}
// //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls);
// //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", version, "WmsJitOutPutDetail",_first.BillNum, 0,0 ,_guid)
// //{
// // TaskId = _guid,
// // SourceBillNum = _first.BillNum,
// // TableName = "WmsJitOutPutDetail",
// // InterfaceType = "1",
// // Version = version,
// // SettleAccountState = 0,
// // WmsState=0
// //};
// //var _l = new List<TS_UNI_API>();
// //_l.Add(uniapi);
// //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
//}
}
return true; return true;
} }
@ -467,26 +434,34 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("WmsJitOutPut-Cancel")] [Route("WmsJitOutPut-Cancel")]
public async Task<bool> WmsJitOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsJitOutPutCancel(WmsJitRequestDto input)
{ {
var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 2).ToListAsync();
var _first = _ls.FirstOrDefault();
if (_ls.Count > 0) if (input.Guids != null && input.Guids.Count() > 0)
{ {
//var _guid = GuidGenerator.Create(); List<string> _ls = new List<string>();
//await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 }); foreach (var itm in input.Guids)
//var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", version, "WmsJitOutPutDetail", _first.BillNum, 0,0, _guid) {
//{ _ls.Add(string.Format("{0}",itm));
// TaskId = _guid, }
// SourceBillNum = _first.BillNum,
// TableName = "WmsJitOutPutDetail", string str= string.Join(",",_ls.ToArray());
// InterfaceType = "1",
// Version = version, var sql = "DECLARE @return_value int\n" +
// WmsState = 0, "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
// SettleAccountState=0 " @Guids ={0}, \n" +
//}; " @billnum = N'{1}',\n" +
//var _l = new List<TS_UNI_API>(); " @type = 0,\n" +
//_l.Add(uniapi); " @accountdate = N'{2}'\n" +
//await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); "SELECT 'Return Value' = @return_value";
}
sql= string.Format(sql, str, input.BillNum, input.AccountDate);
await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
sql
);
}
return true; return true;
} }

30
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
View File

@ -433,21 +433,21 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var _first = _ls.FirstOrDefault(); var _first = _ls.FirstOrDefault();
if (_ls.Count()>0) if (_ls.Count()>0)
{ {
var _guid = GuidGenerator.Create(); //var _guid = GuidGenerator.Create();
await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 }); //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 });
var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsKanbanOutPutDetail", _first.BillNum, 0,0, _guid) //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsKanbanOutPutDetail", _first.BillNum, 0,0, _guid)
{ //{
TaskId = _guid, // TaskId = _guid,
SourceBillNum = _first.BillNum, // SourceBillNum = _first.BillNum,
TableName = "WmsKanbanOutPutDetail", // TableName = "WmsKanbanOutPutDetail",
InterfaceType = "2", // InterfaceType = "2",
Version = input.Version, // Version = input.Version,
WmsState = 0, // WmsState = 0,
SettleAccountState=0 // SettleAccountState=0
}; //};
var _l = new List<TS_UNI_API>(); //var _l = new List<TS_UNI_API>();
_l.Add(uniapi); //_l.Add(uniapi);
await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
} }
return true; return true;
} }

1
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs
View File

@ -36,7 +36,6 @@ namespace SettleAccount.Job.Services
_inputService = inputService; _inputService = inputService;
_outputService = outputService; _outputService = outputService;
_erpdapperRepository= erpdapperRepository; _erpdapperRepository= erpdapperRepository;
_dapperRepository =dapperRepository; _dapperRepository =dapperRepository;
} }

Write Preview
Loading…
Cancel
Save