From 402da31758debb3bb23bdac501709497fa723a25 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Thu, 12 Mar 2026 15:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=A5=97=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8D=E6=98=BE=E7=A4=BA=20=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 279313 -> 279313 bytes src/WMS.Web.Api/appsettings.json | 32 ++++- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 30 +++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 15 +++ src/WMS.Web.Core/Dto/OpsBoxResponse.cs | 18 ++- .../SerialNumbers/SerialNumbersWmsResponse.cs | 14 ++ src/WMS.Web.Domain/Entitys/SerialNumbers.cs | 20 ++- src/WMS.Web.Domain/Services/BoxService.cs | 2 +- .../Services/InStockTaskService.cs | 17 ++- .../Services/ProductInventoryService.cs | 18 ++- .../Services/SerialNumberService.cs | 8 +- 老的配制.txt | 125 ++++++++++++++++++ 12 files changed, 269 insertions(+), 30 deletions(-) create mode 100644 老的配制.txt diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 9edc005689c95fe73caa8f0569522fb8f865ef44..c747d55f5a4d4c2468058db1f50b5d24ffac3d98 100644 GIT binary patch delta 21803 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 delta 22499 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 + + + 名称 + + + + + 规格 + + + + + 条码 + + 物料编码 @@ -6590,6 +6605,21 @@ 数字序列号 + + + 名称 + + + + + 规格 + + + + + 条码 + + ID请求对象 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index a78db4ea..9f773433 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -2349,6 +2349,21 @@ 创建时间(老ops过来) + + + 物料名称 + + + + + 规格型号 + + + + + 条码 + + 完成装箱时间 diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs index 5e75e093..26add96f 100644 --- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs +++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs @@ -95,9 +95,21 @@ namespace WMS.Web.Core.Dto /// [JsonProperty("NumberCode")] public string NumberCode { get; set; } - - - + /// + /// 名称 + /// + [JsonProperty("MaterialName")] + public string MaterialName { get; set; } + /// + /// 规格 + /// + [JsonProperty("Specifications")] + public string Specifications { get; set; } + /// + /// 条码 + /// + [JsonProperty("BarCode")] + public string BarCode { get; set; } } public class OpsBoxDetailsResponse { diff --git a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs index b42764a1..647234be 100644 --- a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs +++ b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs @@ -49,6 +49,20 @@ namespace WMS.Web.Core.Dto.SerialNumbers /// 数字序列号 /// public string NumberCode { get; set; } + /// + /// 名称 + /// + public string MaterialName { get; set; } + /// + /// 规格 + /// + public string Specifications { get; set; } + + /// + /// 条码 + /// + public string BarCode { get; set; } + } } diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index 78e929a2..84586970 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs @@ -17,7 +17,7 @@ namespace WMS.Web.Domain.Entitys public class SerialNumbers : EntityBase { public SerialNumbers() { } - public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount,string numberCode) + public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount,string numberCode,string MaterialName,string Specifications,string BarCode) { this.SerialNumber = serialNumber; this.MaterialNumber = materialNumber; @@ -30,6 +30,9 @@ namespace WMS.Web.Domain.Entitys this.TwoSerialNumber = twoSerialNumber; this.IsNotCount = isNotCount; this.NumberCode = numberCode; + this.MaterialName = MaterialName; + this.Specifications = Specifications; + this.BarCode = BarCode; } /// /// 主键 订单编号 @@ -67,6 +70,21 @@ namespace WMS.Web.Domain.Entitys [Column("CreateTime")] public DateTime CreateTime { get; set; } = DateTime.Now; /// + /// 物料名称 + /// + [Column("MaterialName")] + public string? MaterialName { get; set; }=string.Empty; + /// + /// 规格型号 + /// + [Column("Specifications")] + public string? Specifications { get; set; } = string.Empty; + /// + /// 条码 + /// + [Column("BarCode")] + public string? BarCode { get; set; } = string.Empty; + /// /// 完成装箱时间 /// [Column("CompleteCartonTime")] diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index f2c0dcb4..fb27d357 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -111,7 +111,7 @@ namespace WMS.Web.Domain.Services //SerialNumbers s = new SerialNumbers(serialList[i].SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime); //sList.Add(s); - SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount,sn.NumberCode); + SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount,sn.NumberCode,sn.MaterialName,sn.Specifications,sn.BarCode); sList.Add(s); //序列号记录(序列号生成) SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialNumber, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime); diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index fc8b8117..434b7403 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -837,6 +837,13 @@ namespace WMS.Web.Domain.Services else if (entity.Type == InstockType.ProduceSotck) ProduceSotck_sourceBillNos.Add(entity.SourceBillNo); } + if (Instock_sourceBillNos.Count() > 0) + { + var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null); + if (!erp_result.IsSuccess) + return Result>.ReFailure(erp_result.Message, erp_result.Status); + erp_list.AddRange(erp_result.Data); + } if (Transferin_sourceBillNos.Count() > 0) { var erp_result = await _erpService.BillQueryForTransferin(Transferin_sourceBillNos, null); @@ -847,19 +854,15 @@ namespace WMS.Web.Domain.Services if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库 { + // ProduceSotck_sourceBillNos.Clear(); + //ProduceSotck_sourceBillNos.Add("HWQD-ITC-250808-00004-1"); var erp_result = await _erpService.BillQueryForProduceSotckin(ProduceSotck_sourceBillNos, null); if (!erp_result.IsSuccess) return Result>.ReFailure(erp_result.Message, erp_result.Status); erp_list.AddRange(erp_result.Data); } - if (Instock_sourceBillNos.Count() > 0) - { - var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null); - if (!erp_result.IsSuccess) - return Result>.ReFailure(erp_result.Message, erp_result.Status); - erp_list.AddRange(erp_result.Data); - } + if (Miscellaneous_sourceBillNos.Count() > 0) { var erp_result = await _erpService.BillQueryForMiscellaneous(Miscellaneous_sourceBillNos, null); diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs index 74dd41fc..fcfa0171 100644 --- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs +++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs @@ -142,12 +142,12 @@ namespace WMS.Web.Domain.Services //获取原数据 var yList = await _repositories.GetEntityList(ProductInventoryType.JushuiTan); - //获取领星仓库 + //获取聚水潭仓库 var resStock = await _juShuiTanService.GetStock(); if (!resStock.IsSuccess) return resStock; var ids = resStock.Data.Where(w => listNames.Contains(w.Name)).Select(s => s.Id).ToList(); - //获取领星库存 + //获取聚水潭库存 var resInventory = await _juShuiTanService.GetInventory(ids); _logger.LogInformation($"拉取聚水潭数据结果:{resInventory.IsSuccess} {resInventory.Message}"); if (!resInventory.IsSuccess) return resStock; @@ -318,17 +318,21 @@ namespace WMS.Web.Domain.Services try { - var res = await this.Erp(); - _logger.LogInformation($"同步成品仓库存(物料) {res.IsSuccess} {res.Message}"); + + var res = await this.LingXing(); + _logger.LogInformation($"同步成品仓库存(领星) {res.IsSuccess} {res.Message}"); if (!res.IsSuccess) return res; - res = await this.JuShuiTan(); + res = await this.JuShuiTan(); _logger.LogInformation($"同步成品仓库存(聚水潭) {res.IsSuccess} {res.Message}"); if (!res.IsSuccess) return res; - res = await this.LingXing(); - _logger.LogInformation($"同步成品仓库存(领星) {res.IsSuccess} {res.Message}"); + res = await this.Erp(); + _logger.LogInformation($"同步成品仓库存(物料) {res.IsSuccess} {res.Message}"); if (!res.IsSuccess) return res; + + + } catch (Exception ex) { diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 0b343ec4..1e7db0bb 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -539,7 +539,7 @@ namespace WMS.Web.Domain.Services if (s_entity == null) { //序列号 - SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0",""); + SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0","","","",""); sList.Add(s_new); } else @@ -670,7 +670,7 @@ namespace WMS.Web.Domain.Services isNotCount = "0"; } SerialNumbers entity = new SerialNumbers(NumberCode[j], res.Data.MaterialNumber - , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount,res.Data.NumberCode); + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount,res.Data.NumberCode, res.Data.MaterialName,res.Data.Specifications,res.Data.BarCode); var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); } @@ -690,7 +690,7 @@ namespace WMS.Web.Domain.Services isNotCount = "0"; } SerialNumbers entity = new SerialNumbers(serial[j], res.Data.MaterialNumber - , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount,res.Data.NumberCode); + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount,res.Data.NumberCode,res.Data.MaterialName,res.Data.Specifications,res.Data.BarCode); var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); } @@ -716,7 +716,7 @@ namespace WMS.Web.Domain.Services SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber - , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount,res.Data.NumberCode); + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount,res.Data.NumberCode,res.Data.MaterialName,res.Data.Specifications,res.Data.BarCode); var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); diff --git a/老的配制.txt b/老的配制.txt new file mode 100644 index 00000000..4568a209 --- /dev/null +++ b/老的配制.txt @@ -0,0 +1,125 @@ +apiVersion: v1 +data: + appsettings.json: |- + { + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Ops.Web.Repositories": "Information" + } + }, + "AllowedHosts": "*", + "AllowedCores": "*,localhost,http://localhost:8080,http://wms.f2b211.com,https://wms.f2b211.com,https://wmspda.f2b211.com,http://wmspda.f2b211.com", + "AppOptions": { + "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", + "RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=2", + "RedisIpRateLimitingConnectionString": "192.168.2.105:16379,password=123456,DefaultDatabase=2", + "SingleBaseUrl": "http://192.168.12.111:443/api", + "DBType": "Mysql", + "CompanyId": 1, + "AllowCache": false, + "RedisDirectory": "wms" + }, + "SoaOptions": { + "ModuleID": 23, + "Url_V3": "http://uc.v3.f2b211.com", + "Url": "http://dev.uc.f2b211.com", + "AppId": "99731478887268357", + "AppSecret": "b3081f88a5e13c747689c4133df283bb", + "PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqDuFdS1zf8sNagPmVlLbwomEhu7EXQySV+OOWLL8vTsMKQa2RAsyVCZCviGINDsg7hlvOgGcoSvcEX7Ep9jeGasXoMbNcrBBN2zlKj91uv0MVWJuAHT24Smj3Kb9RQsUG0zyuAi8Qg9ZnWe26WiMbzUr+U5ECGuLFHu9cctVV4skbmSYUkWey9dd1h99qYzB/2oQN2X9kUGn+QhtmPBbnJF6eB9RuMG4Z1+vVQnEMnLmii8T3LCao7TLv2IpT38M4nlytSyU8i6eUj+bQ6RIw1UPbRrQcGCzTsk8gS3/E1NJkGtQRpTu2nD1KKVLSE0+68QiwpBEC7uQGqpKR2K/8QIDAQAB", + "PrivateKey": "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCoO4V1LXN/yw1qA+ZWUtvCiYSG7sRdDJJX445Ysvy9OwwpBrZECzJUJkK+IYg0OyDuGW86AZyhK9wRfsSn2N4Zqxegxs1ysEE3bOUqP3W6/QxVYm4AdPbhKaPcpv1FCxQbTPK4CLxCD1mdZ7bpaIxvNSv5TkQIa4sUe71xy1VXiyRuZJhSRZ7L113WH32pjMH/ahA3Zf2RQaf5CG2Y8FuckXp4H1G4wbhnX69VCcQycuaKLxPcsJqjtMu/YilPfwzieXK1LJTyLp5SP5tDpEjDVQ9tGtBwYLNOyTyBLf8TU0mQa1BGlO7acPUopUtITT7rxCLCkEQLu5AaqkpHYr/xAgMBAAECggEAfB8WM0MqgTHuHrbr3eraSyitB+ToKgLZglDZOGYuhOso6KgUGBXutxlXivIwjODHRgSsBK8lweAbSSkvrOsbyvJpx2yGLkUOiPcmCUqy8Rg8Xk71/A5QDAZt6KGoIaWv2wil19RSGac7ph/cW0+QtYgUfqcZGOFHxwAY4Pl1aNWE8OCBfFNqantf7HDpjNbPANCvGu1+Uat6hYXgGbx+Iss4gqUv9GahXzbS/gCHOO9n+Jw2Ru8hn3SfTbj/jm3JkKNJk4linU5a4j1TnZitBmiAXcRtCWNFfUpCj4rfaj75j1lYDvFZG5sLUgC1ZEsydOiYvIl4Wko2jYbUkyescQKBgQDMIOW7X6z08TqC1lvIXOmzwMBAf3Uhvmdib2I4pNJustGuMiaSzOanWYWfZVAeq69GjZTqnyI4VHG2h9FqmB73OjPc1zbb8qju2jnJEJiQmi/0InTcdzZQckP5uEZ6QtDi8iQ4qTPbbwSGcSGqGQ7/C78OXTwaVjTCFuKbzeHULQKBgQDS+35aV06QgUKhqWc0XGV+RABxrRr4EYHxtiQpnXMjsq+CwYtkYk3fHOW+8u5K+qvLnMs221vcp50YHdadGZRMSFv6xh01HGyrG8A4wfClVVmycfnkNSONQCxLa8YMP/WtQnvkIA8EiY2c5PNW3fiWT5PrShaGsMj8TL11IDOhVQKBgAYSEGLzJHSgW+oaL96UjMqwt8bzQ2t+exqdT2F53Vw3ay7wBN+mwlFFw0iLPce7uVmyyjP0CZN9R2hzP5IY9grKK1Ks/8+otsdrq/5DxRW/0B9Fiw4naXEZBNZ/WXE3XXjyVItu1MD42zyYTrT9S8nf8o2dzjTGTYlcHt8dT1L9AoGAaQhOpMbmE8Zl13kwKb79v9g2qGDXFjwRBrX4VsdNdK4V9fBIZpcR0UrfjSn/O1CDif/qosqddsHy0Pi5yMfdLgSv1a4fCDu4VY6hKSBTnttYph9bmiJiKoWSB5IFrD+DHNgGOVFEaKvZ1gucoNgsUxgWuYHOqQsFY6UIhHCdg2kCgYEAu/7joy54lbxvRXPt+cjjCdBbp0yk81zvvGDc16NXxg7sR6oBivsIMIAxmkKucs68xnpBjfITJkrH6x6In8yChUamNzjYOCcaaj1dgN4CFon4NeLWRcMw/NA8aTe6TiAd/SEzftyLJMrN9sWKvIfpfO1IXplcEabpCC/I9MK8n+c=" + }, + "ErpOptions": { + "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", + "UserName": "orico", + "Password": "A123321.", + "ErpId": "Orico", + "ZhangTaoId": "663a26829afbdd" + }, + "OpsOptions": { + "Url": "https://opsscmapi.f2b211.com/", + "UserName": "admin", + "PassWord": "888888" + }, + "LingXingOptions": { + "Url": "https://openapi.lingxing.com", + "AppId": "ak_QGK2J8TssERmu", + "AppSecret": "n/HUKD2wVdTbvhnFZbVBPw==" + }, + "JuShuiTanOptions": { + "Url": "https://openapi.jushuitan.com", + "AppKey": "17231841286c45f99eb9acf445404349", + "AppSecret": "5ce9641ae6db4abb8b96eea7df6a81e9", + "AccessToken": "4605358c37374780a8a4395e6cdb1c3f" //一年后过期(2025/10/18) + }, + "Qiniu": { + "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", + "SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q", + "Bucket": "orico-wms", + "Url": "https://wmsfile.f2b211.com/" + }, + "QuartzJobOptions": { + "JobStoreTypeKey": "quartz.jobStore.type", + "JobStoreTypeValue": "Quartz.Impl.AdoJobStore.JobStoreTX, Quartz", + "JobStoreDriverDelegateTypeKey": "quartz.jobStore.driverDelegateType", + "JobStoreDriverDelegateTypeValue": "Quartz.Impl.AdoJobStore.MySQLDelegate, Quartz", + "JobStoreTablePrefixKey": "quartz.jobStore.tablePrefix", + "JobStoreTablePrefixValue": "QRTZ_", + "JobStoreDataSourceKey": "quartz.jobStore.dataSource", + "JobStoreDataSourceValue": "myDS", + "JobStoreConnectionStringKey": "quartz.dataSource.myDS.connectionString", + "JobStoreConnectionStringValue": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", + "JobStoreProviderKey": "quartz.dataSource.myDS.provider", + "JobStoreProviderValue": "MySql", + "JobStartHour": [ 15, 11, 1, 0, 0, 10 ], + "JobStartMinute": [ 30, 39, 30, 20, 5, 5 ], + "JobStartExpre": "0 0/10 * * * ?", + "JobStartExpreAmount": "0 50 23 * * ?", + "JobStartExpreSend": "0 0 12,16,20 * * ?", + "JobStartExpreMaterial": "0 30 23 * * ?", + "JobStartErpDelete": "0 5 * * * ?", + "JobStartProductInventory": "0 0/30 * * * ?", + "JobStoreClusteredKey": "quartz.jobStore.clustered", + "JobStoreClusteredValue": true, + "JobStoreInstanceIdKey": "quartz.scheduler.instanceId", + "JobStoreInstanceIdValue": "AUTO", + "QuartzJobKey": "OpsJob", + "QuartzJobValue": "OpsJobGroup", + "QuartzJobDescription": "OpsJob", + "QuartzTriggerIdentity": "OpsTrigger", + "QuartzTriggerDescription": "OpsJobTrigger" + }, + "EmailOptions": { + "SmtpServer": "smtp.qiye.aliyun.com", + "SmtpPort": 587, + "SenderName": "深圳市元创时代", + "SendTitle": "【深圳市元创时代】-产品入库通知", + "SenderEmail": "info@f2b211.com", + "SenderEmailPwd": "K4h6GgxZYGMYV1Bb" + }, + "SmsOptions": { + "AccessKeyId": "LTAI5tBJg6KeDV2V1NiS7Ngi", + "AccessKeySecret": "MAC8bMovSFyCgRQGkfhVcL1jvLJ8cP", + "SignName": "深圳市元创时代", + "TemplateCode": "SMS_465408787" + } + } +kind: ConfigMap +metadata: + creationTimestamp: "2024-01-08T07:53:40Z" + managedFields: + - apiVersion: v1 + fieldsType: FieldsV1 + fieldsV1: + f:data: + .: {} + f:appsettings.json: {} + manager: tke-platform-api + operation: Update + time: "2024-01-08T07:53:40Z" + name: wms-setting + namespace: default + resourceVersion: "56223518312" + uid: 0a1d246a-2863-4f22-a79e-76aaa86c0e5e