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

修改了非采购上架，但没完全好

Browse Source
This commit is contained in:
18923810322
2025-05-14 15:36:06 +08:00
parent e0074faba1
commit 36d34a9bbe
1 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -320,7 +320,14 @@ namespace WMS.Web.Domain.Services
{ {
//获取序列号信息 //获取序列号信息
var serialNumbers = inStock.Details.SelectMany(s => s.SerialNumbers).ToList(); var serialNumbers = inStock.Details.SelectMany(s => s.SerialNumbers).ToList();
var TwoserialNumbers = inStock.Details.SelectMany(s => s.TwoSerialNumbers).ToList();
////开始添加
//var twoserialNumbers = inStock.Details.SelectMany(s => s.TwoSerialNumbers).ToList();
//serialNumbers.AddRange(twoserialNumbers);
////add by yzh
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers); var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
var TwoentityList = await _serialNumbersRepositories.GetEntityList(TwoserialNumbers);
var boxIds = inStock.Details.Select(s => s.BoxId).ToList(); var boxIds = inStock.Details.Select(s => s.BoxId).ToList();
var boxList = await _boxRepositories.GetEntityList(boxIds); var boxList = await _boxRepositories.GetEntityList(boxIds);
var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId); var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
@@ -331,9 +338,11 @@ namespace WMS.Web.Domain.Services
bool isRollback = false; bool isRollback = false;
bool isSuccess = true; bool isSuccess = true;
List<SerialNumberOperate> sList = new List<SerialNumberOperate>(); List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
// boxId = 0;
foreach (var entity in entityList) foreach (var entity in entityList)
{ {
var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0; int boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId); var box = boxList.FirstOrDefault(f => f.Id == boxId);
var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode);
@@ -356,8 +365,43 @@ namespace WMS.Web.Domain.Services
+ "\r\n" + "仓位号:" + subStock + "\r\n" + "仓位号:" + subStock
}; };
sList.Add(op); sList.Add(op);
} }
//if (TwoentityList != null)
//{
// foreach (var entity in TwoentityList)
// {
// var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
// var box = boxList.FirstOrDefault(f => f.Id == boxId);
// var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
// var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode);
// //修改序列号和箱绑定关系
// entity.InStock(instockDetail.SourceBillNo, inStock.Type);
// entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
// //记录序列号操作日志
// SerialNumberOperate op = new SerialNumberOperate()
// {
// MaterialNumber = entity.MaterialNumber,
// SerialNumber = entity.SerialNumber,
// OrgId = box?.OrgId ?? 0,
// SupplierId = box?.SupplierId ?? 0,
// OperateTime = DateTime.Now,
// OperateType = InStockTypeConvert(inStock.Type),
// OperateUser = userName,
// Remark = "来源单号:" + inStock.Details.First().SourceBillNo
// + "\r\n" + "入库单号:" + inStock.BillNo
// + "\r\n" + "仓位号:" + subStock
// };
// sList.Add(op);
// }
// isSuccess = await _serialNumbersRepositories.EditEntityList(TwoentityList, false);
//}
isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false);
//序列号操作记录 //序列号操作记录
var res = await this.SerialNumberOperate(sList, false); var res = await this.SerialNumberOperate(sList, false);
//提交事务 //提交事务