diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs index c74053a..03a1407 100644 --- a/web/djy.Service/ISF/IsfService.cs +++ b/web/djy.Service/ISF/IsfService.cs @@ -352,7 +352,14 @@ namespace djy.Service.Isf return req; } var comlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList(); - if (msgType == "4" && (master.MateState == "海关删除" || master.MateState != "S1" || master.MateState != "02" || master.MateState != "01")) + //if (msgType == "4" && (master.MateState == "海关删除" || master.MateState != "S1" || master.MateState != "02" || master.MateState != "01")) + //{ + // req.Code = 201; + // req.Message = "当前状态不能重发!如有疑问,请联系相关客服!"; + // return req; + //} + + if (msgType == "4" && (master.NewNotice is not ("删除发送" or "01" or "SB" or "S2" or "S3" or "S4" or "S5" or "S6"))) { req.Code = 201; req.Message = "当前状态不能重发!如有疑问,请联系相关客服!"; diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 3e012e0..6ec577d 100644 --- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Code\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\ - True|2024-08-28T01:44:42.7670147Z;True|2024-08-07T16:35:29.6488716+08:00;True|2023-04-26T11:02:16.1912307+08:00;True|2022-10-13T11:22:56.6976734+08:00;True|2022-09-29T14:06:18.1120086+08:00;True|2022-08-25T13:52:10.9522475+08:00;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; + True|2024-10-14T05:44:54.5250166Z||;True|2024-10-14T11:48:58.2212570+08:00||;True|2024-08-28T09:44:42.7670147+08:00||;True|2024-08-07T16:35:29.6488716+08:00||;True|2023-04-26T11:02:16.1912307+08:00||;True|2022-10-13T11:22:56.6976734+08:00||;True|2022-09-29T14:06:18.1120086+08:00||;True|2022-08-25T13:52:10.9522475+08:00||;True|2022-08-25T10:41:51.2753305+08:00||;True|2022-08-11T14:45:29.1942046+08:00||;True|2022-08-11T11:53:01.3573178+08:00||;True|2022-08-11T11:45:09.8023314+08:00||;True|2022-07-07T11:27:16.6078315+08:00||;True|2022-07-05T16:26:03.2409062+08:00||;True|2022-07-05T16:24:40.7410506+08:00||;True|2022-07-04T17:29:37.9437422+08:00||;True|2022-07-04T11:51:52.2386090+08:00||;True|2022-07-04T11:51:11.4558393+08:00||;True|2022-07-04T09:35:17.7702978+08:00||;True|2022-07-01T17:41:17.1936764+08:00||;True|2022-07-01T17:32:54.2967210+08:00||;True|2022-07-01T16:13:16.7902814+08:00||;True|2022-07-01T15:53:11.0569260+08:00||;True|2022-07-01T09:54:42.5780181+08:00||;True|2022-06-30T15:28:48.8212173+08:00||;True|2022-06-30T15:07:27.8048719+08:00||;True|2022-06-30T14:23:02.1357807+08:00||;True|2022-06-30T14:07:07.8696769+08:00||;True|2022-06-30T09:14:19.1360602+08:00||;True|2022-06-29T16:34:08.2367476+08:00||; \ No newline at end of file diff --git a/web/djy_IsfApi/djy_IsfApi.csproj.user b/web/djy_IsfApi/djy_IsfApi.csproj.user index fcaf3c9..0d4932e 100644 --- a/web/djy_IsfApi/djy_IsfApi.csproj.user +++ b/web/djy_IsfApi/djy_IsfApi.csproj.user @@ -1,7 +1,7 @@  - FolderProfile + D:\Code\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml MvcControllerEmptyScaffolder root/Common/MVC/Controller ISF-正式环境