diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user index 28be9c4c..a48b3371 100644 --- a/BookingJieFeng/BookingJieFeng.csproj.user +++ b/BookingJieFeng/BookingJieFeng.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user index 4edb5e0f..9b65c5f7 100644 --- a/BookingWeb/BookingWeb.csproj.user +++ b/BookingWeb/BookingWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true @@ -9,7 +9,7 @@ - FolderProfile + H:\DS7_dev\BookingWeb\Properties\PublishProfiles\FolderProfile.pubxml diff --git a/BookingWeb/Controllers/BookingController.cs b/BookingWeb/Controllers/BookingController.cs index 1d2fb0fe..5187b993 100644 --- a/BookingWeb/Controllers/BookingController.cs +++ b/BookingWeb/Controllers/BookingController.cs @@ -190,6 +190,7 @@ namespace BookingWeb.Controllers model.CNTRTOTAL = string.Join(" / ", strCtrnList); bookingDB.SaveChanges(); + NewOrderCode.Del(viewModel.ORDERNO); var isSubmit = model.BSSTATUS == OrderStatus.Submit.ToString(); if (isNew || (!isNew && !isSubmit)) @@ -1340,6 +1341,63 @@ namespace BookingWeb.Controllers return Json(resp); } + public class NewOrderCode + { + private static List OrderCodeList { get; set; } + + private static void makesure() + { + if (OrderCodeList == null) OrderCodeList = new List(); + } + + public static void Add(string ORDERCODE) + { + makesure(); + if (!OrderCodeList.Exists(x => x == ORDERCODE)) + { + OrderCodeList.Add(ORDERCODE); + } + } + + public static bool IsHave(string ORDERCODE) + { + makesure(); + if (OrderCodeList.Exists(x => x == ORDERCODE)) + { + return true; + } + else + { + return false; + } + } + + public static void Del(string ORDERCODE) + { + makesure(); + if (OrderCodeList.Exists(x => x == ORDERCODE)) + { + OrderCodeList.RemoveAll(x => x == ORDERCODE); + } + } + + public static string GetNew(string prefix, int curr) + { + var code = prefix + (curr).ToString("0000"); + if (IsHave(code)) + { + curr++; + return GetNew(prefix, curr); + } + else + { + Add(code); + return code; + } + } + } + + private string GenOrderCode() { var client = bookingDB.Clients.First(c => c.GID == CurrentCompany.CLIENT_ID); @@ -1352,7 +1410,9 @@ namespace BookingWeb.Controllers curr = int.Parse(maxNO.Substring(maxNO.Length - 4)); } - var code = prefix + (curr + 1).ToString("0000"); + //var code = prefix + (curr + 1).ToString("0000"); + var code = NewOrderCode.GetNew(prefix, curr); + return code; } #endregion diff --git a/BookingWeb/Properties/PublishProfiles/FolderProfile.pubxml.user b/BookingWeb/Properties/PublishProfiles/FolderProfile.pubxml.user index 6d6b2032..c61caa38 100644 --- a/BookingWeb/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/BookingWeb/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,313 +6,315 @@ <_PublishTargetUrl>D:\BookingWeb + True|2022-09-20T07:35:04.8969823Z; + - 08/30/2022 09:37:14 + 09/06/2022 18:11:47 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 08/30/2022 09:32:45 + 09/06/2022 18:11:47 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:19:29 + 09/06/2022 17:53:41 - 06/28/2022 12:19:29 + 09/06/2022 17:53:41 - 06/28/2022 12:19:40 + 09/06/2022 17:53:43 - 08/30/2022 09:40:08 + 09/20/2022 15:34:58 - 08/30/2022 09:40:08 + 09/20/2022 15:34:58 - 06/28/2022 12:19:40 + 09/06/2022 17:53:43 - 06/28/2022 12:19:40 + 09/06/2022 17:53:43 - 06/28/2022 12:19:40 + 09/06/2022 17:53:43 - 06/28/2022 12:19:40 + 09/06/2022 17:53:43 - 06/28/2022 12:19:40 + 09/06/2022 17:53:43 - 06/28/2022 12:19:41 + 09/06/2022 17:53:43 - 06/28/2022 12:19:41 + 09/06/2022 17:53:43 - 06/28/2022 12:19:52 + 09/06/2022 17:53:49 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:19:53 + 09/06/2022 17:53:50 - 06/28/2022 12:19:43 + 09/06/2022 17:53:45 - 06/28/2022 12:19:44 + 09/06/2022 17:53:45 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:46 + 09/06/2022 17:53:46 - 06/28/2022 12:19:46 + 09/06/2022 17:53:46 - 06/28/2022 12:19:49 + 09/06/2022 17:53:48 - 06/28/2022 12:19:49 + 09/06/2022 17:53:48 - 06/28/2022 12:19:49 + 09/06/2022 17:53:48 - 06/28/2022 12:19:49 + 09/06/2022 17:53:48 - 06/28/2022 12:19:49 + 09/06/2022 17:53:48 - 06/28/2022 12:19:52 + 09/06/2022 17:53:49 - 06/28/2022 12:19:52 + 09/06/2022 17:53:49 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:45 + 09/06/2022 17:53:46 - 06/28/2022 12:19:52 + 09/06/2022 17:53:49 - 06/28/2022 12:19:44 + 09/06/2022 17:53:45 - 06/28/2022 12:19:44 + 09/06/2022 17:53:46 - 06/28/2022 12:19:44 + 09/06/2022 17:53:46 - 06/28/2022 12:19:44 + 09/06/2022 17:53:46 - 06/28/2022 12:19:43 + 09/06/2022 17:53:45 - 06/28/2022 12:19:44 + 09/06/2022 17:53:45 - 06/28/2022 12:19:44 + 09/06/2022 17:53:45 - 06/28/2022 12:19:44 + 09/06/2022 17:53:46 - 06/28/2022 12:19:44 + 09/06/2022 17:53:46 - 06/28/2022 12:19:44 + 09/06/2022 17:53:46 - 06/28/2022 12:19:52 + 09/06/2022 17:53:49 - 02/01/2018 12:17:22 + 02/01/2018 20:17:22 - 02/01/2018 12:21:00 + 02/01/2018 20:21:00 - 02/01/2018 12:17:44 + 02/01/2018 20:17:44 - 02/01/2018 12:19:30 + 02/01/2018 20:19:30 - 02/01/2018 12:16:38 + 02/01/2018 20:16:38 - 02/11/2014 15:28:40 + 02/11/2014 23:28:40 - 02/01/2018 12:17:00 + 02/01/2018 20:17:00 - 02/01/2018 12:21:00 + 02/01/2018 20:21:00 - 02/01/2018 12:21:00 + 02/01/2018 20:21:00 - 02/01/2018 12:21:00 + 02/01/2018 20:21:00 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 12/06/2019 08:41:25 @@ -330,1111 +332,1111 @@ 12/06/2019 08:41:25 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:09 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:19 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 08/30/2022 09:39:40 + 09/06/2022 18:11:47 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 06/28/2022 12:17:20 + 09/06/2022 17:53:10 - 08/29/2022 17:20:35 + 09/20/2022 15:35:00 \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/DAL/MsRptZjTotal/MsRptZjTotalDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsRptZjTotal/MsRptZjTotalDAL.cs index 6011ae91..3ca1aa8a 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsRptZjTotal/MsRptZjTotalDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsRptZjTotal/MsRptZjTotalDAL.cs @@ -391,12 +391,14 @@ namespace DSWeb.MvcShipping.DAL.MsRptZjTotalDAL foreach (var head in headList) { + head.ETDSTLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); + var amountfee = 0M; if (string.IsNullOrWhiteSpace(head.ETD)) { continue; } - var 需计算资金成本的费用List = feeList.Where(x => head.BSNO == x.BSNO && (x.SETTLETIME == null || x.SETTLETIME > Convert.ToDateTime(head.STLDATE).AddDays(days-1))).ToList(); + var 需计算资金成本的费用List = feeList.Where(x => head.BSNO == x.BSNO && (x.SETTLETIME == null || x.SETTLETIME > Convert.ToDateTime(head.ETDSTLDATE))).ToList(); if (需计算资金成本的费用List != null && 需计算资金成本的费用List.Count > 0) { @@ -410,7 +412,7 @@ namespace DSWeb.MvcShipping.DAL.MsRptZjTotalDAL //feedays = (DateTime.Now - Convert.ToDateTime(head.STLDATE)).Days ; amountfee += feedays * Convert.ToDecimal(item.EXCHANGERATE * item.AMOUNT * 0.12M / 365); - head.STLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); + //head.STLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); head.ExceedDays = feedays ; } else @@ -421,7 +423,7 @@ namespace DSWeb.MvcShipping.DAL.MsRptZjTotalDAL //feedays = ((DateTime)item.SETTLETIME - Convert.ToDateTime(head.STLDATE)).Days; amountfee += feedays * Convert.ToDecimal((item.SETTLEAMOUNT) * 0.12M / 365); - head.STLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); + //head.STLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); head.ExceedDays = feedays ; } else @@ -430,7 +432,7 @@ namespace DSWeb.MvcShipping.DAL.MsRptZjTotalDAL //feedays = ((DateTime)item.SETTLETIME - Convert.ToDateTime(head.STLDATE)).Days; amountfee += feedays * Convert.ToDecimal((item.SETTLEAMOUNT) * 0.12M / 365); - head.STLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); + //head.STLDATE = Convert.ToDateTime(head.ETD).AddDays(days).ToString("yyyy-MM-dd"); feedays = (DateTime.Now - Convert.ToDateTime(head.ETD)).Days - days; //feedays = (DateTime.Now - Convert.ToDateTime(head.STLDATE)).Days; diff --git a/DSWeb/Areas/MvcShipping/Models/MsOpBillProfit/MsOpBillProfit.cs b/DSWeb/Areas/MvcShipping/Models/MsOpBillProfit/MsOpBillProfit.cs index 1499c44b..9630c7b1 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsOpBillProfit/MsOpBillProfit.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsOpBillProfit/MsOpBillProfit.cs @@ -111,6 +111,12 @@ namespace DSWeb.MvcShipping.Models.MsOpBillProfit /// public string STLDATE { get { return _STLDATE; } set { _STLDATE = value; } } + /// + /// 应结日期2 在泰邦用于ETD+60天的计算 + /// + private string _ETDSTLDATE;//开船日期 + public string ETDSTLDATE { get { return _ETDSTLDATE; } set { _ETDSTLDATE = value; } } + private string _STLNAME;//开船日期 public string STLNAME { get { return _STLNAME; } set { _STLNAME = value; } } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptZjTotal/MsRptZJZYIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptZjTotal/MsRptZJZYIndex.js index b471b86d..5b62eccb 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptZjTotal/MsRptZJZYIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptZjTotal/MsRptZJZYIndex.js @@ -131,7 +131,8 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, { { name: 'PROFITRATE', type: 'string' }, { name: 'PRREMARK', type: 'string' }, { name: 'ZJFEE', type: 'number' }, - { name: 'ExceedDays', type: 'number' } + { name: 'ExceedDays', type: 'number' }, + { name: 'ETDSTLDATE', type: 'string' } ], remoteSort: true, @@ -189,7 +190,13 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, { }, { sortable: true, dataIndex: 'STLDATE', - header: '应结日期', + header: '应结日期_账期', + width: 86 + }, { + sortable: true, + dataIndex: 'ETDSTLDATE', + format: 'Y-m-d', + header: '应结日期_ETD', width: 86 }, { sortable: true, diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index dcb7ff90..9c99ceaf 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles H:\DS7_dev\DSWeb\Properties\PublishProfiles\配置文件1.pubxml true - Release|Any CPU + Debug|Any CPU diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user index 416a30e1..4ea3c326 100644 --- a/DispatchWeb/DispatchWeb.csproj.user +++ b/DispatchWeb/DispatchWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU diff --git a/JobReqWebData/quartz_jobs.xml b/JobReqWebData/quartz_jobs.xml index a5dc8909..a515c271 100644 --- a/JobReqWebData/quartz_jobs.xml +++ b/JobReqWebData/quartz_jobs.xml @@ -537,15 +537,18 @@ QuerySql - select bl.AS_ID,bl.BSNO,b.CUSTNO,bl.MBLNO,bl.HBLNO,b.CUSTOMERNAME,bl.SHIPPER,bl.CONSIGNEE,bl.PORTLOAD,bl.DESTINATION - ,CASE WHEN len(b.DESTINATIONID)!=5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(b.DESTINATIONID,2)) END as COUNTRY - ,b.VESSEL,b.VOYNO,bl.CNTRTOTAL,b.BLTYPE,b.[SERVICE],b.ETD,b.ATD,(SELECT TOP 1 COMPTIME FROM op_status WHERE [STATUS]='Approached' AND BSNO=B.BSNO) LINKCUSTTIME - ,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='接单' AND BSNO=B.BSNO) CREATETIME - ,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='出号' AND BSNO=B.BSNO) MBLNOTIME - FROM op_seae_billmanage bl - LEFT JOIN op_seae b on (b.bsno=bl.BSNO) - WHERE MBLNO!='' AND ETD>=GETDATE()-7 AND ETD<=GETDATE()+7 - + select bl.AS_ID,bl.BSNO,b.CUSTNO,b.CONTRACTNO PONO,bl.MBLNO,bl.HBLNO,b.CUSTOMERNAME,bl.SHIPPER,bl.CONSIGNEE,bl.PORTLOAD,bl.DESTINATION + ,CASE WHEN len(b.DESTINATIONID)!=5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(b.DESTINATIONID,2)) END as COUNTRY + ,b.VESSEL,b.VOYNO,bl.CNTRTOTAL,b.BLTYPE,b.[SERVICE],b.ETD,b.ATD,b.CARRIER,bl.NOPKGS,bl.DESCRIPTION,bl.GROSSWEIGHT,bl.MEASUREMENT,b.HSCODE,b.FINANCIALSTAFFFAX INSURANCEOP + ,(SELECT TOP 1 COMPTIME FROM op_status WHERE [STATUS]='Approached' AND BSNO=B.BSNO) LINKCUSTTIME + ,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='接单' AND BSNO=B.BSNO) CREATETIME + ,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='出号' AND BSNO=B.BSNO) MBLNOTIME + ,bl.MODIFYTIME BSDATE + FROM op_seae_billmanage bl + LEFT JOIN op_seae b on (b.bsno=bl.BSNO) + WHERE + bl.MODIFYTIME>=DATEADD(HOUR,-12 ,getdate()) +