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-10-30 18:12:39 +08:00
parent 3b8558b793 5204009b21
commit bcedfe0189
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -19,6 +19,10 @@ RUN apt-get update -qq && apt-get -y install libgdiplus libc6-dev
EXPOSE 80
EXPOSE 443
COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml", "/app/WMS.Web.Api.xml"]
COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml", "/app/WMS.Web.Core.xml"]
COPY ["src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml", "/app/WMS.Web.Domain.xml"]
FROM registry.cn-hangzhou.aliyuncs.com/yz-ops/base-module:aspnetsdk3.1 AS build
WORKDIR /src
COPY ["src/WMS.Web.Api/WMS.Web.Api.csproj", "src/WMS.Web.Api/"]

3
src/WMS.Web.Api/Startup.cs
View File

@@ -9,10 +9,12 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Http;
using Microsoft.Extensions.Logging;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerUI;
using System;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Domain.Options;
@@ -46,6 +48,7 @@ namespace WMS.Web.Api
builder.AddDbContext(
opt => { opt.UseMySql(option.DBConnectionString, serverVersion); });
});
services.AddControllers();
//<2F>Ƴ<EFBFBD><C6B3><EFBFBD>http<74><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>Լ<EFBFBD><D4BC><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD>ַhttps://docs.microsoft.com/zh-cn/dotnet/core/compatibility/aspnet-core/5.0/http-httpclient-instances-log-integer-status-codes<65><73>
services.RemoveAll<IHttpMessageHandlerBuilderFilter>();

2
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -57,7 +57,7 @@ namespace WMS.Web.Domain.Services
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isSuccess = true;
entity = await _outStockRepositories.Add(entity, true);
entity = await _outStockRepositories.Add(entity, false);
if (entity == null) isRollback = true;
//提交事务

2
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -52,7 +52,7 @@ namespace WMS.Web.Domain.Services
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isSuccess = true;
entity = await _takeStockRepositories.Add(entity, true);
entity = await _takeStockRepositories.Add(entity, false);
if (entity == null) isRollback = true;
//提交事务