diff --git a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/Resources.Designer.cs b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..e6aa3a7b7
--- /dev/null
+++ b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+//
+// 此代码由工具生成。
+// 运行时版本:4.0.30319.42000
+//
+// 对此文件的更改可能会导致不正确的行为，并且如果
+// 重新生成代码，这些更改将会丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace Win_in.Sfs.Basedata.Properties {
+ using System;
+
+
+ ///
+ /// 一个强类型的资源类，用于查找本地化的字符串等。
+ ///
+ // 此类是由 StronglyTypedResourceBuilder
+ // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+ // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+ // (以 /str 作为命令选项)，或重新生成 VS 项目。
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// 返回此类使用的缓存的 ResourceManager 实例。
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Win_in.Sfs.Basedata.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// 重写当前线程的 CurrentUICulture 属性，对
+ /// 使用此强类型资源类的所有资源查找执行重写。
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/Resources.resx b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/Resources.resx
new file mode 100644
index 000000000..4fdb1b6af
--- /dev/null
+++ b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/Resources.resx
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 1.3
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application.Contracts/ISfsImportAppService.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application.Contracts/ISfsImportAppService.cs
new file mode 100644
index 000000000..98cf1c787
--- /dev/null
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application.Contracts/ISfsImportAppService.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+namespace Win_in.Sfs.Shared.Application.Contracts;
+public interface ISfsImportAppService
+{
+ Task> ImportProcessingEntityAsync(
+ Dictionary dictionary);
+}
diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs
index 11afb6f31..b58cd415a 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs
@@ -504,6 +504,7 @@ public abstract class SfsCrudWithDetailsAppServiceBase(inputFileBytes);
var modelDict = new Dictionary>();
var entityDict = new Dictionary();
+
foreach (var model in modelList)
{
// DataAnnotations 静态验证
@@ -511,6 +512,7 @@ public abstract class SfsCrudWithDetailsAppServiceBase o.Value).Any() || requestInput.IsAllowPartImport)
{
@@ -538,6 +540,8 @@ public abstract class SfsCrudWithDetailsAppServiceBase
+ /// 用来重写 导入数据时可以加工数据
+ ///
+ ///
+ ///
+ protected virtual async Task> ImportProcessingEntityAsync(Dictionary dictionary)
+ {
+ return dictionary;
+ }
+
///
/// 导入保存到数据库，可重写
///
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/Project/FuWeiDongYang/FuWeiDongYang_PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/Project/FuWeiDongYang/FuWeiDongYang_PurchaseOrderAppService.cs
new file mode 100644
index 000000000..0956485ba
--- /dev/null
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/Project/FuWeiDongYang/FuWeiDongYang_PurchaseOrderAppService.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Orders.PurchaseOrders.Project.FuWeiDongYang;
+public class FuWeiDongYang_PurchaseOrderAppService
+{
+ //public FuWeiDongYang_PurchaseOrderAppService(IPurchaseOrderRepository repository, IPurchaseOrderManager purchaseOrderManager, ISupplierAppService supplierAppService) : base(repository, purchaseOrderManager, supplierAppService)
+ //{
+
+ //}
+
+}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
index cbac4fe35..d55802158 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
@@ -5,9 +5,11 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Volo.Abp;
using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
@@ -19,7 +21,7 @@ namespace Win_in.Sfs.Wms.Store.Application;
[Authorize]
[Route($"{StoreConsts.RootPath}purchase-order")]
-public class PurchaseOrderAppService :
+public abstract class PurchaseOrderAppService :
SfsStoreWithDetailsAppServiceBase,
IPurchaseOrderAppService
{
@@ -202,4 +204,9 @@ public class PurchaseOrderAppService :
return dtos;
}
+
+ protected override Task ImportInternalAsync(SfsImportRequestInput requestInput, byte[] inputFileBytes)
+ {
+ return base.ImportInternalAsync(requestInput, inputFileBytes);
+ }
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Win_in.Sfs.Wms.Store.Application.csproj b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Win_in.Sfs.Wms.Store.Application.csproj
index 976ad8ca6..1d06fbf89 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Win_in.Sfs.Wms.Store.Application.csproj
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Win_in.Sfs.Wms.Store.Application.csproj
@@ -29,7 +29,6 @@
-
diff --git a/build/src/docker/publish/settings/appsettings.Development.json b/build/src/docker/publish/settings/appsettings.Development.json
index 5f8979a00..79477a30d 100644
--- a/build/src/docker/publish/settings/appsettings.Development.json
+++ b/build/src/docker/publish/settings/appsettings.Development.json
@@ -1,5 +1,5 @@
{
- "AlwaysAllowAuthorization": "False",
+ "AlwaysAllowAuthorization": "True",
"App": {
"CorsOrigins": [
"http://localhost:59080",
@@ -45,7 +45,7 @@
},
"AuthServer": {
"Audience": "Auth",
- "Authority": "http://localhost:59093/",
+ "Authority": "http://dev.ccwin-in.com:21293/",
"ClientId": "Auth_App",
"ClientSecret": "1q2w3E*",
"RequireHttpsMetadata": "false",
@@ -95,7 +95,7 @@
},
"IdentityClients": {
"Default": {
- "Authority": "http://localhost:59093",
+ "Authority": "http://dev.ccwin-in.com:21293",
"ClientId": "Auth_App",
"ClientSecret": "1q2w3E*",
"GrantType": "client_credentials",
@@ -105,27 +105,27 @@
},
"IsMultiTenancy": "True",
"Redis": {
- "Configuration": "localhost:21194",
+ "Configuration": "dev.ccwin-in.com:21194",
"KeyPrefix": "Wms:"
},
"RemoteServices": {
"Auth": {
- "BaseUrl": "http://dev.ccwin-in.com:59093/"
+ "BaseUrl": "http://dev.ccwin-in.com:21293/"
},
"BaseData": {
"BaseUrl": "http://dev.ccwin-in.com:59094/"
},
"Default": {
- "BaseUrl": "http://dev.ccwin-in.com:59093"
+ "BaseUrl": "http://dev.ccwin-in.com:21293"
},
"FileStorage": {
"BaseUrl": "http://dev.ccwin-in.com:59092/"
},
"Inventory": {
- "BaseUrl": "http://dev.ccwin-in.com:59095/"
+ "BaseUrl": "http://localhost:59095/"
},
"Job": {
- "BaseUrl": "http://dev.ccwin-in.com:59095/"
+ "BaseUrl": "http://localhost:59095/"
},
"Label": {
"BaseUrl": "http://dev.ccwin-in.com:59092/"
@@ -134,7 +134,7 @@
"BaseUrl": "http://dev.ccwin-in.com:59092/"
},
"Store": {
- "BaseUrl": "http://dev.ccwin-in.com:59095/"
+ "BaseUrl": "http://localhost:59095/"
}
},
"Serilog": {
diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js
index 188653b47..9be1ae048 100644
--- a/fe/PC/public/config.js
+++ b/fe/PC/public/config.js
@@ -20,7 +20,7 @@
// localhost
window.SITE_CONFIG['base'] = 'http://localhost:21093'
-window.SITE_CONFIG['user'] = 'http://localhost:21093/api/auth'
+window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth'
window.SITE_CONFIG['print'] = 'print'
window.SITE_CONFIG['largeScreen'] = 'http://localhost:59082'
window.SITE_CONFIG['warehouseCode'] = 'T8'