diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs index 1be1f89e..397b61cb 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs @@ -369,7 +369,7 @@ public class ClientInfoReq /// /// 备注 /// - public string Note { get; set; } + public string? Note { get; set; } /// /// 客户标识 diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagReq.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagReq.cs index 88eac0a7..0aa63a81 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagReq.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagReq.cs @@ -144,6 +144,11 @@ public class ClientTagReq /// /// 是否国内同行 /// + public bool IsDomesticPeers { get; set; } + + /// + /// 是否国外同行 + /// public bool IsForeignCounterparts { get; set; } /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagRes.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagRes.cs index b10940bf..f2eb5c2f 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagRes.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagRes.cs @@ -15,10 +15,10 @@ public class ClientTagRes /// public long ClientId { get; set; } - ///// - ///// Desc:是否特批放单客户 - ///// - //public bool? IsSpecialApproval { get; set; } = false; + /// + /// Desc:是否特批放单客户 + /// + public bool? IsSpecialApproval { get; set; } = false; /// /// Desc:是否船公司 @@ -140,6 +140,47 @@ public class ClientTagRes /// Desc:是否约主 /// public bool? IsContract { get; set; } = false; + + /// + /// 是否国内同行 + /// + public bool IsDomesticPeers { get; set; } + + /// + /// 是否国外同行 + /// + public bool IsForeignCounterparts { get; set; } + + /// + /// 是否国内直客 + /// + public bool IsDirectCustomerCn { get; set; } + + /// + /// 是否国外直客 + /// + public bool IsDirectCustomer { get; set; } + + /// + /// 是否指定货发货人 + /// + public bool IsShipperZDH { get; set; } + + /// + /// 是否个人 + /// + public bool IsPersonal { get; set; } + + /// + /// 是否装箱加固 + /// + public bool IsPacking { get; set; } + + /// + /// 是否放箱公司 + /// + public bool IsContainerCompany { get; set; } + /// /// 备注 /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/InfoClientModel.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/InfoClientModel.cs index dc9d9c07..dea7466d 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/InfoClientModel.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/InfoClientModel.cs @@ -45,6 +45,11 @@ /// public string? Country { get; set; } + /// + /// 法人 + /// + public string? LegalPerson { get; set; } + /// /// 英文名称 /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs index 3a731869..117e10b8 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs @@ -1,7 +1,6 @@ using DS.Module.Core; using DS.Module.Core.Data; using DS.Module.Core.Enums; -using LanguageExt.TypeClasses; using SqlSugar; namespace DS.WMS.Core.Info.Entity; diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs index 065ca127..e95d3faa 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs @@ -173,7 +173,7 @@ public class InfoClientTag : BaseModelV2 public bool IsDomesticPeers { get; set; } /// - /// 是否国内同行 + /// 是否国外同行 /// [SugarColumn(ColumnDescription = "是否国外同行", DefaultValue = "0")] public bool IsForeignCounterparts { get; set; } diff --git a/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs b/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs index aef00f42..29d7a232 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs @@ -156,7 +156,8 @@ public class ClientBankService : ServiceBase, IClientBankService OrgId = item.OrgId, CodeName = PinYinUtil.GetFristLetter(model.BankName), BankName = model.BankName, - Account = model.BankAccount, + Account = model.InvoiceHeader, + AccountName = model.InvoiceHeader, BankAddress = model.BankAddress, BankAccountNo = model.BankAccount, IsInvoiceDefault = model.IsDefault, diff --git a/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs b/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs index d75d23f6..9710b984 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs @@ -323,11 +323,10 @@ public class ClientInfoService : ServiceBase, IClientInfoService AuditStatus = model.StatusText == "认证" ? AuditStatusEnum.Approve : AuditStatusEnum.NoAudit, Status = model.StatusText == "认证" ? 0 : 1, CodeName = model.Code, + Chief = model.LegalPerson, CreateBy = userId, CreateUserName = User.UserName, CreateTime = dtNow, - CustomerService = users.Find(x => x.UserName == model.CustomerService)?.Id, - CustomerServiceName = model.CustomerService, Email = model.Email, EnFullName = model.ENName, EnShortName = model.ENName, @@ -336,12 +335,15 @@ public class ClientInfoService : ServiceBase, IClientInfoService IsSupplier = model.IsSupplier, Country = model.Country, OperatorId = users.Find(x => x.UserName == model.OP)?.Id, - OperatorName = model.OP, + OperatorName = users.Find(x => x.UserName == model.OP)?.UserName, OrgId = (users.Find(x => x.UserName == model.Sale)?.DefaultOrgId).GetValueOrDefault(), - Sale = model.Sale, + SaleOrgId = users.Find(x => x.UserName == model.Sale)?.DefaultOrgId.ToString(), SaleId = users.Find(x => x.UserName == model.Sale)?.Id, + Sale = users.Find(x => x.UserName == model.Sale)?.UserName, + CustomerService = users.Find(x => x.UserName == model.CustomerService)?.Id, + CustomerServiceName = users.Find(x => x.UserName == model.CustomerService)?.UserName, QQ = model.QQ, - ShortName = model.CNName, + ShortName = model.ShortName, Description = model.CNName, Tel = model.Tel, Note = "系统导入", @@ -394,7 +396,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService await TenantDb.Ado.CommitTranAsync(); var result = DataResult.Success; - result.Message = $"新增往来单位:{newClients.Count}项,更新往来单位:{existClients}项"; + result.Message = $"新增往来单位:{newClients.Count}项,更新往来单位:{existClients.Count}项"; return result; } catch (Exception ex) diff --git a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index 76e80cfc..4454f5f3 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\DS8\FeeApi - True|2024-10-21T02:19:05.7405749Z||;True|2024-10-18T16:11:05.4049685+08:00||;True|2024-10-18T14:59:49.1162741+08:00||;True|2024-10-16T16:29:15.3185348+08:00||;True|2024-10-16T14:12:58.1754214+08:00||;True|2024-10-16T14:08:06.5805581+08:00||;True|2024-10-16T11:55:29.8273176+08:00||;True|2024-10-15T17:39:40.4090324+08:00||;True|2024-10-15T17:06:43.0181578+08:00||;True|2024-10-15T15:07:38.9601925+08:00||;True|2024-10-12T13:33:32.4412583+08:00||;True|2024-10-11T17:00:54.0916209+08:00||;True|2024-10-11T10:54:50.3307087+08:00||;True|2024-10-11T10:45:07.8181500+08:00||;True|2024-10-11T10:40:44.2066046+08:00||;True|2024-10-11T10:21:25.7226983+08:00||;True|2024-10-11T10:09:05.5257478+08:00||;True|2024-10-10T14:58:29.1228618+08:00||;True|2024-10-10T14:05:59.4501659+08:00||;True|2024-10-10T11:08:58.9765455+08:00||;True|2024-10-08T17:59:07.5583287+08:00||;True|2024-09-27T19:01:59.6945760+08:00||;True|2024-09-27T18:45:48.2812860+08:00||;True|2024-09-27T18:10:25.5697467+08:00||;True|2024-09-27T17:39:06.3169139+08:00||;True|2024-09-27T17:30:14.1043193+08:00||;True|2024-09-27T16:02:09.0703159+08:00||;True|2024-09-27T15:53:05.1789245+08:00||;True|2024-09-27T15:32:52.1934490+08:00||;True|2024-09-27T13:51:24.9197626+08:00||;True|2024-09-27T13:48:17.2817346+08:00||;True|2024-09-27T11:51:46.8193040+08:00||;True|2024-09-27T10:58:33.1059648+08:00||;True|2024-09-27T10:37:35.0336563+08:00||;False|2024-09-27T10:31:52.6302264+08:00||;True|2024-09-26T19:50:15.5513195+08:00||;True|2024-09-26T19:47:14.0781788+08:00||;True|2024-09-26T19:01:26.5428388+08:00||;True|2024-09-26T18:35:28.7455319+08:00||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||; + True|2024-10-21T06:30:54.4520206Z||;True|2024-10-21T10:19:05.7405749+08:00||;True|2024-10-18T16:11:05.4049685+08:00||;True|2024-10-18T14:59:49.1162741+08:00||;True|2024-10-16T16:29:15.3185348+08:00||;True|2024-10-16T14:12:58.1754214+08:00||;True|2024-10-16T14:08:06.5805581+08:00||;True|2024-10-16T11:55:29.8273176+08:00||;True|2024-10-15T17:39:40.4090324+08:00||;True|2024-10-15T17:06:43.0181578+08:00||;True|2024-10-15T15:07:38.9601925+08:00||;True|2024-10-12T13:33:32.4412583+08:00||;True|2024-10-11T17:00:54.0916209+08:00||;True|2024-10-11T10:54:50.3307087+08:00||;True|2024-10-11T10:45:07.8181500+08:00||;True|2024-10-11T10:40:44.2066046+08:00||;True|2024-10-11T10:21:25.7226983+08:00||;True|2024-10-11T10:09:05.5257478+08:00||;True|2024-10-10T14:58:29.1228618+08:00||;True|2024-10-10T14:05:59.4501659+08:00||;True|2024-10-10T11:08:58.9765455+08:00||;True|2024-10-08T17:59:07.5583287+08:00||;True|2024-09-27T19:01:59.6945760+08:00||;True|2024-09-27T18:45:48.2812860+08:00||;True|2024-09-27T18:10:25.5697467+08:00||;True|2024-09-27T17:39:06.3169139+08:00||;True|2024-09-27T17:30:14.1043193+08:00||;True|2024-09-27T16:02:09.0703159+08:00||;True|2024-09-27T15:53:05.1789245+08:00||;True|2024-09-27T15:32:52.1934490+08:00||;True|2024-09-27T13:51:24.9197626+08:00||;True|2024-09-27T13:48:17.2817346+08:00||;True|2024-09-27T11:51:46.8193040+08:00||;True|2024-09-27T10:58:33.1059648+08:00||;True|2024-09-27T10:37:35.0336563+08:00||;False|2024-09-27T10:31:52.6302264+08:00||;True|2024-09-26T19:50:15.5513195+08:00||;True|2024-09-26T19:47:14.0781788+08:00||;True|2024-09-26T19:01:26.5428388+08:00||;True|2024-09-26T18:35:28.7455319+08:00||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||; \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs index 1e8b4115..99283f62 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs @@ -246,7 +246,8 @@ public class ClientInfoController : ApiController Wechat = item["AE"]?.ToString(), Email = item["AF"]?.ToString(), ContactName = item["AG"]?.ToString(), - Country = item["AG"]?.ToString(), + Country = item["AH"]?.ToString(), + LegalPerson = item["AI"]?.ToString(), //NFDS = item["AP"] == null ? null : int.Parse(item["AP"].ToString()), IsCustomer = true }; @@ -302,17 +303,18 @@ public class ClientInfoController : ApiController TaxID = item["I"]?.ToString(), Code = item["J"]?.ToString(), StlType = item["K"]?.ToString(), - Attribute = item["M"]?.ToString(), - Business = item["L"]?.ToString(), - OP = item["M"]?.ToString(), - Sale = item["N"]?.ToString(), + Attribute = item["L"]?.ToString(), + Business = item["M"]?.ToString(), + OP = item["N"]?.ToString(), + Sale = item["O"]?.ToString(), CustomerService = item["P"]?.ToString(), Authenticator = item["Q"]?.ToString(), PrepaidRMB = item["R"] == null ? 0 : decimal.Parse(item["R"].ToString()), PrepaidUSD = item["S"] == null ? 0 : decimal.Parse(item["S"].ToString()), Quota = item["T"] == null ? 0 : decimal.Parse(item["T"].ToString()), RestQuota = item["U"] == null ? 0 : decimal.Parse(item["U"].ToString()), - Country = item["W"]?.ToString(), + Country = item["V"]?.ToString(), + LegalPerson = item["W"]?.ToString(), ContactName = item["B"]?.ToString(), IsSupplier = true };