diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index b697c442..b9f9a35d 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 0a854a53..cd911da8 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -88,9 +88,10 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { + var b= await _boxService.Sync(null); //var list = await _outStockTaskRepositories.GetEntityList(new List { 14321 }); - await _outStockRepositories.GetEntityListBySerialNumbers(new List() { "131VU-32C5A" }); + //await _outStockRepositories.GetEntityListBySerialNumbers(new List() { "131VU-32C5A" }); //await _outStockRepositories.GetEntityListByBoxBillNos(new List() { "CTN0002187" }); diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index d9674c1a..45c3d93a 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -17,7 +17,7 @@ "AllowedHosts": "*", "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", "AppOptions": { - "DBConnectionString": "Server=192.168.1.253; Database=wms_db;User Id=root;password=bf69f5755f97e943;port=3306;CharSet=gb2312;Connect Timeout=150;", + "DBConnectionString": "Server=192.168.7.103; Database=wms_db;User Id=root;password=L8mrCGbPisAa6GNh;port=3306;CharSet=gb2312;Connect Timeout=150;", "RedisConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", "RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", "SingleBaseUrl": "http://47.110.156.96:8019/api", @@ -42,7 +42,7 @@ "ErpId": "ce20210909" }, "OpsOptions": { - "Url": "http://39.108.150.2:8050/", + "Url": "http://localhost:5050/", //https://api.barcode.test.f2b211.com/ "UserName": "admin", "PassWord": "888888" }, @@ -72,7 +72,7 @@ //连接字符串:键和值 "JobStoreConnectionStringKey": "quartz.dataSource.myDS.connectionString", - "JobStoreConnectionStringValue": "Server=192.168.1.253; Database=wms_db;User Id=root;password=bf69f5755f97e943;port=3306;CharSet=gb2312;Connect Timeout=150;", + "JobStoreConnectionStringValue": "Server=192.168.7.103; Database=wms_db;User Id=root;password=L8mrCGbPisAa6GNh;port=3306;CharSet=gb2312;Connect Timeout=150;", //mysql提供器:键和值 "JobStoreProviderKey": "quartz.dataSource.myDS.provider", diff --git a/src/WMS.Web.Domain/Services/Public/OpsService.cs b/src/WMS.Web.Domain/Services/Public/OpsService.cs index d4ccd455..5986933b 100644 --- a/src/WMS.Web.Domain/Services/Public/OpsService.cs +++ b/src/WMS.Web.Domain/Services/Public/OpsService.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Options; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Text; using System.Threading.Tasks; using WMS.Web.Core.Dto; @@ -34,11 +35,18 @@ namespace WMS.Web.Domain.Services.Public public async Task> GetBox(OpsBoxRequest request) { - var token = await GetToken(); + string token = ""; + string endStr = "BarCode/carton-box_api/carton-box"; + if (_option.Url.Contains("localhost") || _option.Url.Contains("barcode")) + { + endStr = "api/WmsBox/GetList"; + } + else + token = await GetToken(); Dictionary dicHeaders = new Dictionary(); dicHeaders.Add("Authorization", "Bearer " + token); //_httpClientService.BuildHttpClient(contentHeaders); - var res = await _httpClientService.PostAsync(_option.Url + "BarCode/carton-box_api/carton-box", JsonConvert.SerializeObject(request), dicHeaders); + var res = await _httpClientService.PostAsync(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders); if (!res.succeeded) return new List(); var list = JsonConvert.DeserializeObject>(res.data.date); return list;