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

调整仓库类型

Browse Source
This commit is contained in:
18942506660
2023-11-09 14:39:05 +08:00
parent f964567193
commit 3d893136e4
16 changed files with 99 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2690,9 +2690,9 @@
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse">
@@ -2825,9 +2825,9 @@
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryRequest.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStock.SaveOutStockRequest">
@@ -3155,7 +3155,7 @@
盘点结果类型：1为盘盈，2位盘亏
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest.StockCode">
<summary>
仓库ID
</summary>

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

@@ -661,14 +661,14 @@
箱号ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockId">
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockCode">
<summary>
原仓位ID
原仓位编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockId">
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockCode">
<summary>
目标仓位ID
目标仓位编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.Qty">
@@ -793,14 +793,14 @@
物料Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.StockId">
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.StockCode">
<summary>
仓库ID
仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockId">
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockCode">
<summary>
仓位ID
仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.Qty">
@@ -919,12 +919,12 @@
物料Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.StockId">
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.StockCode">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockId">
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockCode">
<summary>
仓位ID
</summary>
@@ -1044,17 +1044,17 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.StockId">
<member name="P:WMS.Web.Domain.Entitys.TakeStock.StockCode">
<summary>
仓库ID
仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockId">
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockCode">
<summary>
仓位ID
仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockId">
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockCode">
<summary>
子仓库(跟金蝶交互字段)
</summary>

4
src/WMS.Web.Core/Dto/OutStock/OutStockQueryRequest.cs
View File

@@ -46,8 +46,8 @@ namespace WMS.Web.Core.Dto.OutStock
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
///</summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
}
}

4
src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryRequest.cs
View File

@@ -46,8 +46,8 @@ namespace WMS.Web.Core.Dto.OutStockTask
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
///</summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
}
}

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

@@ -16,7 +16,7 @@ namespace WMS.Web.Core.Dto.TakeStock
/// <summary>
/// 仓库ID
/// </summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 单据编号
/// </summary>

12
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -26,15 +26,15 @@ namespace WMS.Web.Domain.Entitys
[Column("BoxId")]
public int BoxId { get; set; }
/// <summary>
/// 原仓位ID
/// 原仓位编码
/// </summary>
[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; }
[Column("SrcSubStockCode")]
public string SrcSubStockCode { get; set; }
/// <summary>
/// 目标仓位ID
/// 目标仓位编码
/// </summary>
[Column("DestSubStockId")]
public int DestSubStockId { get; set; }
[Column("DestSubStockCode")]
public string DestSubStockCode { get; set; }
/// <summary>
/// 数量
/// </summary>

12
src/WMS.Web.Domain/Entitys/OutStockDetails.cs
View File

