crudelis/hsuco_cargo_garage_operation_program
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

버그수정

Browse Source 
당첨시 중복 이 발생할수 있는 버그 수정
This commit is contained in:
Crudelis
2023-10-24 13:08:29 +09:00
parent efe3f151d0
commit a2b36f93a6
4 changed files with 152 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/Lot.Designer.cs generated
View File

@@ -30,7 +30,6 @@
{
this.metroPanel1 = new MetroFramework.Controls.MetroPanel();
this.label_No = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label_Area = new System.Windows.Forms.Label();
this.metroPanel1.SuspendLayout();
this.SuspendLayout();
@@ -39,7 +38,6 @@
//
this.metroPanel1.BackColor = System.Drawing.Color.White;
this.metroPanel1.Controls.Add(this.label_No);
this.metroPanel1.Controls.Add(this.label2);
this.metroPanel1.Controls.Add(this.label_Area);
this.metroPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.metroPanel1.HorizontalScrollbarBarColor = true;
@@ -57,22 +55,12 @@
//
this.label_No.AutoSize = true;
this.label_No.Font = new System.Drawing.Font("맑은 고딕", 20.25F, System.Drawing.FontStyle.Bold);
this.label_No.Location = new System.Drawing.Point(167, 50);
this.label_No.Location = new System.Drawing.Point(17, 53);
this.label_No.Name = "label_No";
this.label_No.Size = new System.Drawing.Size(170, 37);
this.label_No.TabIndex = 5;
this.label_No.Text = "2023-L9999";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 20.25F, System.Drawing.FontStyle.Bold);
this.label2.Location = new System.Drawing.Point(30, 50);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(141, 37);
this.label2.TabIndex = 3;
this.label2.Text = "차량번호 :";
//
// label_Area
//
this.label_Area.AutoSize = true;
@@ -104,6 +92,5 @@
private MetroFramework.Controls.MetroPanel metroPanel1;
private System.Windows.Forms.Label label_Area;
private System.Windows.Forms.Label label_No;
private System.Windows.Forms.Label label2;
}
}

142
HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs
View File

