From 5280b3e4a76546aecb4ca12ebb04c364e2fc515b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 5 Dec 2024 19:48:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KittingIssueJobAppService.cs              |  26 +--
 .../KittingIssueRequestAppService.cs          |   2 +-
 .../settings/1/appsettings.Development.json   | 165 +++++++++++++++
 .../publish/conf/settings/1/appsettings.json  | 118 +++++++++++
 .../appsettings.Development-1 (2).json        | 191 ++++++++++++++++++
 .../settings/appsettings.Development-1.json   | 191 ++++++++++++++++++
 6 files changed, 679 insertions(+), 14 deletions(-)
 create mode 100644 build/src/docker/publish/conf/settings/1/appsettings.Development.json
 create mode 100644 build/src/docker/publish/conf/settings/1/appsettings.json
 create mode 100644 build/src/docker/publish/conf/settings/appsettings.Development-1 (2).json
 create mode 100644 build/src/docker/publish/conf/settings/appsettings.Development-1.json

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
index 479722a50..4d56dc6d8 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
@@ -27,8 +27,8 @@ using Win_in.Sfs.Wms.Store.Notes;
 using Win_in.Sfs.Wms.Store.Options;
 
 namespace Win_in.Sfs.Wms.Store.Application;
-
-[Authorize]
+[AllowAnonymous]
+//[Authorize]
 [Route($"{StoreConsts.RootPath}kitting-issue-job")]
 public class KittingIssueJobAppService
     : SfsJobAppServiceBase<KittingIssueJob, KittingIssueJobDetail, KittingIssueJobDTO, SfsJobRequestInputBase,
@@ -209,17 +209,17 @@ public class KittingIssueJobAppService
     {
         var kittingIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
         kittingIssueJob.JobStatus = EnumJobStatus.Doing;
-        if (kittingIssueJob.IsClaims)
-        {
-            if (kittingIssueJob.ClaimsUserId != _currentUser.Id.ToString())
-            {
-                throw new UserFriendlyException($"该任务已被【{kittingIssueJob.ClaimsUserName}】承接");
-            }
-        }
-        else
-        {
-            throw new UserFriendlyException("该任务未被承接，请重新刷新页面，承接任务");
-        }
+        //if (kittingIssueJob.IsClaims)
+        //{
+        //    if (kittingIssueJob.ClaimsUserId != _currentUser.Id.ToString())
+        //    {
+        //        throw new UserFriendlyException($"该任务已被【{kittingIssueJob.ClaimsUserName}】承接");
+        //    }
+        //}
+        //else
+        //{
+        //    throw new UserFriendlyException("该任务未被承接，请重新刷新页面，承接任务");
+        //}
 
         var kittingIssueJobDto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(kittingIssueJob);
         kittingIssueJobDto.Details = new List<KittingIssueJobDetailDTO> { issueJobDetailDto };
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
index f34043c7a..6fc90e66a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
@@ -322,7 +322,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         }
 
         await _repository.UpdateAsync(kittingIssueRequest).ConfigureAwait(false);
-        await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false);
+       // await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false);
     }
 
     #endregion
