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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-19 16:15:06 +08:00
parent 6ceb530c85 366e523e49
commit 89b1026e2d
6 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

2
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -373,6 +373,8 @@ namespace WMS.Web.Api.Controllers
return Result<BoxResponse>.ReFailure("箱号" + boxBillNo + "不存在", 800000); return Result<BoxResponse>.ReFailure("箱号" + boxBillNo + "不存在", 800000);
var response = res[0]; var response = res[0];
var detail = await _outStockRepositories.GetDetailsByBoxId(response.Id); var detail = await _outStockRepositories.GetDetailsByBoxId(response.Id);
if (detail.Count() == 0)
return Result<BoxResponse>.ReFailure("箱号" + boxBillNo + "未出库", 800000);
response.Details = detail; response.Details = detail;
response.TotalQty = detail.Sum(s => s.Qty); response.TotalQty = detail.Sum(s => s.Qty);
return Result<BoxResponse>.ReSuccess(response); return Result<BoxResponse>.ReSuccess(response);

1
src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
View File

@@ -46,7 +46,6 @@ namespace WMS.Web.Core.Dto.TakeStock
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
[Required(ErrorMessage = "备注不能为空")]
public string Remark { get; set; } public string Remark { get; set; }
} }
} }

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

@@ -370,7 +370,7 @@ namespace WMS.Web.Domain.Services
//获取序列号信息 //获取序列号信息
var serialNumbers = backRecord.Details.SelectMany(s => s.SerialNumbers).ToList(); var serialNumbers = backRecord.Details.SelectMany(s => s.SerialNumbers).ToList();
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers); var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
var boxIds = entityList.Select(s => s.BoxId).ToList(); var boxIds = backRecord.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);

97
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -164,53 +164,64 @@ namespace WMS.Web.Domain.Services
//获取金蝶仓库仓位编码 //获取金蝶仓库仓位编码
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId); //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
//var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId); //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var materials_result = await _erpService.BillQueryForMaterial(); try
var materials = materials_result.Data.ToList(); {
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) return Result.ReFailure(ResultCodes.ErpMaterialError);
var materials = materials_result.Data.ToList();
var res = await _erpService.BillQueryForStock(); var res = await _erpService.BillQueryForStock();
var resSub = await _erpService.BillQueryForSubStock(); if (!res.IsSuccess) return Result.ReFailure(ResultCodes.ErpStockError);
var stock = res.Data.FirstOrDefault(f => f.Code == entity.Details[0].StockCode);//需要根据单点code搜索 var resSub = await _erpService.BillQueryForSubStock();
if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData); if (!resSub.IsSuccess) return Result.ReFailure(ResultCodes.ErpStockError);
//组装dto var stock = res.Data.FirstOrDefault(f => f.Code == entity.Details[0].StockCode);//需要根据单点code搜索
#region 组装dto if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004 //组装dto
List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>(); #region 组装dto
foreach (var d in entity.Details) //子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004
{ List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId); foreach (var d in entity.Details)
var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId);
detils.Add(new ErpTakeStockDetailsSaveDto()
{ {
FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()), var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId);
FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()), //var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)), var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId);
UnitId = new ErpNumberDto(unitNumber), //物料带出来 detils.Add(new ErpTakeStockDetailsSaveDto()
StockId = new ErpNumberDto(stock.Code), {
SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code), FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()),
BeforeQty = d.BeforeQty, FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()),
AfterQty = d.AfterQty, MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)),
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, UnitId = new ErpNumberDto(unitNumber), //物料带出来
LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, StockId = new ErpNumberDto(stock.Code),
Fnote = d.Remark SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code),
}); BeforeQty = d.BeforeQty,
AfterQty = d.AfterQty,
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,
LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0,
Fnote = d.Remark
});
}
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
{
BillNo = entity.BillNo,
StockOrgId = new ErpNumberDto(stock.OrgCode),
Type = new ErpNumberDto(entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS"),
Date = entity.Date,
Details = detils
};
#endregion
//判断盘盈盘亏
FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain;
//操作金蝶
var resSync = await ErpOperate(dto, type);
entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpBillNo);
await _takeStockRepositories.Edit(entity, true);
return res;
} }
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto() catch (Exception ex)
{ {
BillNo = entity.BillNo, _logger.LogError($"盘点同步金蝶: {ex.ToString()}");
StockOrgId = new ErpNumberDto(stock.OrgCode), return Result.ReFailure(ResultCodes.NoDateError);
Type = new ErpNumberDto(entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS"), }
Date = entity.Date,
Details = detils
};
#endregion
//判断盘盈盘亏
FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain;
//操作金蝶
var resSync = await ErpOperate(dto, type);
entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpBillNo);
await _takeStockRepositories.Edit(entity, true);
return res;
} }
/// <summary> /// <summary>
/// 同步金蝶操作 /// 同步金蝶操作

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

@@ -325,15 +325,16 @@ namespace WMS.Web.Repositories
.Include(s => s.Details).ThenInclude(s => s.BoxsDetails.Where(w => w.BoxId == boxId)) .Include(s => s.Details).ThenInclude(s => s.BoxsDetails.Where(w => w.BoxId == boxId))
.Where(f => f.Details.SelectMany(s => s.BoxsDetails).Where(w => w.BoxId == boxId).Any()) .Where(f => f.Details.SelectMany(s => s.BoxsDetails).Where(w => w.BoxId == boxId).Any())
.OrderByDescending(o => o.Id) .OrderByDescending(o => o.Id)
.FirstAsync(); .ToListAsync();
List<BoxDetailResponse> details = new List<BoxDetailResponse>(); List<BoxDetailResponse> details = new List<BoxDetailResponse>();
if (res.Count() == 0) return details;
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (!materials_result.IsSuccess)
return new List<BoxDetailResponse>(); return new List<BoxDetailResponse>();
var materials = materials_result.Data.ToList(); var materials = materials_result.Data.ToList();
foreach (var d in res.Details) foreach (var d in res.First().Details)
{ {
var boxDetail = d.BoxsDetails.FirstOrDefault(f => f.BoxId == boxId); var boxDetail = d.BoxsDetails.FirstOrDefault(f => f.BoxId == boxId);
if (boxDetail == null) continue; if (boxDetail == null) continue;
@@ -341,7 +342,7 @@ namespace WMS.Web.Repositories
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialId); detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialId);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId); detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId);
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialId); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialId);
detail.SerialNumbers = d.SerialNumbers; detail.SerialNumbers = boxDetail.SerialNumbers;
detail.MaterialId = d.MaterialId; detail.MaterialId = d.MaterialId;
detail.Qty = boxDetail.Qty; detail.Qty = boxDetail.Qty;
details.Add(detail); details.Add(detail);