diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 4d07dc2f..91a0ff5c 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index afb41c06..f6358873 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1993,7 +1993,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString()); - param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber,FDestStockId.FNumber"; + param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber,FDestStockId.FName"; param.Limit = 10000; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 @@ -2094,7 +2094,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString()); - param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber,FDestStockID.FNumber"; + param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber,FDestStockID.FName"; param.Limit = 10000; //查询条件:备注其中的条件值以金蝶的值为准!!! //1.创建时间在两天前和当天时间之间 diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 909ee554..1a1c28e9 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -283,11 +283,11 @@ namespace WMS.Web.Repositories customers = customer_result.Data.ToList(); List stocks = new List(); - if (!string.IsNullOrEmpty(dto.InStock)) - { - //var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.InStock, companyId); - stocks = GetStockCodes(dto.InStock, companyId); - } + //if (!string.IsNullOrEmpty(dto.InStock)) + //{ + // //var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.InStock, companyId); + // stocks = GetStockCodes(dto.InStock, companyId); + //} List taskIds = null; List taskIds_s = new List(); @@ -360,7 +360,7 @@ namespace WMS.Web.Repositories } if (!string.IsNullOrEmpty(dto.InStock)) { - query = query.Where(w => w.detail.ErpDetails.Where(w => stocks.Contains(w.InStockCode)).Any()); + query = query.Where(w => w.detail.ErpDetails.Where(w => EF.Functions.Like(w.InStockCode, "%" + dto.InStock + "%")).Any()); } //组装 int total = await query.CountAsync(); @@ -624,14 +624,14 @@ namespace WMS.Web.Repositories { var list = codes.Where(w => w != null).ToList(); if (list.Count() == 0) return ""; - List names = new List(); - foreach (var c in list) - { - var name = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, c + orgCode); - names.Add(name); - } - if (names.Count() == 0) return ""; - return string.Join(",", names); + //List names = new List(); + //foreach (var c in list) + //{ + // var name = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, c + orgCode); + // names.Add(name); + //} + //if (names.Count() == 0) return ""; + return string.Join(",", list); } public List GetStockCodes(string name, int companyId)