diff --git a/build/src/docker/publish/conf/settings/1/appsettings.Development.json b/build/src/docker/publish/conf/settings/1/appsettings.Development.json
new file mode 100644
index 000000000..112429fe5
--- /dev/null
+++ b/build/src/docker/publish/conf/settings/1/appsettings.Development.json
@@ -0,0 +1,165 @@
+{
+  "AlwaysAllowAuthorization": "True",
+  "App": {
+    "CorsOrigins": [
+      "http://localhost:59080",
+      "http://localhost:59081",
+      "http://localhost:59090",
+      "http://localhost:59091",
+      "http://localhost:59093",
+      "http://localhost:59094",
+      "http://localhost:59095",
+      "http://localhost:59096",
+      "http://localhost:59097",
+      "http://localhost:59098",
+      "http://localhost:59099",
+      "http://localhost:59090",
+      "http://localhost:59091",
+      "http://localhost:59093",
+      "http://localhost:59094",
+      "http://localhost:59095",
+      "http://localhost:59096",
+      "http://localhost:59097",
+      "http://localhost:59098",
+      "http://localhost:59099",
+      "https://localhost:59090",
+      "https://localhost:59091",
+      "https://localhost:59093",
+      "https://localhost:59094",
+      "https://localhost:59095",
+      "https://localhost:59096",
+      "https://localhost:59097",
+      "https://localhost:59098",
+      "https://localhost:59099",
+      "https://localhost:59090",
+      "https://localhost:59091",
+      "https://localhost:59093",
+      "https://localhost:59094",
+      "https://localhost:59095",
+      "https://localhost:59096",
+      "https://localhost:59097",
+      "https://localhost:59098",
+      "https://localhost:59099",
+      "http://localhost:9527"
+    ]
+  },
+  "AuthServer": {
+    "Audience": "Auth",
+    "Authority": "http://localhost:59093/",
+    "ClientId": "Auth_App",
+    "ClientSecret": "1q2w3E*",
+    "RequireHttpsMetadata": "false",
+    "SwaggerClientId": "Auth_App",
+    "SwaggerClientSecret": "1q2w3e*",
+    "UseAuth": "true"
+  },
+  // "ConnectionStrings": {
+  //   "AbpAuditLogging": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpBackgroundJobs": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpBlobStoring": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpFeatureManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpIdentity": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpIdentityServer": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpPermissionManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpSettingManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpTenantManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Auth": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Basedata": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "DataExchange": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "FileStorage": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Inventory": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Job": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Label": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Message": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;"
+  // },
+  "ConnectionStrings": {
+    "AbpAuditLogging": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpBackgroundJobs": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpBlobStoring": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpFeatureManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpIdentity": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpIdentityServer": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpPermissionManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpSettingManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "AbpTenantManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Auth": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Basedata": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "DataExchange": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "FileStorage": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Inventory": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Job": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Label": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Message": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+    "Store": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;"
+  },
+  "IdentityClients": {
+    "Default": {
+      "Authority": "http://localhost:59093",
+      "ClientId": "Auth_App",
+      "ClientSecret": "1q2w3E*",
+      "GrantType": "client_credentials",
+      "RequireHttps": "false",
+      "Scope": "Auth"
+    }
+  },
+  "IsMultiTenancy": "True",
+  "Redis": {
+    "Configuration": "localhost:21194",
+    "KeyPrefix": "Wms:"
+  },
+  "RemoteServices": {
+    "Auth": {
+      "BaseUrl": "http://dev.ccwin-in.com:59093/"
+    },
+    "BaseData": {
+      "BaseUrl": "http://dev.ccwin-in.com:59094/"
+    },
+    "Default": {
+      "BaseUrl": "http://dev.ccwin-in.com:59093"
+    },
+    "FileStorage": {
+      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+    },
+    "Inventory": {
+      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+    },
+    "Job": {
+      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+    },
+    "Label": {
+      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+    },
+    "Message": {
+      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+    },
+    "Store": {
+      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+    }
+  },
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Args": {
+          "configure": [
+            {
+              "Args": {
+                "path": "logs/log.txt",
+                "retainedFileCountLimit": "30",
+                "rollingInterval": "Day"
+              },
+              "Name": "File"
+            }
+          ]
+        },
+        "Name": "Async"
+      },
+      {
+        "Args": {
+          "serverUrl": "http://localhost:5341"
+        },
+        "Name": "Seq"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/build/src/docker/publish/conf/settings/1/appsettings.json b/build/src/docker/publish/conf/settings/1/appsettings.json
new file mode 100644
index 000000000..3bf58efa7
--- /dev/null
+++ b/build/src/docker/publish/conf/settings/1/appsettings.json
@@ -0,0 +1,118 @@
+{
+  //是否绕过权限验证
+  "AlwaysAllowAuthorization": "True",
+  //跨域
+  "App": {
+    "CorsOrigins": [
+	"http://localhost:9527"
+    ]
+  },
+  //ids4的建权服务端配置
+  "AuthServer": {
+    "Audience": "Auth",
+    "Authority": "http://localhost:60083",
+    "ClientId": "Auth_App",
+    "ClientSecret": "1q2w3E*",
+    "RequireHttpsMetadata": "false",
+    "SwaggerClientId": "Auth_App",
+    "SwaggerClientSecret": "1q2w3e*",
+    "RequireHttps": false,
+    "UseAuth": "true"
+  },
+  //ids4的建权客户端配置 配置要和服务端对应
+  "IdentityClients": {
+    "Default": {
+      "Authority": "http://localhost:60083",
+      "ClientId": "Auth_App",
+      "ClientSecret": "1q2w3E*",
+      "GrantType": "client_credentials",
+      "RequireHttps": false,
+      "Scope": "Auth"
+    }
+  },
+  //数据库连接
+  "Database": "SQLServer",
+  "ConnectionStrings": {
+    "AbpAuditLogging": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpBackgroundJobs": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpBlobStoring": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpFeatureManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpIdentity": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpIdentityServer": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpPermissionManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpSettingManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpTenantManagement": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Auth": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Basedata": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "DataExchange": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "FileStorage": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Inventory": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Job": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Label": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Message": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Store": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;"
+  },
+  //多租户
+  "IsMultiTenancy": "True",
+  //缓存服务器
+  "Redis": {
+    "Configuration": "localhost:60040",
+    "KeyPrefix": "Wms:"
+  },
+  //转发地址配置
+  "RemoteServices": {
+    "Auth": {
+      "BaseUrl": "http://localhost:60083/"
+    },
+    "BaseData": {
+      "BaseUrl": "http://localhost:60084/"
+    },
+    "Default": {
+      "BaseUrl": "http://localhost:60083"
+    },
+    "FileStorage": {
+      "BaseUrl": "http://localhost:60082/"
+    },
+    "Inventory": {
+      "BaseUrl": "http://localhost:60085/"
+    },
+    "Job": {
+      "BaseUrl": "http://localhost:60085/"
+    },
+    "Label": {
+      "BaseUrl": "http://localhost:60082/"
+    },
+    "Message": {
+      "BaseUrl": "http://localhost:60082/"
+    },
+    "Store": {
+      "BaseUrl": "http://localhost:60085/"
+    }
+  },
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Args": {
+          "configure": [
+            {
+              "Args": {
+                "path": "logs/log.txt",
+                "retainedFileCountLimit": "30",
+                "rollingInterval": "Day"
+              },
+              "Name": "File"
+            }
+          ]
+        },
+        "Name": "Async"
+      },
+      {
+        "Name": "Http",
+        "Args": {
+          "requestUri": "http://localhost:60099",
+          "queueLimitBytes": null
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/build/src/docker/publish/conf/settings/appsettings.Development-1 (2).json b/build/src/docker/publish/conf/settings/appsettings.Development-1 (2).json
new file mode 100644
index 000000000..c4eba03a8
--- /dev/null
+++ b/build/src/docker/publish/conf/settings/appsettings.Development-1 (2).json	
@@ -0,0 +1,191 @@
+{
+  "AlwaysAllowAuthorization": "true",
+ "RestoOptions":
+ {
+
+"Address" :"http://7e42682n64.goho.co:21171/",
+ // 用户名
+"UserName" :"",
+ // 密码
+"Password" :"",
+ // 令牌
+"Token" :"",
+"Path" :"zozocnApi/custom/receiveProductionPlan"
+
+},
+
+
+
+  "App": {
+    "CorsOrigins": [
+      "http://localhost:59080",
+      "http://localhost:59081",
+      "http://localhost:59090",
+      "http://localhost:59091",
+      "http://localhost:59093",
+      "http://localhost:59094",
+      "http://localhost:59095",
+      "http://localhost:59096",
+      "http://localhost:59097",
+      "http://localhost:59098",
+      "http://localhost:59099",
+      "http://localhost:59090",
+      "http://localhost:59091",
+      "http://localhost:59093",
+      "http://localhost:59094",
+      "http://localhost:59095",
+      "http://localhost:59096",
+      "http://localhost:59097",
+      "http://localhost:59098",
+      "http://localhost:59099",
+      "https://localhost:59090",
+      "https://localhost:59091",
+      "https://localhost:59093",
+      "https://localhost:59094",
+      "https://localhost:59095",
+      "https://localhost:59096",
+      "https://localhost:59097",
+      "https://localhost:59098",
+      "https://localhost:59099",
+      "https://localhost:59090",
+      "https://localhost:59091",
+      "https://localhost:59093",
+      "https://localhost:59094",
+      "https://localhost:59095",
+      "https://localhost:59096",
+      "https://localhost:59097",
+      "https://localhost:59098",
+      "https://localhost:59099",
+      "http://localhost:9527"
+    ]
+  },
+  "AuthServer": {
+    "Audience": "Auth",
+    "Authority": "http://dev.ccwin-in.com:60083/",
+    //"Authority": "http://localhost:59093/",
+    "ClientId": "Auth_App",
+    "ClientSecret": "1q2w3E*",
+    "RequireHttpsMetadata": "false",
+    "SwaggerClientId": "Auth_App",
+    "SwaggerClientSecret": "1q2w3e*",
+    "UseAuth": "true"
+  },
+  // "ConnectionStrings": {
+  //   "AbpAuditLogging": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpBackgroundJobs": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpBlobStoring": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpFeatureManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpIdentity": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpIdentityServer": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpPermissionManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpSettingManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpTenantManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Auth": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Basedata": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "DataExchange": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "FileStorage": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Inventory": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Job": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Label": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Message": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;"
+  // },
+  "ConnectionStrings": {
+    "AbpAuditLogging": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpBackgroundJobs": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpBlobStoring": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpFeatureManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpIdentity": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpIdentityServer": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpPermissionManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpSettingManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpTenantManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Auth": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Basedata": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "FileStorage": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Inventory": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Job": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Label": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Message": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Store": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;"
+  },
+  "IdentityClients": {
+    "Default": {
+      "Authority": "http://dev.ccwin-in.com:60083",
+      //"Authority": "http://localhost:59093",
+      "ClientId": "Auth_App",
+      "ClientSecret": "1q2w3E*",
+      "GrantType": "client_credentials",
+      "RequireHttps": "false",
+      "Scope": "Auth"
+    }
+  },
+  "IsMultiTenancy": "True",
+  "Redis": {
+    "Configuration": "localhost:21194",
+    "KeyPrefix": "Wms:"
+    //"IsEnabled": "false"
+  },
+  "RemoteServices": {
+    "Auth": {
+      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      //"BaseUrl": "http://localhost:59093/"
+    },
+    "BaseData": {
+      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      //"BaseUrl": "http://localhost:59094/"
+    },
+    "Default": {
+      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      //"BaseUrl": "http://localhost:59093/"
+    },
+    "FileStorage": {
+      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      //"BaseUrl": "http://localhost:59092/"
+    },
+    "Inventory": {
+      "BaseUrl": "http://localhost:59095/"
+    },
+    "Job": {
+      "BaseUrl": "http://localhost:59095/"
+    },
+    "Label": {
+       "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      //"BaseUrl": "http://localhost:59092/"
+    },
+    "Message": {
+       "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      //"BaseUrl": "http://localhost:59092/"
+    },
+    "Store": {
+      "BaseUrl": "http://localhost:59095/"
+    }
+  },
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Args": {
+          "configure": [
+            {
+              "Args": {
+                "path": "logs/log.txt",
+                "retainedFileCountLimit": "30",
+                "rollingInterval": "Day"
+              },
+              "Name": "File"
+            }
+          ]
+        },
+        "Name": "Async"
+      },
+      {
+        "Name": "Http",
+        "Args": {
+          "requestUri": "http://localhost:21093",
+          "queueLimitBytes": null
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/build/src/docker/publish/conf/settings/appsettings.Development-1.json b/build/src/docker/publish/conf/settings/appsettings.Development-1.json
new file mode 100644
index 000000000..c4eba03a8
--- /dev/null
+++ b/build/src/docker/publish/conf/settings/appsettings.Development-1.json
@@ -0,0 +1,191 @@
+{
+  "AlwaysAllowAuthorization": "true",
+ "RestoOptions":
+ {
+
+"Address" :"http://7e42682n64.goho.co:21171/",
+ // 用户名
+"UserName" :"",
+ // 密码
+"Password" :"",
+ // 令牌
+"Token" :"",
+"Path" :"zozocnApi/custom/receiveProductionPlan"
+
+},
+
+
+
+  "App": {
+    "CorsOrigins": [
+      "http://localhost:59080",
+      "http://localhost:59081",
+      "http://localhost:59090",
+      "http://localhost:59091",
+      "http://localhost:59093",
+      "http://localhost:59094",
+      "http://localhost:59095",
+      "http://localhost:59096",
+      "http://localhost:59097",
+      "http://localhost:59098",
+      "http://localhost:59099",
+      "http://localhost:59090",
+      "http://localhost:59091",
+      "http://localhost:59093",
+      "http://localhost:59094",
+      "http://localhost:59095",
+      "http://localhost:59096",
+      "http://localhost:59097",
+      "http://localhost:59098",
+      "http://localhost:59099",
+      "https://localhost:59090",
+      "https://localhost:59091",
+      "https://localhost:59093",
+      "https://localhost:59094",
+      "https://localhost:59095",
+      "https://localhost:59096",
+      "https://localhost:59097",
+      "https://localhost:59098",
+      "https://localhost:59099",
+      "https://localhost:59090",
+      "https://localhost:59091",
+      "https://localhost:59093",
+      "https://localhost:59094",
+      "https://localhost:59095",
+      "https://localhost:59096",
+      "https://localhost:59097",
+      "https://localhost:59098",
+      "https://localhost:59099",
+      "http://localhost:9527"
+    ]
+  },
+  "AuthServer": {
+    "Audience": "Auth",
+    "Authority": "http://dev.ccwin-in.com:60083/",
+    //"Authority": "http://localhost:59093/",
+    "ClientId": "Auth_App",
+    "ClientSecret": "1q2w3E*",
+    "RequireHttpsMetadata": "false",
+    "SwaggerClientId": "Auth_App",
+    "SwaggerClientSecret": "1q2w3e*",
+    "UseAuth": "true"
+  },
+  // "ConnectionStrings": {
+  //   "AbpAuditLogging": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpBackgroundJobs": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpBlobStoring": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpFeatureManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpIdentity": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpIdentityServer": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpPermissionManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpSettingManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "AbpTenantManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Auth": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Basedata": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "DataExchange": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "FileStorage": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Inventory": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Job": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Label": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Message": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;",
+  //   "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;"
+  // },
+  "ConnectionStrings": {
+    "AbpAuditLogging": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpBackgroundJobs": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpBlobStoring": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpFeatureManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpIdentity": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpIdentityServer": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpPermissionManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpSettingManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "AbpTenantManagement": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Auth": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Basedata": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "FileStorage": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Inventory": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Job": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Label": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Message": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;",
+    "Store": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;"
+  },
+  "IdentityClients": {
+    "Default": {
+      "Authority": "http://dev.ccwin-in.com:60083",
+      //"Authority": "http://localhost:59093",
+      "ClientId": "Auth_App",
+      "ClientSecret": "1q2w3E*",
+      "GrantType": "client_credentials",
+      "RequireHttps": "false",
+      "Scope": "Auth"
+    }
+  },
+  "IsMultiTenancy": "True",
+  "Redis": {
+    "Configuration": "localhost:21194",
+    "KeyPrefix": "Wms:"
+    //"IsEnabled": "false"
+  },
+  "RemoteServices": {
+    "Auth": {
+      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      //"BaseUrl": "http://localhost:59093/"
+    },
+    "BaseData": {
+      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      //"BaseUrl": "http://localhost:59094/"
+    },
+    "Default": {
+      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      //"BaseUrl": "http://localhost:59093/"
+    },
+    "FileStorage": {
+      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      //"BaseUrl": "http://localhost:59092/"
+    },
+    "Inventory": {
+      "BaseUrl": "http://localhost:59095/"
+    },
+    "Job": {
+      "BaseUrl": "http://localhost:59095/"
+    },
+    "Label": {
+       "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      //"BaseUrl": "http://localhost:59092/"
+    },
+    "Message": {
+       "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      //"BaseUrl": "http://localhost:59092/"
+    },
+    "Store": {
+      "BaseUrl": "http://localhost:59095/"
+    }
+  },
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Args": {
+          "configure": [
+            {
+              "Args": {
+                "path": "logs/log.txt",
+                "retainedFileCountLimit": "30",
+                "rollingInterval": "Day"
+              },
+              "Name": "File"
+            }
+          ]
+        },
+        "Name": "Async"
+      },
+      {
+        "Name": "Http",
+        "Args": {
+          "requestUri": "http://localhost:21093",
+          "queueLimitBytes": null
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

From 5bc8f1a350e146562021e4ba24734d326e3b7356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 5 Dec 2024 19:50:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
index 4d56dc6d8..0e3929480 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
@@ -27,8 +27,8 @@ using Win_in.Sfs.Wms.Store.Notes;
 using Win_in.Sfs.Wms.Store.Options;
 
 namespace Win_in.Sfs.Wms.Store.Application;
-[AllowAnonymous]
-//[Authorize]
+
+[Authorize]
 [Route($"{StoreConsts.RootPath}kitting-issue-job")]
 public class KittingIssueJobAppService
     : SfsJobAppServiceBase<KittingIssueJob, KittingIssueJobDetail, KittingIssueJobDTO, SfsJobRequestInputBase,

From cbefd2168d94257b9e5c04bf872367adc82a06cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 5 Dec 2024 19:50:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KittingIssueJobAppService.cs              | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
index 0e3929480..479722a50 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
@@ -209,17 +209,17 @@ public class KittingIssueJobAppService
     {
         var kittingIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
         kittingIssueJob.JobStatus = EnumJobStatus.Doing;
-        //if (kittingIssueJob.IsClaims)
-        //{
-        //    if (kittingIssueJob.ClaimsUserId != _currentUser.Id.ToString())
-        //    {
-        //        throw new UserFriendlyException($"该任务已被【{kittingIssueJob.ClaimsUserName}】承接");
-        //    }
-        //}
-        //else
-        //{
-        //    throw new UserFriendlyException("该任务未被承接，请重新刷新页面，承接任务");
-        //}
+        if (kittingIssueJob.IsClaims)
+        {
+            if (kittingIssueJob.ClaimsUserId != _currentUser.Id.ToString())
+            {
+                throw new UserFriendlyException($"该任务已被【{kittingIssueJob.ClaimsUserName}】承接");
+            }
+        }
+        else
+        {
+            throw new UserFriendlyException("该任务未被承接，请重新刷新页面，承接任务");
+        }
 
         var kittingIssueJobDto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(kittingIssueJob);
         kittingIssueJobDto.Details = new List<KittingIssueJobDetailDTO> { issueJobDetailDto };

From a2352497828b8a0a388586876d179a07b8e9a303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Fri, 6 Dec 2024 09:09:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KittingIssueRequests/KittingIssueRequestAppService.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
index 6fc90e66a..3eb615ae1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
@@ -322,7 +322,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         }
 
         await _repository.UpdateAsync(kittingIssueRequest).ConfigureAwait(false);
-       // await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false);
+        //await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false);
     }
 
     #endregion