@@ -75,14 +75,142 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl
private void metroButton_Test_Click(object sender, EventArgs e)
{
List<ResultSetUserListInformation> test = new List<ResultSetUserListInformation>();
for (int i = 0; i < 120; i++)
{
ResultSetUserListInformation r = new ResultSetUserListInformation();
r.Area = $"대형-{i}";
r.ApplicantNo = $"2023-T{i}";
test.Add(r);
}
test.Add(new ResultSetUserListInformation() { Area = "대형-71", CargoVehicleNumber = "경기80바2913" });
test.Add(new ResultSetUserListInformation() { Area = "대형-72", CargoVehicleNumber = "경기91사2966" });
test.Add(new ResultSetUserListInformation() { Area = "대형-73", CargoVehicleNumber = "경기80바2343" });
test.Add(new ResultSetUserListInformation() { Area = "대형-74", CargoVehicleNumber = "충북90아2804" });
test.Add(new ResultSetUserListInformation() { Area = "대형-75", CargoVehicleNumber = "경기91사2725" });
test.Add(new ResultSetUserListInformation() { Area = "대형-76", CargoVehicleNumber = "경기91바3472" });
test.Add(new ResultSetUserListInformation() { Area = "대형-77", CargoVehicleNumber = "전북83사7505" });
test.Add(new ResultSetUserListInformation() { Area = "대형-78", CargoVehicleNumber = "경기90아2858" });
test.Add(new ResultSetUserListInformation() { Area = "대형-79", CargoVehicleNumber = "경북83아4539" });
test.Add(new ResultSetUserListInformation() { Area = "대형-80", CargoVehicleNumber = "경기86아2695" });
test.Add(new ResultSetUserListInformation() { Area = "대형-81", CargoVehicleNumber = "경기91사2741" });
test.Add(new ResultSetUserListInformation() { Area = "대형-82", CargoVehicleNumber = "경기83사2029" });
test.Add(new ResultSetUserListInformation() { Area = "대형-83", CargoVehicleNumber = "경기85사2524" });
test.Add(new ResultSetUserListInformation() { Area = "대형-84", CargoVehicleNumber = "경기88자1267" });
test.Add(new ResultSetUserListInformation() { Area = "대형-85", CargoVehicleNumber = "인천85아6599" });
test.Add(new ResultSetUserListInformation() { Area = "대형-86", CargoVehicleNumber = "경기85사5585" });
test.Add(new ResultSetUserListInformation() { Area = "대형-87", CargoVehicleNumber = "경기92바5207" });
test.Add(new ResultSetUserListInformation() { Area = "대형-88", CargoVehicleNumber = "경기91사1314" });
test.Add(new ResultSetUserListInformation() { Area = "대형-89", CargoVehicleNumber = "대전87아7001" });
test.Add(new ResultSetUserListInformation() { Area = "대형-90", CargoVehicleNumber = "강원81바1814" });
test.Add(new ResultSetUserListInformation() { Area = "대형-91", CargoVehicleNumber = "경기99바2453" });
test.Add(new ResultSetUserListInformation() { Area = "대형-92", CargoVehicleNumber = "경기93자2305" });
test.Add(new ResultSetUserListInformation() { Area = "대형-93", CargoVehicleNumber = "충북90아6114" });
test.Add(new ResultSetUserListInformation() { Area = "대형-94", CargoVehicleNumber = "경기91바3453" });
test.Add(new ResultSetUserListInformation() { Area = "대형-95", CargoVehicleNumber = "울산80사3828" });
test.Add(new ResultSetUserListInformation() { Area = "대형-96", CargoVehicleNumber = "경기89아3489" });
test.Add(new ResultSetUserListInformation() { Area = "대형-97", CargoVehicleNumber = "경기80자2670" });
test.Add(new ResultSetUserListInformation() { Area = "대형-98", CargoVehicleNumber = "경기86아2173" });
test.Add(new ResultSetUserListInformation() { Area = "대형-99", CargoVehicleNumber = "경기84아3318" });
test.Add(new ResultSetUserListInformation() { Area = "대형-100", CargoVehicleNumber = "경기91바3887" });
test.Add(new ResultSetUserListInformation() { Area = "대형-101", CargoVehicleNumber = "대구80아8263" });
test.Add(new ResultSetUserListInformation() { Area = "대형-102", CargoVehicleNumber = "경기85바4307" });
test.Add(new ResultSetUserListInformation() { Area = "대형-103", CargoVehicleNumber = "경기88사3289" });
test.Add(new ResultSetUserListInformation() { Area = "대형-104", CargoVehicleNumber = "경기91사2709" });
test.Add(new ResultSetUserListInformation() { Area = "대형-105", CargoVehicleNumber = "서울82바6642" });
test.Add(new ResultSetUserListInformation() { Area = "대형-106", CargoVehicleNumber = "경기92자7043" });
test.Add(new ResultSetUserListInformation() { Area = "대형-107", CargoVehicleNumber = "경기90아2153" });
test.Add(new ResultSetUserListInformation() { Area = "대형-108", CargoVehicleNumber = "경기96자8057" });
test.Add(new ResultSetUserListInformation() { Area = "대형-109", CargoVehicleNumber = "충남90사5502" });
test.Add(new ResultSetUserListInformation() { Area = "대형-110", CargoVehicleNumber = "경기91사1398" });
test.Add(new ResultSetUserListInformation() { Area = "대형-111", CargoVehicleNumber = "경기91아3689" });
test.Add(new ResultSetUserListInformation() { Area = "대형-112", CargoVehicleNumber = "경기94바6566" });
test.Add(new ResultSetUserListInformation() { Area = "대형-113", CargoVehicleNumber = "경기89자3121" });
test.Add(new ResultSetUserListInformation() { Area = "대형-114", CargoVehicleNumber = "경기95자7126" });
test.Add(new ResultSetUserListInformation() { Area = "대형-115", CargoVehicleNumber = "경기91바3429" });
test.Add(new ResultSetUserListInformation() { Area = "대형-116", CargoVehicleNumber = "경기93아4521" });
test.Add(new ResultSetUserListInformation() { Area = "대형-117", CargoVehicleNumber = "경기86사1353" });
test.Add(new ResultSetUserListInformation() { Area = "대형-118", CargoVehicleNumber = "경기92아8850" });
test.Add(new ResultSetUserListInformation() { Area = "대형-119", CargoVehicleNumber = "경기94자5244" });
test.Add(new ResultSetUserListInformation() { Area = "대형-120", CargoVehicleNumber = "경기91바2755" });
test.Add(new ResultSetUserListInformation() { Area = "대형-121", CargoVehicleNumber = "경기84아9360" });
test.Add(new ResultSetUserListInformation() { Area = "대형-122", CargoVehicleNumber = "경기93아4843" });
test.Add(new ResultSetUserListInformation() { Area = "대형-123", CargoVehicleNumber = "경기91사2740" });
test.Add(new ResultSetUserListInformation() { Area = "대형-124", CargoVehicleNumber = "경기91바2135" });
test.Add(new ResultSetUserListInformation() { Area = "대형-125", CargoVehicleNumber = "전북86사4060" });
test.Add(new ResultSetUserListInformation() { Area = "대형-126", CargoVehicleNumber = "경기91바9634" });
test.Add(new ResultSetUserListInformation() { Area = "대형-127", CargoVehicleNumber = "경기91아7075" });
test.Add(new ResultSetUserListInformation() { Area = "대형-128", CargoVehicleNumber = "경기85자5320" });
test.Add(new ResultSetUserListInformation() { Area = "대형-129", CargoVehicleNumber = "경기91자7657" });
test.Add(new ResultSetUserListInformation() { Area = "대형-130", CargoVehicleNumber = "경기93아6485" });
test.Add(new ResultSetUserListInformation() { Area = "대형-131", CargoVehicleNumber = "경기91아2053" });
test.Add(new ResultSetUserListInformation() { Area = "대형-132", CargoVehicleNumber = "경기91바3998" });
test.Add(new ResultSetUserListInformation() { Area = "대형-133", CargoVehicleNumber = "경기91아5063" });
test.Add(new ResultSetUserListInformation() { Area = "대형-134", CargoVehicleNumber = "경기91바3567" });
test.Add(new ResultSetUserListInformation() { Area = "대형-135", CargoVehicleNumber = "경기91사2772" });
test.Add(new ResultSetUserListInformation() { Area = "대형-136", CargoVehicleNumber = "경기93아4819" });
test.Add(new ResultSetUserListInformation() { Area = "대형-137", CargoVehicleNumber = "경기96자8163" });
test.Add(new ResultSetUserListInformation() { Area = "대형-138", CargoVehicleNumber = "경기92아2589" });
test.Add(new ResultSetUserListInformation() { Area = "대형-139", CargoVehicleNumber = "경기85자5138" });
test.Add(new ResultSetUserListInformation() { Area = "대형-140", CargoVehicleNumber = "충북84아6995" });
test.Add(new ResultSetUserListInformation() { Area = "대형-141", CargoVehicleNumber = "경기92사6016" });
test.Add(new ResultSetUserListInformation() { Area = "대형-142", CargoVehicleNumber = "경기81바3852" });
test.Add(new ResultSetUserListInformation() { Area = "대형-143", CargoVehicleNumber = "서울90바4109" });
test.Add(new ResultSetUserListInformation() { Area = "대형-144", CargoVehicleNumber = "경기91사2642" });
test.Add(new ResultSetUserListInformation() { Area = "대형-145", CargoVehicleNumber = "경기91사2115" });
test.Add(new ResultSetUserListInformation() { Area = "대형-146", CargoVehicleNumber = "85고0299" });
test.Add(new ResultSetUserListInformation() { Area = "대형-147", CargoVehicleNumber = "경기91사1347" });
test.Add(new ResultSetUserListInformation() { Area = "대형-148", CargoVehicleNumber = "경기91바9438" });
test.Add(new ResultSetUserListInformation() { Area = "대형-149", CargoVehicleNumber = "경기80바3144" });
test.Add(new ResultSetUserListInformation() { Area = "대형-150", CargoVehicleNumber = "경기94사4622" });
test.Add(new ResultSetUserListInformation() { Area = "대형-151", CargoVehicleNumber = "경기80바1574" });
test.Add(new ResultSetUserListInformation() { Area = "대형-152", CargoVehicleNumber = "경기94자4214" });
test.Add(new ResultSetUserListInformation() { Area = "대형-153", CargoVehicleNumber = "경기96자8095" });
test.Add(new ResultSetUserListInformation() { Area = "대형-154", CargoVehicleNumber = "경기91사1360" });
test.Add(new ResultSetUserListInformation() { Area = "대형-155", CargoVehicleNumber = "경기92사3330" });
test.Add(new ResultSetUserListInformation() { Area = "대형-156", CargoVehicleNumber = "충남84바2530" });
test.Add(new ResultSetUserListInformation() { Area = "대형-157", CargoVehicleNumber = "경기88자2550" });
test.Add(new ResultSetUserListInformation() { Area = "대형-158", CargoVehicleNumber = "경기91바9854" });
test.Add(new ResultSetUserListInformation() { Area = "대형-159", CargoVehicleNumber = "경기96자8137" });
test.Add(new ResultSetUserListInformation() { Area = "대형-160", CargoVehicleNumber = "경기91바3777" });
test.Add(new ResultSetUserListInformation() { Area = "대형-161", CargoVehicleNumber = "경기82바8217" });
test.Add(new ResultSetUserListInformation() { Area = "대형-162", CargoVehicleNumber = "경기88자2703" });
test.Add(new ResultSetUserListInformation() { Area = "대형-163", CargoVehicleNumber = "경기90바4618" });
test.Add(new ResultSetUserListInformation() { Area = "대형-164", CargoVehicleNumber = "경기88바4743" });
test.Add(new ResultSetUserListInformation() { Area = "대형-165", CargoVehicleNumber = "경기80사5567" });
test.Add(new ResultSetUserListInformation() { Area = "대형-166", CargoVehicleNumber = "경기89사3538" });
test.Add(new ResultSetUserListInformation() { Area = "대형-167", CargoVehicleNumber = "부선90아6231" });
test.Add(new ResultSetUserListInformation() { Area = "대형-168", CargoVehicleNumber = "경기87바1996" });
test.Add(new ResultSetUserListInformation() { Area = "대형-169", CargoVehicleNumber = "경기93자8628" });
test.Add(new ResultSetUserListInformation() { Area = "대형-170", CargoVehicleNumber = "경기86사9238" });
test.Add(new ResultSetUserListInformation() { Area = "대형-171", CargoVehicleNumber = "경기91사1340" });
test.Add(new ResultSetUserListInformation() { Area = "대형-172", CargoVehicleNumber = "충남90사3084" });
test.Add(new ResultSetUserListInformation() { Area = "대형-173", CargoVehicleNumber = "경기91바2939" });
test.Add(new ResultSetUserListInformation() { Area = "대형-174", CargoVehicleNumber = "경기91사2683" });
test.Add(new ResultSetUserListInformation() { Area = "대형-175", CargoVehicleNumber = "경기80바3406" });
test.Add(new ResultSetUserListInformation() { Area = "대형-176", CargoVehicleNumber = "경기89바9523" });
test.Add(new ResultSetUserListInformation() { Area = "대형-177", CargoVehicleNumber = "인천85사7058" });
test.Add(new ResultSetUserListInformation() { Area = "대형-178", CargoVehicleNumber = "전북80아3230" });
test.Add(new ResultSetUserListInformation() { Area = "대형-179", CargoVehicleNumber = "경기91바6204" });
test.Add(new ResultSetUserListInformation() { Area = "대형-180", CargoVehicleNumber = "경기92자2096" });
test.Add(new ResultSetUserListInformation() { Area = "대형-181", CargoVehicleNumber = "경기89바9892" });
test.Add(new ResultSetUserListInformation() { Area = "대형-182", CargoVehicleNumber = "경남82사2880" });
test.Add(new ResultSetUserListInformation() { Area = "대형-183", CargoVehicleNumber = "인천86바8635" });
test.Add(new ResultSetUserListInformation() { Area = "대형-184", CargoVehicleNumber = "서울88아8219" });
test.Add(new ResultSetUserListInformation() { Area = "대형-185", CargoVehicleNumber = "경기92자6731" });
test.Add(new ResultSetUserListInformation() { Area = "대형-186", CargoVehicleNumber = "대전87아2411" });
test.Add(new ResultSetUserListInformation() { Area = "대형-187", CargoVehicleNumber = "경기91바7371" });
test.Add(new ResultSetUserListInformation() { Area = "대형-188", CargoVehicleNumber = "경기91바7387" });
test.Add(new ResultSetUserListInformation() { Area = "대형-189", CargoVehicleNumber = "경북81아6236" });
test.Add(new ResultSetUserListInformation() { Area = "대형-190", CargoVehicleNumber = "경기91아9332" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-1", CargoVehicleNumber = "전북89사1161, 충북91사6865" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-2", CargoVehicleNumber = "서울83바6743, 서울83바6747" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-3", CargoVehicleNumber = "서울98바7248, 경기94아6348" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-4", CargoVehicleNumber = "99아8359, 경기89아6991" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-5", CargoVehicleNumber = "서울83바6742, 서울83바6746" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-6", CargoVehicleNumber = "경기99바1910 경기91바8056" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-7", CargoVehicleNumber = "서울83바6057 서울83바 4273" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-8", CargoVehicleNumber = "전남98자2597, 95우6024" });
test.Add(new ResultSetUserListInformation() { Area = "특대형-9", CargoVehicleNumber = "서울90바2569, 서울82사7278" });
LotsScreen lotsScreen = new LotsScreen(test);
lotsScreen.Show();
}

