diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index a2bfa09e..6bf88877 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 5dcf507d..a706af45 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -123,9 +123,9 @@ namespace WMS.Web.Api.Controllers //var b = b33.Data.Where(w => w.Id == 10923342).FirstOrDefault(); //await _juShuiTanService.GetTest(); //string codes = "AD"; - //var b = await _erpInventoryService.GetInventory(codes); - int count = 10 / 5; - var bcd=await _productInventoryService.LingXing(); + //var b = await _erpInventoryService.GetInventory(new List() { "111"}); + //int count = 10 / 5; + //var bcd=await _productInventoryService.LingXing(); //LingXingResponse r = new LingXingResponse(); diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index a87d8d73..b80a9f8e 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -37,10 +37,10 @@ }, "ErpOptions": { "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //原:119.23.206.129 - "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/666a6c4a522823 正式账号密码 orico/A123321./Orico/663a26829afbdd + "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd "Password": "A1B2C3Dh.", "ErpId": "ce20210909", - "ZhangTaoId": "666a6c4a522823" + "ZhangTaoId": "6723b1acf19987" }, "OpsOptions": { "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/ diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 5f2cd6fd..23377e50 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4132,7 +4132,7 @@ - 页码 + 不是页码 是从第几条数据开始 如果是第二页的话 就是1*800 diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs index d1e6be2e..c7505401 100644 --- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs +++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs @@ -93,6 +93,7 @@ namespace WMS.Web.Domain.Services OrgCode = item.OrgCode, StockCode = item.StockCode, Qty = item.Qty, + Batch=item.Batch, BeforeQty = item.BeforeQty }; inventoryList.Add(entity);