This commit is contained in:
2025-06-17 14:34:47 +08:00
parent 05cedd2457
commit 90bcfc9033
13 changed files with 204 additions and 27 deletions

View File

@@ -257,12 +257,26 @@ namespace WMS.Web.Domain.Services
{
if (billNos == null || billNos.Count == 0)
{
var beginTime = DateTime.Now.AddHours(-20);//默认拉去8小时以内的数据ALTER BY YZH
// var beginTime = DateTime.Now.AddHours(-20);//默认拉去8小时以内的数据ALTER BY YZH
var beginTime = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据ALTER BY YZH这里要改回去
////6.同步数据:生产入库单
//var ProduceSotck_result = await this.SsynProduceSotck(null, isTransaction, beginTime);
//if (!ProduceSotck_result.IsSuccess)
// return Result.ReFailure(ProduceSotck_result.Message, ProduceSotck_result.Status);
//6.同步数据:生产入库单
var ProduceSotck_result = await this.SsynProduceSotck(null, isTransaction, beginTime);
if (!ProduceSotck_result.IsSuccess)
return Result.ReFailure(ProduceSotck_result.Message, ProduceSotck_result.Status);
//4.同步数据:分步式入库单
var Transferin_result = await this.SysnTransferin(null, isTransaction, beginTime);
if (!Transferin_result.IsSuccess)
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
@@ -281,10 +295,6 @@ namespace WMS.Web.Domain.Services
if (!TransferDirect_result.IsSuccess)
return Result.ReFailure(TransferDirect_result.Message, TransferDirect_result.Status);
//4.同步数据:分步式入库单
var Transferin_result = await this.SysnTransferin(null, isTransaction, beginTime);
if (!Transferin_result.IsSuccess)
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
//5.同步数据:组装拆卸单
var AssembledApp_result = await this.SysnAssembledApp(null, isTransaction, beginTime);
@@ -781,7 +791,7 @@ namespace WMS.Web.Domain.Services
List<string> TransferDirect_sourceBillNos = new List<string>();
List<string> Transferin_sourceBillNos = new List<string>();
List<string> AssembledApp_sourceBillNos = new List<string>();
List<string> ProduceSotck_sourceBillNos = new List<string>();//生产入库
// List<string> ProduceSotck_sourceBillNos = new List<string>();//生产入库
foreach (var entity in list)
{
@@ -795,17 +805,17 @@ namespace WMS.Web.Domain.Services
AssembledApp_sourceBillNos.Add(entity.SourceBillNo);
else if (entity.Type == InstockType.Miscellaneous)
Miscellaneous_sourceBillNos.Add(entity.SourceBillNo);
else if (entity.Type == InstockType.ProduceSotck)
ProduceSotck_sourceBillNos.Add(entity.SourceBillNo);
//else if (entity.Type == InstockType.ProduceSotck)
// ProduceSotck_sourceBillNos.Add(entity.SourceBillNo);
}
if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库
{
var erp_result = await _erpService.BillQueryForProduceSotckin(ProduceSotck_sourceBillNos, null);
if (!erp_result.IsSuccess)
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
//if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库
//{
// var erp_result = await _erpService.BillQueryForProduceSotckin(ProduceSotck_sourceBillNos, null);
// if (!erp_result.IsSuccess)
// return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
// erp_list.AddRange(erp_result.Data);
//}
if (Instock_sourceBillNos.Count() > 0)
{