18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整物料编码

Browse Source
This commit is contained in:
18942506660
2024-03-16 15:39:45 +08:00
parent 405b414912
commit d8e2c7509d
28 changed files with 343 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -163,9 +163,9 @@ namespace WMS.Web.Repositories
{
#region dto组装
BillNo = s.changeBox.BillNo,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.changeBox.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.changeBox.MaterialNumber),
MaterialNumber = s.changeBox.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialNumber),
//Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.changeBox.StockId),
SerialNumbers = string.Join(",", s.changeBox.SerialNumbers),
SrcBox = s.srcBox.BoxBillNo,

8
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -127,11 +127,11 @@ namespace WMS.Web.Repositories
foreach (var d in res.First().Details)
{
BoxDetailResponse detail = new BoxDetailResponse();
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialId);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId);
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialId);
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialNumber);
detail.MaterialNumber = d.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber);
detail.SerialNumbers = d.SerialNumbers;
detail.MaterialId = d.MaterialId;
detail.MaterialId = 0;
detail.Qty = d.Qty;
details.Add(detail);
}

22
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -100,7 +100,7 @@ namespace WMS.Web.Repositories
ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
}
#region erp基础资料
List<int> mIds = new List<int>();
List<string> mNumber = new List<string>();
var materials_result = await _erpService.BillQueryForMaterial();
List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
if (materials_result.IsSuccess)
@@ -109,10 +109,10 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
if (materials != null)
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialId).ToList();
).Select(s => s.MaterialNumber).ToList();
}
//取组织
@@ -146,7 +146,7 @@ namespace WMS.Web.Repositories
query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type != OutStockType.Sal);
}
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
query = query.Where(w => mNumber.Contains(w.detail.MaterialNumber));
if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => ids.Contains(w.order.CreatorId));
if (!string.IsNullOrEmpty(dto.SourceBillNo))
@@ -194,9 +194,9 @@ namespace WMS.Web.Repositories
ReceiptCustomer = s.order.Type == OutStockType.Sal
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
: _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Qty = s.detail.Qty,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Remark = s.order.Remark
@@ -361,11 +361,11 @@ namespace WMS.Web.Repositories
var boxDetail = d.BoxsDetails.FirstOrDefault(f => f.BoxId == boxId);
if (boxDetail == null) continue;
BoxDetailResponse detail = new BoxDetailResponse();
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialId);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId);
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialId);
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialNumber);
detail.MaterialNumber = d.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber);
detail.SerialNumbers = boxDetail.SerialNumbers;
detail.MaterialId = d.MaterialId;
detail.MaterialId = 0;
detail.Qty = boxDetail.Qty;
details.Add(detail);
}

14
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -232,7 +232,7 @@ namespace WMS.Web.Repositories
if (companyId == 0)
companyId = _loginRepositories.CompanyId;
#region erp基础资料
List<int> mIds = new List<int>();
List<string> mNumber = new List<string>();
var materials_result = await _erpService.BillQueryForMaterial();
List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
if (materials_result.IsSuccess)
@@ -241,10 +241,10 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
if (materials != null)
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialId).ToList();
).Select(s => s.MaterialNumber).ToList();
}
//取组织
@@ -278,7 +278,7 @@ namespace WMS.Web.Repositories
query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type != OutStockType.Sal);
}
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
query = query.Where(w => mNumber.Contains(w.detail.MaterialNumber));
if (dto.Ids.Count() > 0)
query = query.Where(w => dto.Ids.Contains(w.detail.Id));
if (!string.IsNullOrEmpty(dto.SourceBillNo))
@@ -324,9 +324,9 @@ namespace WMS.Web.Repositories
ReceiptCustomer = s.order.Type == OutStockType.Sal
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
: _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Remark = s.detail.Remark
#endregion

14
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -117,9 +117,9 @@ namespace WMS.Web.Repositories
if (s == null) return null;
SerialNumbersResponse respone = new SerialNumbersResponse()
{
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
MaterialNumber = s.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
CompleteCartonTime = s.CompleteCartonTime.DateToStringSeconds(),
InStockTime = s.InStockTime.DateToStringSeconds(),
OutStockTime = s.OutStockTime.DateToStringSeconds(),
@@ -209,10 +209,10 @@ namespace WMS.Web.Repositories
response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
response.SubStockId = entity?.boxInventory?.SubStockId ?? 0;
response.SerialNumber = entity.serial.SerialNumber;
response.MaterialId = entity.serial.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialId);
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.serial.MaterialId);
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialId);
response.MaterialId = 0;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
if (entity.boxInventory != null)
response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;

14
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -196,7 +196,7 @@ namespace WMS.Web.Repositories
if (companyId == 0)
companyId = _loginRepositories.CompanyId;
//1.获取物料集合
List<int> mIds = new List<int>();
List<string> mNumber = new List<string>();
var materials_result = await _erpService.BillQueryForMaterial();
List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
if (materials_result.IsSuccess)
@@ -205,10 +205,10 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
if (materials != null)
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialId).ToList();
).Select(s => s.MaterialNumber).ToList();
}
//金蝶子仓库
var subStock_result = await _erpService.BillQueryForSubStock();
@@ -225,7 +225,7 @@ namespace WMS.Web.Repositories
.Where(adv => 1 == 1 && adv.detail.FinalQty > 0);
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
query = query.Where(w => mNumber.Contains(w.detail.MaterialNumber));
if (dto.ResultType != null)
query = query.Where(w => w.order.ResultType == (TakeStockType)dto.ResultType);
if (!string.IsNullOrEmpty(dto.BillNo))
@@ -261,9 +261,9 @@ namespace WMS.Web.Repositories
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId),
Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
BeforeQty = s.detail.BeforeQty,
AfterQty = s.detail.AfterQty,
FinalQty = s.detail.FinalQty,