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-07 15:57:05 +08:00
parent 92b4e3f794 ea8ea522d4
commit ae63f2b4a3
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,12 +54,12 @@ namespace WMS.Web.Api.Controllers
[Route("hj")] [Route("hj")]
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
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 });
//var r= await _takeStockService.Loss_Profit(entity.First()); //var r= await _takeStockService.Loss_Profit(entity.First());
//var list = await GetList(); //var list = await GetList();
//var c = await _erpService.BillQueryForSubStock(null,null); 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));

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

@@ -150,7 +150,10 @@ namespace WMS.Web.Repositories
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 (!string.IsNullOrEmpty(dto.StockCode)) if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.order.StockCode == dto.StockCode); {
var split = dto.StockCode.Split("_$");
query = query.Where(w => w.order.StockCode == split[0] && w.order.OrgCode == split[1]);
}
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)

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

@@ -273,7 +273,10 @@ namespace WMS.Web.Repositories
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 (!string.IsNullOrEmpty(dto.StockCode)) if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.order.StockCode == dto.StockCode); {
var split = dto.StockCode.Split("_$");
query = query.Where(w => w.order.StockCode == split[0] && w.order.OrgCode == split[1]);
}
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)

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

@@ -186,7 +186,10 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.BillNo)) if (!string.IsNullOrEmpty(dto.BillNo))
query = query.Where(w => EF.Functions.Like(w.order.BillNo, "%" + dto.BillNo + "%")); query = query.Where(w => EF.Functions.Like(w.order.BillNo, "%" + dto.BillNo + "%"));
if (!string.IsNullOrEmpty(dto.StockCode)) if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode); {
var split = dto.StockCode.Split("_$");
query = query.Where(w => w.detail.StockCode == split[0] && w.detail.OrgCode == split[1]);
}
if (dto.DateBeginDate != null) if (dto.DateBeginDate != null)
query = query.Where(w => w.order.Date >= dto.DateBeginDate); query = query.Where(w => w.order.Date >= dto.DateBeginDate);
if (dto.DateEndDate != null) if (dto.DateEndDate != null)