调整仓库类型
This commit is contained in:
@@ -2690,9 +2690,9 @@
|
|||||||
物料编码
|
物料编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest.StockId">
|
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest.StockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓库ID
|
仓库编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse">
|
<member name="T:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse">
|
||||||
@@ -2825,9 +2825,9 @@
|
|||||||
物料编码
|
物料编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryRequest.StockId">
|
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryRequest.StockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓库ID
|
仓库编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:WMS.Web.Core.Dto.OutStock.SaveOutStockRequest">
|
<member name="T:WMS.Web.Core.Dto.OutStock.SaveOutStockRequest">
|
||||||
@@ -3155,7 +3155,7 @@
|
|||||||
盘点结果类型:1为盘盈,2位盘亏
|
盘点结果类型:1为盘盈,2位盘亏
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest.StockId">
|
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest.StockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓库ID
|
仓库ID
|
||||||
</summary>
|
</summary>
|
||||||
|
|||||||
@@ -661,14 +661,14 @@
|
|||||||
箱号ID
|
箱号ID
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockId">
|
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockCode">
|
||||||
<summary>
|
<summary>
|
||||||
原仓位ID
|
原仓位编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockId">
|
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockCode">
|
||||||
<summary>
|
<summary>
|
||||||
目标仓位ID
|
目标仓位编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.Qty">
|
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.Qty">
|
||||||
@@ -793,14 +793,14 @@
|
|||||||
物料Id
|
物料Id
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.StockId">
|
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.StockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓库ID
|
仓库
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockId">
|
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SubStockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓位ID
|
仓位
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.Qty">
|
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.Qty">
|
||||||
@@ -919,12 +919,12 @@
|
|||||||
物料Id
|
物料Id
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.StockId">
|
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.StockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓库ID
|
仓库ID
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockId">
|
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SubStockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓位ID
|
仓位ID
|
||||||
</summary>
|
</summary>
|
||||||
@@ -1044,17 +1044,17 @@
|
|||||||
物料ID
|
物料ID
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.TakeStock.StockId">
|
<member name="P:WMS.Web.Domain.Entitys.TakeStock.StockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓库ID
|
仓库
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockId">
|
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockCode">
|
||||||
<summary>
|
<summary>
|
||||||
仓位ID
|
仓位
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockId">
|
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Erp_SubStockCode">
|
||||||
<summary>
|
<summary>
|
||||||
子仓库(跟金蝶交互字段)
|
子仓库(跟金蝶交互字段)
|
||||||
</summary>
|
</summary>
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ namespace WMS.Web.Core.Dto.OutStock
|
|||||||
///</summary>
|
///</summary>
|
||||||
public string MaterialNumber { get; set; }
|
public string MaterialNumber { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库ID
|
/// 仓库编码
|
||||||
///</summary>
|
///</summary>
|
||||||
public int? StockId { get; set; }
|
public string StockCode { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ namespace WMS.Web.Core.Dto.OutStockTask
|
|||||||
///</summary>
|
///</summary>
|
||||||
public string MaterialNumber { get; set; }
|
public string MaterialNumber { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库ID
|
/// 仓库编码
|
||||||
///</summary>
|
///</summary>
|
||||||
public int? StockId { get; set; }
|
public string StockCode { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace WMS.Web.Core.Dto.TakeStock
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库ID
|
/// 仓库ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? StockId { get; set; }
|
public string StockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 单据编号
|
/// 单据编号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -26,15 +26,15 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
[Column("BoxId")]
|
[Column("BoxId")]
|
||||||
public int BoxId { get; set; }
|
public int BoxId { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 原仓位ID
|
/// 原仓位编码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("SrcSubStockId")]
|
[Column("SrcSubStockCode")]
|
||||||
public int SrcSubStockId { get; set; }
|
public string SrcSubStockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 目标仓位ID
|
/// 目标仓位编码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("DestSubStockId")]
|
[Column("DestSubStockCode")]
|
||||||
public int DestSubStockId { get; set; }
|
public string DestSubStockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 数量
|
/// 数量
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -38,15 +38,15 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
[Column("MaterialId")]
|
[Column("MaterialId")]
|
||||||
public int MaterialId { get; set; }
|
public int MaterialId { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库ID
|
/// 仓库
|
||||||
///</summary>
|
///</summary>
|
||||||
[Column("StockId")]
|
[Column("StockCode")]
|
||||||
public int StockId { get; set; }
|
public string StockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓位ID
|
/// 仓位
|
||||||
///</summary>
|
///</summary>
|
||||||
[Column("SubStockId")]
|
[Column("SubStockCode")]
|
||||||
public int? SubStockId { get; set; }
|
public string SubStockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出库数量
|
/// 出库数量
|
||||||
///</summary>
|
///</summary>
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
|
|
||||||
var details = list.SelectMany(s => s.Details).ToList();
|
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)
|
foreach (var d in details)
|
||||||
|
|||||||
@@ -39,13 +39,13 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库ID
|
/// 仓库ID
|
||||||
///</summary>
|
///</summary>
|
||||||
[Column("StockId")]
|
[Column("StockCode")]
|
||||||
public int StockId { get; set; }
|
public string StockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓位ID
|
/// 仓位ID
|
||||||
///</summary>
|
///</summary>
|
||||||
[Column("SubStockId")]
|
[Column("SubStockCode")]
|
||||||
public int? SubStockId { get; set; }
|
public string SubStockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应出库数量
|
/// 应出库数量
|
||||||
///</summary>
|
///</summary>
|
||||||
|
|||||||
@@ -51,20 +51,20 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
[Column("MaterialId")]
|
[Column("MaterialId")]
|
||||||
public int MaterialId { get; set; }
|
public int MaterialId { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库ID
|
/// 仓库
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("StockId")]
|
[Column("StockCode")]
|
||||||
public int StockId { get; set; }
|
public string StockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓位ID
|
/// 仓位
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("SubStockId")]
|
[Column("SubStockCode")]
|
||||||
public int SubStockId { get; set; }
|
public string SubStockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 子仓库(跟金蝶交互字段)
|
/// 子仓库(跟金蝶交互字段)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("Erp_SubStockId")]
|
[Column("Erp_SubStockCode")]
|
||||||
public int Erp_SubStockId { get; set; } = 0;
|
public string Erp_SubStockCode { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 盘点前数量(wms系统数量)
|
/// 盘点前数量(wms系统数量)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ namespace WMS.Web.Domain.Services.Public
|
|||||||
|
|
||||||
public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request)
|
public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request)
|
||||||
{
|
{
|
||||||
|
List<OpsBoxResponse> listss = new List<OpsBoxResponse>();
|
||||||
OpsBoxResponse respnose = new OpsBoxResponse();
|
OpsBoxResponse respnose = new OpsBoxResponse();
|
||||||
List<OpsBoxDetailsResponse> details = new List<OpsBoxDetailsResponse>();
|
List<OpsBoxDetailsResponse> details = new List<OpsBoxDetailsResponse>();
|
||||||
List<SerialNumbersResponse> ss = new List<SerialNumbersResponse>();
|
List<SerialNumbersResponse> ss = new List<SerialNumbersResponse>();
|
||||||
@@ -55,7 +56,34 @@ namespace WMS.Web.Domain.Services.Public
|
|||||||
SerialNumbers = ss
|
SerialNumbers = ss
|
||||||
});
|
});
|
||||||
respnose.Details = details;
|
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();
|
var token = await GetToken();
|
||||||
Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
|
Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
|
||||||
|
|||||||
@@ -100,12 +100,12 @@ namespace WMS.Web.Domain.Services
|
|||||||
public async Task<Result> Profit(TakeStock entity)
|
public async Task<Result> Profit(TakeStock entity)
|
||||||
{
|
{
|
||||||
//获取金蝶仓库仓位编码
|
//获取金蝶仓库仓位编码
|
||||||
var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
|
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockCode);
|
||||||
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
|
//var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockCode);
|
||||||
|
|
||||||
var res = await _erpService.BillQueryForStock();
|
var res = await _erpService.BillQueryForStock();
|
||||||
var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
|
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
|
||||||
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
|
var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索
|
||||||
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
|
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
|
||||||
//组装dto
|
//组装dto
|
||||||
#region 组装dto
|
#region 组装dto
|
||||||
@@ -146,12 +146,12 @@ namespace WMS.Web.Domain.Services
|
|||||||
public async Task<Result> Loss_Profit(TakeStock entity)
|
public async Task<Result> Loss_Profit(TakeStock entity)
|
||||||
{
|
{
|
||||||
//获取金蝶仓库仓位编码
|
//获取金蝶仓库仓位编码
|
||||||
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 res = await _erpService.BillQueryForStock();
|
var res = await _erpService.BillQueryForStock();
|
||||||
var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
|
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
|
||||||
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
|
var subStock = res.Data.FirstOrDefault(f => f.Code == entity.SubStockCode);//需要根据单点code搜索
|
||||||
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
|
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
|
||||||
//组装dto
|
//组装dto
|
||||||
#region 组装dto
|
#region 组装dto
|
||||||
|
|||||||
@@ -107,8 +107,8 @@ namespace WMS.Web.Repositories
|
|||||||
{
|
{
|
||||||
#region dto组装
|
#region dto组装
|
||||||
Box = s.box.BoxBillNo,
|
Box = s.box.BoxBillNo,
|
||||||
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId),
|
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockCode),
|
||||||
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId),
|
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockCode),
|
||||||
Qty = s.moveBox.Qty,
|
Qty = s.moveBox.Qty,
|
||||||
Type = s.moveBox.Type.GetRemark(),
|
Type = s.moveBox.Type.GetRemark(),
|
||||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.moveBox.CreatorId),
|
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.moveBox.CreatorId),
|
||||||
|
|||||||
@@ -142,8 +142,8 @@ namespace WMS.Web.Repositories
|
|||||||
query = query.Where(w => w.order.SuccessSync == dto.SuccessSync);
|
query = query.Where(w => w.order.SuccessSync == dto.SuccessSync);
|
||||||
if (dto.DeliveryOrgId != null)
|
if (dto.DeliveryOrgId != null)
|
||||||
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
|
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
|
||||||
if (dto.StockId != null)
|
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||||
query = query.Where(w => w.detail.StockId == dto.StockId);
|
query = query.Where(w => w.detail.StockCode == dto.StockCode);
|
||||||
if (dto.CreateBeginDate != null)
|
if (dto.CreateBeginDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
|
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
|
||||||
if (dto.CreateEndDate != null)
|
if (dto.CreateEndDate != null)
|
||||||
@@ -159,7 +159,7 @@ namespace WMS.Web.Repositories
|
|||||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
|
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
|
||||||
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
||||||
SuccessSync = s.order.SuccessSync,
|
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,
|
SourceBillNo = s.order.SourceBillNo,
|
||||||
SaleBillNo = s.detail.SaleBillNo,
|
SaleBillNo = s.detail.SaleBillNo,
|
||||||
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
||||||
|
|||||||
@@ -268,8 +268,8 @@ namespace WMS.Web.Repositories
|
|||||||
query = query.Where(w => w.order.Status == (OutStockStatus)dto.Status);
|
query = query.Where(w => w.order.Status == (OutStockStatus)dto.Status);
|
||||||
if (dto.DeliveryOrgId != null)
|
if (dto.DeliveryOrgId != null)
|
||||||
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
|
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
|
||||||
if (dto.StockId != null)
|
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||||
query = query.Where(w => w.detail.StockId == dto.StockId);
|
query = query.Where(w => w.detail.StockCode == dto.StockCode);
|
||||||
if (dto.CreateBeginDate != null)
|
if (dto.CreateBeginDate != null)
|
||||||
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
|
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
|
||||||
if (dto.CreateEndDate != null)
|
if (dto.CreateEndDate != null)
|
||||||
@@ -287,7 +287,7 @@ namespace WMS.Web.Repositories
|
|||||||
CreateTime = s.order.OperateTime.DateToStringSeconds(),
|
CreateTime = s.order.OperateTime.DateToStringSeconds(),
|
||||||
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
|
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
|
||||||
OutStockEndTime = s.detail.OutStockEndTime.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,
|
SourceBillNo = s.order.SourceBillNo,
|
||||||
SaleBillNo = s.detail.SaleBillNo,
|
SaleBillNo = s.detail.SaleBillNo,
|
||||||
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
||||||
|
|||||||
@@ -177,8 +177,8 @@ namespace WMS.Web.Repositories
|
|||||||
query = query.Where(w => w.ResultType == (TakeStockType)dto.ResultType);
|
query = query.Where(w => w.ResultType == (TakeStockType)dto.ResultType);
|
||||||
if (!string.IsNullOrEmpty(dto.BillNo))
|
if (!string.IsNullOrEmpty(dto.BillNo))
|
||||||
query = query.Where(w => EF.Functions.Like(w.BillNo, "%" + dto.BillNo + "%"));
|
query = query.Where(w => EF.Functions.Like(w.BillNo, "%" + dto.BillNo + "%"));
|
||||||
if (dto.StockId != null)
|
if (!string.IsNullOrEmpty(dto.StockCode))
|
||||||
query = query.Where(w => w.StockId == dto.StockId);
|
query = query.Where(w => w.StockCode == dto.StockCode);
|
||||||
if (dto.DateBeginDate != null)
|
if (dto.DateBeginDate != null)
|
||||||
query = query.Where(w => w.Date >= dto.DateBeginDate);
|
query = query.Where(w => w.Date >= dto.DateBeginDate);
|
||||||
if (dto.DateEndDate != null)
|
if (dto.DateEndDate != null)
|
||||||
@@ -191,8 +191,8 @@ namespace WMS.Web.Repositories
|
|||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
BillNo = s.BillNo,
|
BillNo = s.BillNo,
|
||||||
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
|
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
|
||||||
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockId),
|
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
|
||||||
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
|
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode),
|
||||||
BeforeQty = s.BeforeQty,
|
BeforeQty = s.BeforeQty,
|
||||||
AfterQty = s.AfterQty,
|
AfterQty = s.AfterQty,
|
||||||
FinalQty = s.FinalQty,
|
FinalQty = s.FinalQty,
|
||||||
|
|||||||
Reference in New Issue
Block a user