xiufubug
This commit is contained in:
@@ -51,7 +51,7 @@ namespace WMS.Web.Api.Controllers
|
|||||||
//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>() { "CKRW00000339" });
|
var b = await _outStockTaskService.Sync(new List<string>() { "CKRW00000346" });
|
||||||
//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";
|
||||||
|
|||||||
@@ -288,14 +288,14 @@ namespace WMS.Web.Repositories
|
|||||||
BillNo = s.order.BillNo,
|
BillNo = s.order.BillNo,
|
||||||
Status = s.order.Status.GetRemark(),
|
Status = s.order.Status.GetRemark(),
|
||||||
Type = s.order.Type.GetRemark(),
|
Type = s.order.Type.GetRemark(),
|
||||||
AccruedQty=s.detail.AccruedQty,
|
AccruedQty = s.detail.AccruedQty,
|
||||||
RealityQty=s.detail.RealityQty,
|
RealityQty = s.detail.RealityQty,
|
||||||
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
||||||
OperateTime=s.order.OperateTime.DateToStringSeconds(),
|
OperateTime = 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.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
|
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
|
||||||
SourceBillNoList = s.detail.ErpDetails.Select(s=>s.SourceBillNo).ToList(),
|
SourceBillNoList = s.detail.ErpDetails.Select(s => s.SourceBillNo).ToList(),
|
||||||
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
|
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
|
||||||
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
||||||
ReceiptCustomer = s.order.Type == OutStockType.Sal
|
ReceiptCustomer = s.order.Type == OutStockType.Sal
|
||||||
@@ -305,6 +305,7 @@ namespace WMS.Web.Repositories
|
|||||||
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),
|
||||||
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
|
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
|
||||||
|
Remark = s.detail.Remark
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
|||||||
Reference in New Issue
Block a user