22
HSUCO_Cargo_Garage_Operation_Program/Database.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Data.SQLite;
using System.Diagnostics;
using System.Drawing.Printing;
using System.Globalization;
using System.IO;
@@ -811,8 +812,8 @@ namespace HSUCO_Cargo_Garage_Operation_Program
// 사용자 랜덤
tempUserList.Shuffle();
int countInsideLarge = tempUserList.Count( x => x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down);
int countInsideOversized = tempUserList.Count(x => x.Inside && x.VehicleType == EVehicleType.Oversized_Up || x.VehicleType == EVehicleType.Oversized_Down);
int countInsideLarge = tempUserList.Count( x => x.Inside && (x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down));
int countInsideOversized = tempUserList.Count(x => x.Inside && (x.VehicleType == EVehicleType.Oversized_Up || x.VehicleType == EVehicleType.Oversized_Down));
List<SetUserListInformation> setUserListInformationLarge = new List<SetUserListInformation>();
List<SetUserListInformation> setUserListInformationOversized = new List<SetUserListInformation>();
@@ -821,12 +822,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program
{
int tmepCount = leftAreaInformation.Large.Count - countInsideLarge;
setUserListInformationLarge.AddRange(tempUserList.Where(x => x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down));
setUserListInformationLarge.AddRange(tempUserList.Where(x => !x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down).Take(tmepCount));
setUserListInformationLarge.AddRange(tempUserList.Where(x => x.Inside && (x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down)));
setUserListInformationLarge.AddRange(tempUserList.Where(x => !x.Inside && (x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down)).Take(tmepCount));
}
else // 화성시만으로 자리가 꽉참
{
setUserListInformationLarge.AddRange(tempUserList.Where(x => x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down).Take(leftAreaInformation.Large.Count));
setUserListInformationLarge.AddRange(tempUserList.Where(x => x.Inside && (x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down)).Take(leftAreaInformation.Large.Count));
}
// OverSized 차량들이 남은 자리보다 적을때
@@ -834,19 +835,22 @@ namespace HSUCO_Cargo_Garage_Operation_Program
{
int tmepCount = leftAreaInformation.OverSized.Count - countInsideOversized;
setUserListInformationOversized.AddRange(tempUserList.Where(x => x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down));
setUserListInformationOversized.AddRange(tempUserList.Where(x => !x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down).Take(tmepCount));
setUserListInformationOversized.AddRange(tempUserList.Where(x => x.Inside &&( x.VehicleType == EVehicleType.Oversized_Up || x.VehicleType == EVehicleType.Oversized_Down)));
setUserListInformationOversized.AddRange(tempUserList.Where(x => !x.Inside && (x.VehicleType == EVehicleType.Oversized_Up || x.VehicleType == EVehicleType.Oversized_Down)).Take(tmepCount));
}
else // 화성
{
setUserListInformationOversized.AddRange(tempUserList.Where(x => x.Inside && x.VehicleType == EVehicleType.Large_Up || x.VehicleType == EVehicleType.Large_Down).Take(leftAreaInformation.OverSized.Count));
setUserListInformationOversized.AddRange(tempUserList.Where(x => x.Inside && (x.VehicleType == EVehicleType.Oversized_Up || x.VehicleType == EVehicleType.Oversized_Down)).Take(leftAreaInformation.OverSized.Count));
}
List<SetUserListInformation> setUserListInformationFinal = new List<SetUserListInformation>();
string test = "";
for (int i = 0; i < setUserListInformationLarge.Count; i++)
{
var mm = setUserListInformationLarge.Where(x => x.UID == setUserListInformationLarge[i].UID);
test += mm.Count();
SetUserListInformation setUserListInformation = setUserListInformationLarge[i];
setUserListInformation.Area = "대형-" + leftAreaInformation.Large[i];
setUserListInformationFinal.Add(setUserListInformation);

4
HSUCO_Cargo_Garage_Operation_Program/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.*")]
[assembly: AssemblyFileVersion("1.2.*")]
[assembly: AssemblyVersion("1.5.*")]
[assembly: AssemblyFileVersion("1.5.*")]