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

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-19 17:53:45 +08:00
parent 89b1026e2d
commit cd07deff45
8 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -57,8 +57,9 @@ namespace WMS.Web.Api.Controllers
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
OperateRequest dto = new OperateRequest(); OperateRequest dto = new OperateRequest();
dto.Ids.Add(65); dto.Ids.Add(54);
await _outStockService.Sync(dto, null); //await _outStockService.Sync(dto, null);
var b = await _takeStockService.Sync(dto);
// List<ErpCustomerDto> list = null; // List<ErpCustomerDto> list = null;
//var b= list.FirstOrDefault(f => f.Id == 123); //var b= list.FirstOrDefault(f => f.Id == 123);
//var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 }); //var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 });
@@ -66,24 +67,24 @@ namespace WMS.Web.Api.Controllers
//var list = await GetList(); //var list = await GetList();
//var c = await _erpService.BillQueryForSalOutStock("12709885"); //var c = await _erpService.BillQueryForSalOutStock("12709885");
//var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List<string>() { "ZZCX003061" }, DateTime.Now.AddDays(-10)); //var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List<string>() { "ZZCX003061" }, DateTime.Now.AddDays(-10));
//var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));
//var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
//var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1));
// var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); // var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10));
//var b = await _outStockTaskService.Sync(new List<string>() { "FHTZD8022232" }); //var b = await _outStockTaskService.Sync(new List<string>() { "FHTZD8022232" });
//var result = await this._outStockTaskService.Sync(null); //var result = await this._outStockTaskService.Sync(null);
//var t=await _outStockTaskRepositories.Get(1); //var t=await _outStockTaskRepositories.Get(1);
// t.Details[0].Remark = "sdf"; // t.Details[0].Remark = "sdf";
// t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";
// var s = await _outStockTaskRepositories.Edit(t); // var s = await _outStockTaskRepositories.Edit(t);
//await _boxService.Sync(list); //await _boxService.Sync(list);
//var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300));
//var result= await this._erpService.BillQueryForPurchaseInStock(); //var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg(); //var result = await this._erpService.BillQueryForOrg();
//var result = await this._erpService.BillQueryForMaterial(); //var result = await this._erpService.BillQueryForMaterial();
//if (!result.IsSuccess) //if (!result.IsSuccess)
// return ""; // return "";
//return JsonConvert.SerializeObject(result.Data); //return JsonConvert.SerializeObject(result.Data);
return ""; return "";
} }

2
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -4672,7 +4672,7 @@
仓位ID 仓位ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockId"> <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockCode">
<summary> <summary>
子仓库(跟金蝶交互字段) 子仓库(跟金蝶交互字段)
</summary> </summary>

2
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1850,7 +1850,7 @@
仓位 仓位
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.Erp_SubStockId"> <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.Erp_SubStockCode">
<summary> <summary>
子仓库(跟金蝶交互字段) 子仓库(跟金蝶交互字段)
</summary> </summary>

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

@@ -28,7 +28,7 @@ namespace WMS.Web.Core.Dto.TakeStock
/// <summary> /// <summary>
/// 子仓库(跟金蝶交互字段) /// 子仓库(跟金蝶交互字段)
/// </summary> /// </summary>
public int? Erp_SubStockId { get; set; } = 0; public string Erp_SubStockCode { get; set; }
/// <summary> /// <summary>
/// 系统库存 /// 系统库存
/// </summary> /// </summary>

4
src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
View File

@@ -53,8 +53,8 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 子仓库(跟金蝶交互字段) /// 子仓库(跟金蝶交互字段)
/// </summary> /// </summary>
[Column("Erp_SubStockId")] [Column("Erp_SubStockCode")]
public int Erp_SubStockId { get; set; } public string Erp_SubStockCode { get; set; }
/// <summary> /// <summary>
/// 系统库存 /// 系统库存
/// </summary> /// </summary>

2
src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
View File

@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.Mappers
CreateMap<SaveTakeStockRequest, TakeStockDetails>() CreateMap<SaveTakeStockRequest, TakeStockDetails>()
.ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty))) .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)))
.ForMember(x => x.Erp_SubStockId, ops => ops.MapFrom(x => x.Erp_SubStockId ?? 0)); .ForMember(x => x.Erp_SubStockCode, ops => ops.MapFrom(x => x.Erp_SubStockCode));
CreateMap<SaveTakeStockRequest, TakeStock>(); CreateMap<SaveTakeStockRequest, TakeStock>();
} }
} }

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

@@ -183,7 +183,7 @@ namespace WMS.Web.Domain.Services
foreach (var d in entity.Details) foreach (var d in entity.Details)
{ {
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId); var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId);
//var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索 //var subStock = resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId);//需要根据单点code搜索
var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId); var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId);
detils.Add(new ErpTakeStockDetailsSaveDto() detils.Add(new ErpTakeStockDetailsSaveDto()
{ {
@@ -192,7 +192,7 @@ namespace WMS.Web.Domain.Services
MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)), MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)),
UnitId = new ErpNumberDto(unitNumber), //物料带出来 UnitId = new ErpNumberDto(unitNumber), //物料带出来
StockId = new ErpNumberDto(stock.Code), StockId = new ErpNumberDto(stock.Code),
SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code), SubStockId = new ErpSubStockDto(stock.Code, d.Erp_SubStockCode),
BeforeQty = d.BeforeQty, BeforeQty = d.BeforeQty,
AfterQty = d.AfterQty, AfterQty = d.AfterQty,
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,

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

@@ -202,7 +202,7 @@ namespace WMS.Web.Repositories
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId),
Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockId), Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),