zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

集成Redis
wanggang 2 years ago
parent
b63d195b25 faa528ca94
commit
a9db5b3eaa
11 changed files with 178 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json
  2. 58
      be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json
  3. 4
      be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Win_in.Sfs.Wms.Dashboard.Host.csproj
  4. 58
      be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json
  5. 18
      be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql
  6. 2
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
  7. 4
      be/Modules/Shared/src/Win_in.Sfs.Shared.Application/CachingExtensions.cs
  8. 43
      be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs
  9. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
  10. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobManager.cs
  11. 55
      build/src/docker/publish/conf/settings/appsettings.Development.json

58
be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json
View File

@ -1,34 +1,34 @@
{ {
"ConfigServer": "http://localhost:21093", "ConfigServer": "http://localhost:21093",
"ConfigServer.Docker": "http://gateway:21093", "ConfigServer.Docker": "http://gateway:21093",
"ConnectionStrings": { //"ConnectionStrings": {
"Default": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", // "Default": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;",
"Auth": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" // "Auth": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;"
}, //},
"SwaggerAuthServer": { //"SwaggerAuthServer": {
"Authority": "http://localhost:59093", // "Authority": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, //},
"IdentityServer": { //"IdentityServer": {
"Clients": { // "Clients": {
"Auth_Web": { // "Auth_Web": {
"ClientId": "Auth_Web", // "ClientId": "Auth_Web",
"RootUrl": "http://localhost:59093/", // "RootUrl": "http://localhost:59093/",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, // },
"Auth_App": { // "Auth_App": {
"ClientId": "Auth_App", // "ClientId": "Auth_App",
"ClientSecret": "1q2w3e*", // "ClientSecret": "1q2w3e*",
"RootUrl": "http://localhost:59093", // "RootUrl": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, // },
"Auth_Swagger": { // "Auth_Swagger": {
"ClientId": "Auth_Swagger", // "ClientId": "Auth_Swagger",
"ClientSecret": "1q2w3e*", // "ClientSecret": "1q2w3e*",
"RootUrl": "http://localhost:59093", // "RootUrl": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
} // }
} // }
} //}
} }

58
be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json
View File

@ -1,34 +1,34 @@
{ {
"ConfigServer": "http://localhost:21093", "ConfigServer": "http://localhost:21093",
"ConfigServer.Docker": "http://gateway:21093", "ConfigServer.Docker": "http://gateway:21093",
"ConnectionStrings": { //"ConnectionStrings": {
"Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", // "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;",
"Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" // "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;"
}, //},
"SwaggerAuthServer": { //"SwaggerAuthServer": {
"Authority": "http://localhost:59093", // "Authority": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, //},
"IdentityServer": { //"IdentityServer": {
"Clients": { // "Clients": {
"Auth_Web": { // "Auth_Web": {
"ClientId": "Auth_Web", // "ClientId": "Auth_Web",
"RootUrl": "http://localhost:59093/", // "RootUrl": "http://localhost:59093/",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, // },
"Auth_App": { // "Auth_App": {
"ClientId": "Auth_App", // "ClientId": "Auth_App",
"ClientSecret": "1q2w3e*", // "ClientSecret": "1q2w3e*",
"RootUrl": "http://localhost:59093", // "RootUrl": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, // },
"Auth_Swagger": { // "Auth_Swagger": {
"ClientId": "Auth_Swagger", // "ClientId": "Auth_Swagger",
"ClientSecret": "1q2w3e*", // "ClientSecret": "1q2w3e*",
"RootUrl": "http://localhost:59093", // "RootUrl": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
} // }
} // }
} //}
} }

4
be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Win_in.Sfs.Wms.Dashboard.Host.csproj
View File

@ -48,8 +48,8 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <!--<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="if $(ConfigurationName) == Release (powershell Compress-Archive -Path '$(TargetDir)Win_in*.dll','$(TargetDir)Win_in*.pdb' -DestinationPath '$(SolutionDir)Output\DashboardHost.zip' -Force)" /> <Exec Command="if $(ConfigurationName) == Release (powershell Compress-Archive -Path '$(TargetDir)Win_in*.dll','$(TargetDir)Win_in*.pdb' -DestinationPath '$(SolutionDir)Output\DashboardHost.zip' -Force)" />
</Target> </Target>-->
</Project> </Project>

58
be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json
View File

@ -1,34 +1,34 @@
{ {
"ConfigServer": "http://localhost:21093", "ConfigServer": "http://localhost:21093",
"ConfigServer.Docker": "http://gateway:21093", "ConfigServer.Docker": "http://gateway:21093",
"ConnectionStrings": { //"ConnectionStrings": {
"Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", // "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;",
"Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" // "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;"
}, //},
"SwaggerAuthServer": { //"SwaggerAuthServer": {
"Authority": "http://localhost:59093", // "Authority": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, //},
"IdentityServer": { //"IdentityServer": {
"Clients": { // "Clients": {
"Auth_Web": { // "Auth_Web": {
"ClientId": "Auth_Web", // "ClientId": "Auth_Web",
"RootUrl": "http://localhost:59093/", // "RootUrl": "http://localhost:59093/",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, // },
"Auth_App": { // "Auth_App": {
"ClientId": "Auth_App", // "ClientId": "Auth_App",
"ClientSecret": "1q2w3e*", // "ClientSecret": "1q2w3e*",
"RootUrl": "http://localhost:59093", // "RootUrl": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
}, // },
"Auth_Swagger": { // "Auth_Swagger": {
"ClientId": "Auth_Swagger", // "ClientId": "Auth_Swagger",
"ClientSecret": "1q2w3e*", // "ClientSecret": "1q2w3e*",
"RootUrl": "http://localhost:59093", // "RootUrl": "http://localhost:59093",
"RequireHttpsMetadata": "false" // "RequireHttpsMetadata": "false"
} // }
} // }
} //}
} }

18
be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql
View File

@ -2957,6 +2957,7 @@ CREATE TABLE [Store_DeliverNoteDetail] (
[ItemDesc1] nvarchar(64) NULL, [ItemDesc1] nvarchar(64) NULL,
[ItemDesc2] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL,
[ItemCode] nvarchar(64) NOT NULL, [ItemCode] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[FromPackingCode] nvarchar(64) NOT NULL, [FromPackingCode] nvarchar(64) NOT NULL,
@ -2993,7 +2994,6 @@ CREATE TABLE [Store_DeliverNoteDetail] (
[RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationGroup] nvarchar(64) NULL,
[RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL,
[RecommendFromWarehouseCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -3411,6 +3411,7 @@ CREATE TABLE [Store_IssueNoteDetail] (
[ItemDesc1] nvarchar(64) NULL, [ItemDesc1] nvarchar(64) NULL,
[ItemDesc2] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL,
[ItemCode] nvarchar(64) NOT NULL, [ItemCode] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[FromPackingCode] nvarchar(450) NULL, [FromPackingCode] nvarchar(450) NULL,
@ -3447,7 +3448,6 @@ CREATE TABLE [Store_IssueNoteDetail] (
[RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationGroup] nvarchar(64) NULL,
[RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL,
[RecommendFromWarehouseCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -3855,6 +3855,7 @@ CREATE TABLE [Store_ProductionReturnNoteDetail] (
[ItemDesc1] nvarchar(64) NULL, [ItemDesc1] nvarchar(64) NULL,
[ItemDesc2] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL,
[ItemCode] nvarchar(64) NOT NULL, [ItemCode] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[FromPackingCode] nvarchar(450) NULL, [FromPackingCode] nvarchar(450) NULL,
@ -3891,7 +3892,6 @@ CREATE TABLE [Store_ProductionReturnNoteDetail] (
[RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationGroup] nvarchar(64) NULL,
[RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL,
[RecommendToWarehouseCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -4021,6 +4021,7 @@ CREATE TABLE [Store_ProductReceiptNoteDetail] (
[LocationErpCode] nvarchar(64) NOT NULL, [LocationErpCode] nvarchar(64) NOT NULL,
[WarehouseCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL,
[Status] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[RecommendContainerCode] nvarchar(64) NULL, [RecommendContainerCode] nvarchar(64) NULL,
@ -4035,7 +4036,6 @@ CREATE TABLE [Store_ProductReceiptNoteDetail] (
[RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationGroup] nvarchar(64) NULL,
[RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL,
[RecommendToWarehouseCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -4279,6 +4279,7 @@ CREATE TABLE [Store_PurchaseReceiptNoteDetail] (
[LocationErpCode] nvarchar(64) NOT NULL, [LocationErpCode] nvarchar(64) NOT NULL,
[WarehouseCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL,
[Status] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[RecommendContainerCode] nvarchar(64) NULL, [RecommendContainerCode] nvarchar(64) NULL,
@ -4293,7 +4294,6 @@ CREATE TABLE [Store_PurchaseReceiptNoteDetail] (
[RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationGroup] nvarchar(64) NULL,
[RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL,
[RecommendToWarehouseCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -4378,6 +4378,7 @@ CREATE TABLE [Store_PurchaseReturnNoteDetail] (
[LocationErpCode] nvarchar(64) NOT NULL, [LocationErpCode] nvarchar(64) NOT NULL,
[WarehouseCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL,
[Status] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[RecommendContainerCode] nvarchar(64) NULL, [RecommendContainerCode] nvarchar(64) NULL,
@ -4392,7 +4393,6 @@ CREATE TABLE [Store_PurchaseReturnNoteDetail] (
[RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationGroup] nvarchar(64) NULL,
[RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL,
[RecommendFromWarehouseCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -4466,6 +4466,7 @@ CREATE TABLE [Store_PutawayNoteDetail] (
[ItemDesc1] nvarchar(64) NULL, [ItemDesc1] nvarchar(64) NULL,
[ItemDesc2] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL,
[ItemCode] nvarchar(64) NOT NULL, [ItemCode] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[FromPackingCode] nvarchar(450) NULL, [FromPackingCode] nvarchar(450) NULL,
@ -4502,7 +4503,6 @@ CREATE TABLE [Store_PutawayNoteDetail] (
[RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationGroup] nvarchar(64) NULL,
[RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL,
[RecommendToWarehouseCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -4901,6 +4901,7 @@ CREATE TABLE [Store_UnplannedIssueNoteDetail] (
[LocationErpCode] nvarchar(64) NOT NULL, [LocationErpCode] nvarchar(64) NOT NULL,
[WarehouseCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL,
[Status] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[RecommendContainerCode] nvarchar(64) NULL, [RecommendContainerCode] nvarchar(64) NULL,
@ -4915,7 +4916,6 @@ CREATE TABLE [Store_UnplannedIssueNoteDetail] (
[RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationGroup] nvarchar(64) NULL,
[RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL,
[RecommendFromWarehouseCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,
@ -5000,6 +5000,7 @@ CREATE TABLE [Store_UnplannedReceiptNoteDetail] (
[LocationErpCode] nvarchar(64) NOT NULL, [LocationErpCode] nvarchar(64) NOT NULL,
[WarehouseCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL,
[Status] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL,
[Uom] nvarchar(64) NOT NULL,
[Qty] decimal(18,6) NOT NULL, [Qty] decimal(18,6) NOT NULL,
[StdPackQty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL,
[RecommendContainerCode] nvarchar(64) NULL, [RecommendContainerCode] nvarchar(64) NULL,
@ -5014,7 +5015,6 @@ CREATE TABLE [Store_UnplannedReceiptNoteDetail] (
[RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationGroup] nvarchar(64) NULL,
[RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL,
[RecommendToWarehouseCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL,
[Uom] nvarchar(64) NOT NULL,
[RecommendQty] decimal(18,6) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL,
[HandledContainerCode] nvarchar(64) NULL, [HandledContainerCode] nvarchar(64) NULL,
[HandledPackingCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL,

2
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
View File

@ -70,7 +70,7 @@ public class JobController : AbpController
/// 获取全部任务数量统计 /// 获取全部任务数量统计
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("")] [HttpGet("{isToday}")]
public virtual async Task<ListResultDto<JobCountDto>> CountAsync(bool isToday) public virtual async Task<ListResultDto<JobCountDto>> CountAsync(bool isToday)
{ {
var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);

4
be/Modules/Shared/src/Win_in.Sfs.Shared.Application/CachingExtensions.cs
View File

@ -27,6 +27,10 @@ public static class CachingExtensions
{ {
TCacheItem cacheItem; TCacheItem cacheItem;
//return await factory.Invoke().ConfigureAwait(false);
//todo 有问题 时间转换 坑坑坑
var result = await cache.GetAsync(key).ConfigureAwait(false); var result = await cache.GetAsync(key).ConfigureAwait(false);
if (result == null) if (result == null)
{ {

43
be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs
View File

@ -1,10 +1,15 @@
using System; using System;
using System.Configuration;
using System.Data; using System.Data;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using DocumentFormat.OpenXml.InkML;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
@ -20,6 +25,7 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using NUglify.Helpers; using NUglify.Helpers;
using Serilog.Formatting.Json;
using StackExchange.Redis; using StackExchange.Redis;
using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerGen;
using Volo.Abp; using Volo.Abp;
@ -35,8 +41,11 @@ using Volo.Abp.Content;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Guids; using Volo.Abp.Guids;
using Volo.Abp.Json;
using Volo.Abp.Json.SystemTextJson.JsonConverters;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.Timing;
using Win_in.Sfs.Shared.Application; using Win_in.Sfs.Shared.Application;
using Win_in.Sfs.Shared.Application.Contracts.ExportAndImport; using Win_in.Sfs.Shared.Application.Contracts.ExportAndImport;
using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Domain.Shared;
@ -70,6 +79,7 @@ public abstract class ModuleBase<T> : AbpModule where T : AbpModule
ConfigureAutoApiControllers(); ConfigureAutoApiControllers();
ConfigureSwaggerServices(); ConfigureSwaggerServices();
ConfigureAddCors(); ConfigureAddCors();
Configure();
SetFormLimit(); SetFormLimit();
ConfigureExceptionHanding(); ConfigureExceptionHanding();
} }
@ -238,6 +248,8 @@ public abstract class ModuleBase<T> : AbpModule where T : AbpModule
protected virtual void Configure() protected virtual void Configure()
{ {
//todo 解决时间
ServiceConfigurationContext.Services.AddTransient<IJsonSerializer,ConvertAbpJson>();
} }
protected virtual void ConfigureAddCors() protected virtual void ConfigureAddCors()
@ -440,4 +452,35 @@ public abstract class ModuleBase<T> : AbpModule where T : AbpModule
options.SendExceptionsDetailsToClients = true; options.SendExceptionsDetailsToClients = true;
}); });
} }
/// <summary>
/// 为了处理abp的时间存入redis 在win环境读取出来报错
/// </summary>
public class ConvertAbpJson : IJsonSerializer
{
public T Deserialize<T>(string jsonString, bool camelCase = true)
{
return System.Text.Json.JsonSerializer.Deserialize<T>(jsonString, GetOptions(camelCase));
}
public object Deserialize(Type type, string jsonString, bool camelCase = true)
{
return System.Text.Json.JsonSerializer.Deserialize(jsonString, type, GetOptions(camelCase));
}
public string Serialize(object obj, bool camelCase = true, bool indented = false)
{
return System.Text.Json.JsonSerializer.Serialize(obj, GetOptions(camelCase, indented));
}
private System.Text.Json.JsonSerializerOptions GetOptions(bool camelCase = true, bool indented = false)
{
return new System.Text.Json.JsonSerializerOptions
{
PropertyNameCaseInsensitive = camelCase,
WriteIndented = indented,
ReferenceHandler = ReferenceHandler.IgnoreCycles
};
}
}
} }

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
View File

@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Volo.Abp; using Volo.Abp;
using Win_in.Sfs.Basedata.Application.Contracts; using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Wms.Store.Domain;
@ -57,7 +58,7 @@ public class PurchaseOrderAppService :
foreach (var purchaseOrder in addList) foreach (var purchaseOrder in addList)
{ {
purchaseOrder.CreatorId = CurrentUser.Id; purchaseOrder.CreatorId = CurrentUser.Id;
purchaseOrder.Worker = CurrentUser.Name; purchaseOrder.Worker = CurrentUser.GetName();
var supplierDto = var supplierDto =
await _supplierAppService.GetByCodeAsync(purchaseOrder.SupplierCode).ConfigureAwait(false); await _supplierAppService.GetByCodeAsync(purchaseOrder.SupplierCode).ConfigureAwait(false);

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobManager.cs
View File

@ -52,6 +52,8 @@ public class PurchaseReceiptJobManager : SfsJobManagerBase<PurchaseReceiptJob, P
//修改子表数据 //修改子表数据
foreach (var detail in entity.Details) foreach (var detail in entity.Details)
{ {
if (detail.PurchaseReceiptInspectStatus == EnumPurchaseReceiptInspect.INSP)//缺货 if (detail.PurchaseReceiptInspectStatus == EnumPurchaseReceiptInspect.INSP)//缺货
{ {
detail.PurchaseReceiptInspectStatus = EnumPurchaseReceiptInspect.NORECEIPT; detail.PurchaseReceiptInspectStatus = EnumPurchaseReceiptInspect.NORECEIPT;

55
build/src/docker/publish/conf/settings/appsettings.Development.json
View File

@ -1,5 +1,5 @@
{ {
"AlwaysAllowAuthorization": "True", "AlwaysAllowAuthorization": "true",
"App": { "App": {
"CorsOrigins": [ "CorsOrigins": [
"http://localhost:59080", "http://localhost:59080",
@ -45,7 +45,7 @@
}, },
"AuthServer": { "AuthServer": {
"Audience": "Auth", "Audience": "Auth",
"Authority": "http://dev.ccwin-in.com:21293/", "Authority": "http://dev.ccwin-in.com:60083/",
"ClientId": "Auth_App", "ClientId": "Auth_App",
"ClientSecret": "1q2w3E*", "ClientSecret": "1q2w3E*",
"RequireHttpsMetadata": "false", "RequireHttpsMetadata": "false",
@ -74,28 +74,28 @@
// "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" // "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;"
// }, // },
"ConnectionStrings": { "ConnectionStrings": {
"AbpAuditLogging": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpAuditLogging": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpBackgroundJobs": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpBackgroundJobs": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpBlobStoring": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpBlobStoring": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpFeatureManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpFeatureManagement": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpIdentity": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpIdentity": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpIdentityServer": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpIdentityServer": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpPermissionManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpPermissionManagement": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpSettingManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpSettingManagement": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"AbpTenantManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "AbpTenantManagement": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Auth": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Auth": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Basedata": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Basedata": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"DataExchange": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "DataExchange": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"FileStorage": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "FileStorage": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Inventory": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Inventory": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Job": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Job": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Label": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Label": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Message": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Message": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
"Store": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" "Store": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;"
}, },
"IdentityClients": { "IdentityClients": {
"Default": { "Default": {
"Authority": "http://dev.ccwin-in.com:21293", "Authority": "http://dev.ccwin-in.com:60083",
"ClientId": "Auth_App", "ClientId": "Auth_App",
"ClientSecret": "1q2w3E*", "ClientSecret": "1q2w3E*",
"GrantType": "client_credentials", "GrantType": "client_credentials",
@ -107,19 +107,20 @@
"Redis": { "Redis": {
"Configuration": "localhost:21194", "Configuration": "localhost:21194",
"KeyPrefix": "Wms:" "KeyPrefix": "Wms:"
//"IsEnabled": "false"
}, },
"RemoteServices": { "RemoteServices": {
"Auth": { "Auth": {
"BaseUrl": "http://dev.ccwin-in.com:21293/" "BaseUrl": "http://localhost:59093/"
}, },
"BaseData": { "BaseData": {
"BaseUrl": "http://dev.ccwin-in.com:21294/" "BaseUrl": "http://localhost:59094/"
}, },
"Default": { "Default": {
"BaseUrl": "http://dev.ccwin-in.com:21293/" "BaseUrl": "http://localhost:59093/"
}, },
"FileStorage": { "FileStorage": {
"BaseUrl": "http://dev.ccwin-in.com:21292/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
}, },
"Inventory": { "Inventory": {
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://localhost:59095/"
@ -128,10 +129,10 @@
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://localhost:59095/"
}, },
"Label": { "Label": {
"BaseUrl": "http://dev.ccwin-in.com:21292/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
}, },
"Message": { "Message": {
"BaseUrl": "http://dev.ccwin-in.com:21292/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
}, },
"Store": { "Store": {
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://localhost:59095/"

Write Preview
Loading…
Cancel
Save