@@ -38,15 +38,15 @@ namespace WMS.Web.Domain.Entitys
[Column("MaterialId")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
/// 仓库
///</summary>
[Column("StockId")]
public int StockId { get; set; }
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位
///</summary>
[Column("SubStockId")]
public int? SubStockId { get; set; }
[Column("SubStockCode")]
public string SubStockCode { get; set; }
/// <summary>
/// 出库数量
///</summary>

2
src/WMS.Web.Domain/Entitys/OutStockTask.cs
View File

@@ -155,7 +155,7 @@ namespace WMS.Web.Domain.Entitys
var details = list.SelectMany(s => s.Details).ToList();
if (details.GroupBy(g => g.StockId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
if (details.GroupBy(g => g.StockCode).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
//清空数据绑定
foreach (var d in details)

8
src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
View File

@@ -39,13 +39,13 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 仓库ID
///</summary>
[Column("StockId")]
public int StockId { get; set; }
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
///</summary>
[Column("SubStockId")]
public int? SubStockId { get; set; }
[Column("SubStockCode")]
public string SubStockCode { get; set; }
/// <summary>
/// 应出库数量
///</summary>

16
src/WMS.Web.Domain/Entitys/TakeStock.cs
View File

@@ -51,20 +51,20 @@ namespace WMS.Web.Domain.Entitys
[Column("MaterialId")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
/// 仓库
/// </summary>
[Column("StockId")]
public int StockId { get; set; }
[Column("StockCode")]
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位
/// </summary>
[Column("SubStockId")]
public int SubStockId { get; set; }
[Column("SubStockCode")]
public string SubStockCode { get; set; }
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>
[Column("Erp_SubStockId")]
public int Erp_SubStockId { get; set; } = 0;
[Column("Erp_SubStockCode")]
public string Erp_SubStockCode { get; set; }
/// <summary>
/// 盘点前数量（wms系统数量）
/// </summary>

30
src/WMS.Web.Domain/Services/Public/OpsService.cs
View File

@@ -34,6 +34,7 @@ namespace WMS.Web.Domain.Services.Public
public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request)
{
List<OpsBoxResponse> listss = new List<OpsBoxResponse>();
OpsBoxResponse respnose = new OpsBoxResponse();
List<OpsBoxDetailsResponse> details = new List<OpsBoxDetailsResponse>();
List<SerialNumbersResponse> ss = new List<SerialNumbersResponse>();
@@ -55,7 +56,34 @@ namespace WMS.Web.Domain.Services.Public
SerialNumbers = ss
});
respnose.Details = details;
var str = JsonConvert.SerializeObject(respnose);
listss.Add(respnose);
OpsBoxResponse respnose2 = new OpsBoxResponse();
List<OpsBoxDetailsResponse> details2 = new List<OpsBoxDetailsResponse>();
List<SerialNumbersResponse> ss2 = new List<SerialNumbersResponse>();
ss2.Add(new SerialNumbersResponse()
{
SerialNumber = "sss",
BarCereateUser = "sdf",
BarCreateTime = "20-20-20"
});
ss2.Add(new SerialNumbersResponse()
{
SerialNumber = "sss2",
BarCereateUser = "sdf2",
BarCreateTime = "20-20-20"
});
details2.Add(new OpsBoxDetailsResponse()
{
MaterialId = 1,
Qty = 1,
SerialNumbers = ss
});
respnose2.Details = details2;
listss.Add(respnose2);
var str = JsonConvert.SerializeObject(listss);
var token = await GetToken();
Dictionary<string, string> dicHeaders = new Dictionary<string, string>();

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

@@ -100,12 +100,12 @@ namespace WMS.Web.Domain.Services
public async Task<Result> Profit(TakeStock entity)
{
//获取金蝶仓库仓位编码
var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockCode);
//var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockCode);
var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto
#region 组装dto
@@ -146,12 +146,12 @@ namespace WMS.Web.Domain.Services
public async Task<Result> Loss_Profit(TakeStock entity)
{
//获取金蝶仓库仓位编码
var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
//var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto
#region 组装dto

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

@@ -107,8 +107,8 @@ namespace WMS.Web.Repositories
{
#region dto组装
Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockCode),
Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.moveBox.CreatorId),

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

@@ -142,8 +142,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.order.SuccessSync == dto.SuccessSync);
if (dto.DeliveryOrgId != null)
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
if (dto.StockId != null)
query = query.Where(w => w.detail.StockId == dto.StockId);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
@@ -159,7 +159,7 @@ namespace WMS.Web.Repositories
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync,
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
SourceBillNo = s.order.SourceBillNo,
SaleBillNo = s.detail.SaleBillNo,
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),

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

@@ -268,8 +268,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.order.Status == (OutStockStatus)dto.Status);
if (dto.DeliveryOrgId != null)
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
if (dto.StockId != null)
query = query.Where(w => w.detail.StockId == dto.StockId);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
@@ -287,7 +287,7 @@ namespace WMS.Web.Repositories
CreateTime = s.order.OperateTime.DateToStringSeconds(),
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
SourceBillNo = s.order.SourceBillNo,
SaleBillNo = s.detail.SaleBillNo,
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),

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

@@ -177,8 +177,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.ResultType == (TakeStockType)dto.ResultType);
if (!string.IsNullOrEmpty(dto.BillNo))
query = query.Where(w => EF.Functions.Like(w.BillNo, "%" + dto.BillNo + "%"));
if (dto.StockId != null)
query = query.Where(w => w.StockId == dto.StockId);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode);
if (dto.DateBeginDate != null)
query = query.Where(w => w.Date >= dto.DateBeginDate);
if (dto.DateEndDate != null)
@@ -191,8 +191,8 @@ namespace WMS.Web.Repositories
Id = s.Id,
BillNo = s.BillNo,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockId),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode),
BeforeQty = s.BeforeQty,
AfterQty = s.AfterQty,
FinalQty = s.FinalQty,