diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 2b78b0d1..5050fef4 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 98ce27f2..607bc7d5 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -112,15 +112,16 @@ namespace WMS.Web.Api.Controllers //var m2 = my2.Object; //var md = m2.code; - //var b33= await _juShuiTanService.GetStock(); - // var bc = await _lingXingService.GetStock(); + //var b33= await _juShuiTanService.GetStock(); + // var bc = await _lingXingService.GetStock(); //List<(string orgCode, string stockCode)> request = new List<(string orgCode, string stockCode)>(); //request.Add(("101", "CK001")); //request.Add(("101", "CK002")); //var list = await _erpService.BillQueryForInventory(request); - - ////await _juShuiTanService.GetTest(); + //var b33 = await _juShuiTanService.GetStock(); + //var b = b33.Data.Where(w => w.Id == 10923342).FirstOrDefault(); + //await _juShuiTanService.GetTest(); //string codes = "AD"; //var b = await _erpInventoryService.GetInventory(codes); //var bcd=await _productInventoryService.Refresh(); diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs index 1d0eb823..0eb7f6f4 100644 --- a/src/WMS.Web.Repositories/BasicsRepositories.cs +++ b/src/WMS.Web.Repositories/BasicsRepositories.cs @@ -176,34 +176,34 @@ namespace WMS.Web.Repositories /// public async Task> GetUcStockByHeadOfficeAsync(string name, int companyId) { - var result = await _singleDataService.GetSysConfigData, SystemCodeRequest> - (new SystemCodeRequest("", name, companyId), - SysConfigAction.GetWmsWarehouseByHeadOfficeAndNameAndCompany); - if (!result.Success) - return null; - return result.Data.Where(w => w.ManagementSystem != null).ToList(); + //var result = await _singleDataService.GetSysConfigData, SystemCodeRequest> + //(new SystemCodeRequest("", name, companyId), + //SysConfigAction.GetWmsWarehouseByHeadOfficeAndNameAndCompany); + //if (!result.Success) + // return null; + //return result.Data.Where(w => w.ManagementSystem != null).ToList(); - //List list = new List(); - //list.Add(new UcStockHeadOfficeResponse() - //{ - // ManagementSystem=1, - // Code="CK001", - // ErpOrgCode="101" - //}); - //list.Add(new UcStockHeadOfficeResponse() - //{ - // ManagementSystem = 1, - // Code = "AD", - // ErpOrgCode = "101" - //}); - //list.Add(new UcStockHeadOfficeResponse() - //{ - // ManagementSystem=2, - // Code = "CK002", - // ErpOrgCode = "101", - // WarehouseCodeOfJushuitan = "深圳市元创时代科技有限公司." - //}) ; - //return list; + List list = new List(); + list.Add(new UcStockHeadOfficeResponse() + { + ManagementSystem = 1, + Code = "CK001", + ErpOrgCode = "101" + }); + list.Add(new UcStockHeadOfficeResponse() + { + ManagementSystem = 1, + Code = "AD", + ErpOrgCode = "101" + }); + list.Add(new UcStockHeadOfficeResponse() + { + ManagementSystem = 2, + Code = "CK002", + ErpOrgCode = "101", + WarehouseCodeOfJushuitan = "ORICO_JD" + }); + return list; } } }