diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index df6d3da6..e324782c 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -17,8 +17,8 @@ "AllowedHosts": "*", //允许所有主机 "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", //跨域 "AppOptions": { - //"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址 - "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址 + "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址 + //"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址 "RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=3", //测试redis连接地址test_wmsdb //"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=2", //正式redis连接地址 "RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", //redis连接地址 diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 434b7403..ce80aec4 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -262,7 +262,7 @@ 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(-100);//默认拉去8小时以内的数据，ALTER BY YZH // var beginTime = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据，ALTER BY YZH这里要改回去 @@ -826,10 +826,11 @@ namespace WMS.Web.Domain.Services { if (entity.Type == InstockType.Purchase) Instock_sourceBillNos.Add(entity.SourceBillNo); - else if (entity.Type == InstockType.Stkdirecttransfers) - TransferDirect_sourceBillNos.Add(entity.SourceBillNo); else if (entity.Type == InstockType.StktransferInst) Transferin_sourceBillNos.Add(entity.SourceBillNo); + else if (entity.Type == InstockType.Stkdirecttransfers) + TransferDirect_sourceBillNos.Add(entity.SourceBillNo); + else if (entity.Type == InstockType.Assembled) AssembledApp_sourceBillNos.Add(entity.SourceBillNo); else if (entity.Type == InstockType.Miscellaneous) @@ -837,13 +838,6 @@ namespace WMS.Web.Domain.Services else if (entity.Type == InstockType.ProduceSotck) ProduceSotck_sourceBillNos.Add(entity.SourceBillNo); } - if (Instock_sourceBillNos.Count() > 0) - { - var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null); - if (!erp_result.IsSuccess) - return Result>.ReFailure(erp_result.Message, erp_result.Status); - erp_list.AddRange(erp_result.Data); - } if (Transferin_sourceBillNos.Count() > 0) { var erp_result = await _erpService.BillQueryForTransferin(Transferin_sourceBillNos, null); @@ -851,6 +845,14 @@ namespace WMS.Web.Domain.Services return Result>.ReFailure(erp_result.Message, erp_result.Status); erp_list.AddRange(erp_result.Data); } + if (Instock_sourceBillNos.Count() > 0) + { + var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null); + if (!erp_result.IsSuccess) + return Result>.ReFailure(erp_result.Message, erp_result.Status); + erp_list.AddRange(erp_result.Data); + } + if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库 { diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index f714b46f..d26a2b27 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -606,7 +606,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶分步式入库订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFERIN.ToString()); - param.FieldKeys = "FSrcBillType,FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID"; + param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID"; param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -616,22 +616,25 @@ namespace WMS.Web.Domain.Services.Public //当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取 //param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'"; param.FilterString = " 1=1"; - // param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN' and FBillNo='FBDR226242'"; + //param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN' and FBillNo='FBDR257098'"; + param.FilterString += " and FSrcBillType<>'STK_TransferDirect'"; if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FSrcStockId!=FDestStockId"; - for (int i = 0; i < stocks.Count(); i++) - { - if (i == 0) - { - param.FilterString += " and ("; - param.FilterString += $"(FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')"; - } - else - param.FilterString += $" or (FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')"; - if (i == stocks.Count() - 1) param.FilterString += ")"; + + for (int i = 0; i < stocks.Count(); i++) + { + if (i == 0) + { + param.FilterString += " and ("; + param.FilterString += $"(FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; - } + } + //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0)