修复bug

This commit is contained in:
18942506660
2024-11-21 09:54:02 +08:00
parent cc169f980f
commit 492720e137
4 changed files with 51 additions and 4 deletions

View File

@@ -438,6 +438,19 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:WMS.Web.Api.Controllers.MaterialController">
<summary>
物料
</summary>
</member>
<member name="M:WMS.Web.Api.Controllers.MaterialController.Refresh(System.String,System.String)">
<summary>
刷新物料 69条码或物料编码 名字
</summary>
<param name="number">物料编码</param>
<param name="type">69 条码,other 名字和规格型号</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.GetPagedList(WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryRequest)"> <member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.GetPagedList(WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryRequest)">
<summary> <summary>
列表 列表

View File

@@ -6385,6 +6385,11 @@
Id集合 Id集合
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.SingleData.InStockSingleDataResponse.ErpOrgCode">
<summary>
组织编码对应金蝶
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.NameRequest"> <member name="T:WMS.Web.Core.Dto.SingleData.NameRequest">
<summary> <summary>
名称请求对象 名称请求对象

View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.SingleData
{
public class InStockSingleDataResponse: SingleDataResponse
{
/// <summary>
/// 组织编码对应金蝶
/// </summary>
public string ErpOrgCode { get; set; }
}
}

View File

@@ -16,6 +16,7 @@ using WMS.Web.Core.Dto.Erp.Customer;
using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Login; using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.OutStockTask; using WMS.Web.Core.Dto.OutStockTask;
using WMS.Web.Core.Dto.SingleData;
using WMS.Web.Core.Help; using WMS.Web.Core.Help;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.Infrastructure;
@@ -284,8 +285,8 @@ namespace WMS.Web.Repositories
List<string> stocks = new List<string>(); List<string> stocks = new List<string>();
if (!string.IsNullOrEmpty(dto.InStock)) if (!string.IsNullOrEmpty(dto.InStock))
{ {
var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.InStock, companyId); //var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.InStock, companyId);
stocks = r.Select(s => s.Code).ToList(); stocks = GetStockCodes(dto.InStock, companyId);
} }
List<int> taskIds = null; List<int> taskIds = null;
@@ -393,8 +394,8 @@ namespace WMS.Web.Repositories
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
Remark = s.detail.Remark, Remark = s.detail.Remark,
InStockCodes= s.detail.ErpDetails.Select(s => s.InStockCode).ToList(), InStockCodes = s.detail.ErpDetails.Select(s => s.InStockCode).ToList(),
OrgCode= s.order.OrgCode OrgCode = s.order.OrgCode
#endregion #endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -611,6 +612,20 @@ namespace WMS.Web.Repositories
if (names.Count() == 0) return ""; if (names.Count() == 0) return "";
return string.Join(",", names); return string.Join(",", names);
} }
public List<string> GetStockCodes(string name, int companyId)
{
var list = _singleDataService.GetSingleData<InStockSingleDataResponse>(SingleAction.StocksJoinOrgCode, companyId);
foreach (var l in list)
{
if (string.IsNullOrEmpty(l.ErpOrgCode)) continue;
l.Code = l.Code.Replace(l.ErpOrgCode, "");
}
var str = list.Where(w => w.Name.Contains(name)).Select(s => s.Code).ToList();
return str;
}
/// <summary> /// <summary>
/// 获取订单信息 /// 获取订单信息
/// </summary> /// </summary>