18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2024-05-15 16:28:00 +08:00
parent e4dea40c01
commit db2519162e
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

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

@@ -88,9 +88,10 @@ namespace WMS.Web.Api.Controllers
[Route("hj")] [Route("hj")]
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
var b= await _boxService.Sync(null);
//var list = await _outStockTaskRepositories.GetEntityList(new List<int> { 14321 }); //var list = await _outStockTaskRepositories.GetEntityList(new List<int> { 14321 });
await _outStockRepositories.GetEntityListBySerialNumbers(new List<string>() { "131VU-32C5A" }); //await _outStockRepositories.GetEntityListBySerialNumbers(new List<string>() { "131VU-32C5A" });
//await _outStockRepositories.GetEntityListByBoxBillNos(new List<string>() { "CTN0002187" }); //await _outStockRepositories.GetEntityListByBoxBillNos(new List<string>() { "CTN0002187" });

6
src/WMS.Web.Api/appsettings.json
View File

@@ -17,7 +17,7 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080",
"AppOptions": { "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", "RedisConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2",
"RedisIpRateLimitingConnectionString": "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", "SingleBaseUrl": "http://47.110.156.96:8019/api",
@@ -42,7 +42,7 @@
"ErpId": "ce20210909" "ErpId": "ce20210909"
}, },
"OpsOptions": { "OpsOptions": {
"Url": "http://39.108.150.2:8050/", "Url": "http://localhost:5050/", //https://api.barcode.test.f2b211.com/
"UserName": "admin", "UserName": "admin",
"PassWord": "888888" "PassWord": "888888"
}, },
@@ -72,7 +72,7 @@
//连接字符串:键和值 //连接字符串:键和值
"JobStoreConnectionStringKey": "quartz.dataSource.myDS.connectionString", "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提供器:键和值 //mysql提供器:键和值
"JobStoreProviderKey": "quartz.dataSource.myDS.provider", "JobStoreProviderKey": "quartz.dataSource.myDS.provider",

12
src/WMS.Web.Domain/Services/Public/OpsService.cs
View File

@@ -4,6 +4,7 @@ using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core.Dto; using WMS.Web.Core.Dto;
@@ -34,11 +35,18 @@ namespace WMS.Web.Domain.Services.Public
public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request) public async Task<List<OpsBoxResponse>> 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<string, string> dicHeaders = new Dictionary<string, string>(); Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
dicHeaders.Add("Authorization", "Bearer " + token); dicHeaders.Add("Authorization", "Bearer " + token);
//_httpClientService.BuildHttpClient(contentHeaders); //_httpClientService.BuildHttpClient(contentHeaders);
var res = await _httpClientService.PostAsync<OpsReponse>(_option.Url + "BarCode/carton-box_api/carton-box", JsonConvert.SerializeObject(request), dicHeaders); var res = await _httpClientService.PostAsync<OpsReponse>(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders);
if (!res.succeeded) return new List<OpsBoxResponse>(); if (!res.succeeded) return new List<OpsBoxResponse>();
var list = JsonConvert.DeserializeObject<List<OpsBoxResponse>>(res.data.date); var list = JsonConvert.DeserializeObject<List<OpsBoxResponse>>(res.data.date);
return list; return list;