リビジョン 289
データモデル定数追加
日報一覧バグ修正
資材返却画面ロックバグ修正
売上一覧発注先検索追加
部署マスタグリッド表示サイズバグ修正
ログイン・メニュー処置マスタ値取得処理修正
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 99;
|
|
17 |
public static int s_SystemVersion = 100;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/DataModel/ApprovalMaster.cs | ||
---|---|---|
22 | 22 |
/// </summary> |
23 | 23 |
Normal = 0, |
24 | 24 |
/// <summary> |
25 |
/// 最終承認者 |
|
25 |
/// 1:最終承認者
|
|
26 | 26 |
/// </summary> |
27 | 27 |
LastApproval, |
28 | 28 |
} |
branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBudgetDetail.cs | ||
---|---|---|
10 | 10 |
/// </summary> |
11 | 11 |
public class ConstructionBudgetDetail |
12 | 12 |
{ |
13 |
#region 定数 |
|
14 |
|
|
15 |
#region 工事詳細台帳明細:協力会社コードタイプ |
|
16 |
/// <summary> |
|
17 |
/// 協力会社コードタイプ |
|
18 |
/// </summary> |
|
19 |
public enum CompanyTypeDef |
|
20 |
{ |
|
21 |
/// <summary> |
|
22 |
/// 固定コード |
|
23 |
/// </summary> |
|
24 |
UnKnown = 0, |
|
25 |
/// <summary> |
|
26 |
/// 協力会社コード |
|
27 |
/// </summary> |
|
28 |
Subconstractor, |
|
29 |
/// <summary> |
|
30 |
/// 担当者コード |
|
31 |
/// </summary> |
|
32 |
Person, |
|
33 |
} |
|
34 |
#endregion |
|
35 |
|
|
36 |
#endregion |
|
37 |
|
|
13 | 38 |
#region メンバ変数 |
14 | 39 |
|
15 | 40 |
private int m_ConstructionCode = 0; // 工事コード |
branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs | ||
---|---|---|
11 | 11 |
public class ConstructionLedgerDetail |
12 | 12 |
{ |
13 | 13 |
#region 定数 |
14 |
|
|
15 |
#region 工事詳細台帳明細:協力会社コードタイプ |
|
16 |
/// <summary> |
|
17 |
/// 協力会社コードタイプ |
|
18 |
/// </summary> |
|
19 |
public enum CompanyTypeDef |
|
20 |
{ |
|
21 |
/// <summary> |
|
22 |
/// 固定コード |
|
23 |
/// </summary> |
|
24 |
UnKnown = 0, |
|
25 |
/// <summary> |
|
26 |
/// 協力会社コード |
|
27 |
/// </summary> |
|
28 |
Subconstractor, |
|
29 |
/// <summary> |
|
30 |
/// 担当者コード |
|
31 |
/// </summary> |
|
32 |
Person, |
|
33 |
} |
|
34 |
#endregion |
|
35 |
|
|
14 | 36 |
#region 工事詳細台帳明細:担当中フラグ |
15 | 37 |
/// <summary> |
16 | 38 |
/// 担当中フラグ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs | ||
---|---|---|
1926 | 1926 |
ArrayList ArList = new ArrayList(); |
1927 | 1927 |
string strSQL = "SELECT"; |
1928 | 1928 |
strSQL += " A.ConstructionCode"; // 工事コード |
1929 |
strSQL += ", A.GroupCount"; // グループ番号 |
|
1930 |
strSQL += ", A.LineCount"; // 行番号 |
|
1931 |
strSQL += ", A.ComponentCode"; // 構成キー |
|
1929 |
strSQL += ", A.GroupCount"; // グループ番号
|
|
1930 |
strSQL += ", A.LineCount"; // 行番号
|
|
1931 |
strSQL += ", A.ComponentCode"; // 構成キー
|
|
1932 | 1932 |
strSQL += ", A.ItemCode"; // 工種キー |
1933 |
strSQL += ", A.CompanyCode"; // 協力会社コード |
|
1934 |
strSQL += ", A.FirstString"; // 構成名称 |
|
1935 |
strSQL += ", A.SecondString"; // 工種名称・協力会社名 |
|
1936 |
strSQL += ", A.EstimatePrice"; // 見積時金額 |
|
1937 |
strSQL += ", A.NegotiationPrice"; // 交渉時金額 |
|
1938 |
strSQL += ", A.Notes"; // 注意事項 |
|
1933 |
strSQL += ", A.CompanyCode"; // 協力会社コード
|
|
1934 |
strSQL += ", A.FirstString"; // 構成名称
|
|
1935 |
strSQL += ", A.SecondString"; // 工種名称・協力会社名
|
|
1936 |
strSQL += ", A.EstimatePrice"; // 見積時金額
|
|
1937 |
strSQL += ", A.NegotiationPrice"; // 交渉時金額
|
|
1938 |
strSQL += ", A.Notes"; // 注意事項
|
|
1939 | 1939 |
|
1940 | 1940 |
strSQL += ", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')"; |
1941 | 1941 |
strSQL += ", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')"; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
---|---|---|
2018 | 2018 |
} |
2019 | 2019 |
|
2020 | 2020 |
|
2021 |
RowData[(int)GridColumn.SalaryFlg] = SalaryFlg; // 給与振分区分
|
|
2022 |
RowData[(int)GridColumn.SalaryDays] = SalaryDays; // 給与振分日数
|
|
2021 |
RowData[(int)GridColumn.SalaryFlg] = SalaryFlg; // 給与振分区分 |
|
2022 |
RowData[(int)GridColumn.SalaryDays] = SalaryDays; // 給与振分日数 |
|
2023 | 2023 |
RowData[(int)GridColumn.OperatingFlg] = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing; // 担当中フラグ |
2024 |
RowData[(int)GridColumn.CompanyType] = (int)CommonDefine.CodeDataType.Person; // コードタイプ(担当者)
|
|
2024 |
RowData[(int)GridColumn.CompanyType] = (int)CommonDefine.CodeDataType.Person; // コードタイプ(担当者) |
|
2025 | 2025 |
} |
2026 | 2026 |
catch (Exception ex) |
2027 | 2027 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs | ||
---|---|---|
274 | 274 |
strSub1.Append(" AND C.DEPARTMENTCODE = D.DEPARTMENTCODE"); |
275 | 275 |
// strSub1.Append(" AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"); 2017/10/30 ?????o??????????????????????? |
276 | 276 |
// ????????H?????????H?? |
277 |
strSub2.Append(" UNION (SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING , D.PERSONCODE, D.PERSONNAME, MAX(DATE_FORMAT(C.DAILYDATADATE,'%Y/%m/%d'))"); |
|
278 |
strSub2.Append(" , E.DEPARTMENTCODE, E.DEPARTMENTSTRING, E.DISPLAYORDER, D.DISPLAYORDER, F.COMPLATEFLG"); |
|
279 |
strSub2.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, DAILYDATACONSTRUCTION C, PERSONINCHARGEMASTER D, DEPARTMENTMASTER E, CONSTRUCTIONLEDGER F"); |
|
277 |
strSub2.Append(" UNION (SELECT"); |
|
278 |
strSub2.Append(" A.CONSTRUCTIONCODE"); |
|
279 |
strSub2.Append(", B.DETAILSTRING"); |
|
280 |
strSub2.Append(", D.PERSONCODE"); |
|
281 |
strSub2.Append(", D.PERSONNAME"); |
|
282 |
strSub2.Append(", MAX(DATE_FORMAT(C.DAILYDATADATE,'%Y/%m/%d'))"); |
|
283 |
strSub2.Append(", E.DEPARTMENTCODE"); |
|
284 |
strSub2.Append(", E.DEPARTMENTSTRING"); |
|
285 |
strSub2.Append(", E.DISPLAYORDER"); |
|
286 |
strSub2.Append(", D.DISPLAYORDER"); |
|
287 |
strSub2.Append(", 0"); |
|
288 |
//strSub2.Append(", F.COMPLATEFLG"); |
|
289 |
strSub2.Append(" FROM CONSTRUCTIONBASEINFO A"); |
|
290 |
strSub2.Append(", CONSTRUCTIONBASEINFODETAIL B"); |
|
291 |
strSub2.Append(", DAILYDATACONSTRUCTION C"); |
|
292 |
strSub2.Append(", PERSONINCHARGEMASTER D"); |
|
293 |
strSub2.Append(", DEPARTMENTMASTER E"); |
|
294 |
//strSub2.Append(", CONSTRUCTIONLEDGER F"); |
|
280 | 295 |
strSub2.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value); |
281 | 296 |
// ?S????I????????? |
282 | 297 |
if (PersonCode > 0) |
... | ... | |
289 | 304 |
if (DepartmentCode > 0) |
290 | 305 |
strSub2.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode); |
291 | 306 |
strSub2.Append(" AND D.DEPARTMENTCODE = E.DEPARTMENTCODE"); |
292 |
strSub2.Append(" AND F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"); |
|
307 |
// strSub2.Append(" AND F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
|
|
293 | 308 |
|
294 | 309 |
strSQL.Append(strSub1.ToString() + strSecurity.ToString() + strSub2.ToString() + strSecurity.ToString()); |
295 |
strSQL.Append(" GROUP BY A.CONSTRUCTIONCODE, B.DETAILSTRING, D.PERSONCODE, D.PERSONNAME, E.DEPARTMENTCODE, E.DEPARTMENTSTRING, E.DISPLAYORDER, D.DISPLAYORDER, F.COMPLATEFLG)"); |
|
310 |
strSQL.Append(" GROUP BY A.CONSTRUCTIONCODE"); |
|
311 |
strSQL.Append(", B.DETAILSTRING"); |
|
312 |
strSQL.Append(", D.PERSONCODE"); |
|
313 |
strSQL.Append(", D.PERSONNAME"); |
|
314 |
strSQL.Append(", E.DEPARTMENTCODE"); |
|
315 |
strSQL.Append(", E.DEPARTMENTSTRING"); |
|
316 |
strSQL.Append(", E.DISPLAYORDER"); |
|
317 |
strSQL.Append(", D.DISPLAYORDER)"); |
|
318 |
//strSQL.Append(", F.COMPLATEFLG)"); |
|
296 | 319 |
// Order by ?t?? |
297 | 320 |
strSQL.Append(" ORDER BY 10 ASC, 8 ASC, 9 ASC, 6 ASC, 7 ASC, 3 ASC"); |
298 | 321 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs | ||
---|---|---|
544 | 544 |
ReadDataKey[1] = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]); |
545 | 545 |
dtReadRentProcessDate = CommonMotions.cnvDate(work[(int)DataColumn.RentProcessDate]).Date; |
546 | 546 |
|
547 |
if (ReadDataKey[1] == 107)
|
|
547 |
if (ReadDataKey[1] == 100)
|
|
548 | 548 |
{ |
549 | 549 |
Debug.WriteLine(""); |
550 | 550 |
} |
... | ... | |
616 | 616 |
{ |
617 | 617 |
//tglAllReturn.Enabled = CompleteFlg; |
618 | 618 |
btnDataEntry.Enabled = CompleteFlg; |
619 |
dgvMaster.Enabled = CompleteFlg;
|
|
619 |
//dgvMaster.ReadOnly = !CompleteFlg;
|
|
620 | 620 |
} |
621 | 621 |
|
622 | 622 |
m_bChengeAns = false; |
... | ... | |
690 | 690 |
dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Style.ForeColor = Color.White; |
691 | 691 |
dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Style.BackColor = Color.Black; |
692 | 692 |
nCompCnt++; |
693 |
// 書込み禁止 |
|
694 |
for (int i = (int)DispColumn.RentCount; i < (int)DispColumn.ComplateFlg; i++) |
|
695 |
{ |
|
696 |
dgvMaster.Rows[icnt].Cells[i].ReadOnly = true; |
|
697 |
} |
|
693 | 698 |
} |
694 | 699 |
dgvMaster.Rows[icnt].Cells[(int)DispColumn.RentProcessDate].Value = CommonMotions.cnvDate(work[(int)DispColumn.RentProcessDate]).ToShortDateString(); |
695 | 700 |
dgvMaster.Rows[icnt].Cells[(int)DispColumn.ComplateFlg].Value = CommonMotions.cnvInt(work[(int)DispColumn.ComplateFlg]); |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs | ||
---|---|---|
48 | 48 |
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
49 | 49 |
this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
50 | 50 |
this.btnEnd = new System.Windows.Forms.Button(); |
51 |
this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
|
51 |
this.lblCellTotal = new System.Windows.Forms.Label(); |
|
52 |
this.grpType1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
|
52 | 53 |
this.radioButton2 = new System.Windows.Forms.RadioButton(); |
54 |
this.label4 = new System.Windows.Forms.Label(); |
|
53 | 55 |
this.radioButton1 = new System.Windows.Forms.RadioButton(); |
56 |
this.comboBox2 = new System.Windows.Forms.ComboBox(); |
|
57 |
this.comboBox3 = new System.Windows.Forms.ComboBox(); |
|
58 |
this.label5 = new System.Windows.Forms.Label(); |
|
59 |
this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
|
54 | 60 |
this.comboBox1 = new System.Windows.Forms.ComboBox(); |
55 | 61 |
this.lblTotal = new System.Windows.Forms.Label(); |
56 | 62 |
this.label1 = new System.Windows.Forms.Label(); |
57 | 63 |
this.label7 = new System.Windows.Forms.Label(); |
58 | 64 |
this.label6 = new System.Windows.Forms.Label(); |
59 | 65 |
this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); |
60 |
this.label5 = new System.Windows.Forms.Label(); |
|
61 |
this.comboBox3 = new System.Windows.Forms.ComboBox(); |
|
62 |
this.label4 = new System.Windows.Forms.Label(); |
|
63 |
this.comboBox2 = new System.Windows.Forms.ComboBox(); |
|
64 | 66 |
this.label8 = new System.Windows.Forms.Label(); |
65 | 67 |
this.label2 = new System.Windows.Forms.Label(); |
66 |
this.lblCellTotal = new System.Windows.Forms.Label(); |
|
68 |
this.grpType2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
|
69 |
this.label9 = new System.Windows.Forms.Label(); |
|
70 |
this.comboBox4 = new System.Windows.Forms.ComboBox(); |
|
71 |
this.comboBox5 = new System.Windows.Forms.ComboBox(); |
|
72 |
this.label10 = new System.Windows.Forms.Label(); |
|
67 | 73 |
((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit(); |
74 |
this.grpType1.SuspendLayout(); |
|
68 | 75 |
this.groupBox1.SuspendLayout(); |
69 | 76 |
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); |
77 |
this.grpType2.SuspendLayout(); |
|
70 | 78 |
this.SuspendLayout(); |
71 | 79 |
// |
72 | 80 |
// label3 |
... | ... | |
116 | 124 |
this.Column8, |
117 | 125 |
this.Column9}); |
118 | 126 |
this.dgvMaster.EnableHeadersVisualStyles = false; |
119 |
this.dgvMaster.Location = new System.Drawing.Point(10, 133);
|
|
127 |
this.dgvMaster.Location = new System.Drawing.Point(10, 158);
|
|
120 | 128 |
this.dgvMaster.Name = "dgvMaster"; |
121 | 129 |
this.dgvMaster.RowHeadersVisible = false; |
122 | 130 |
this.dgvMaster.RowHeadersWidth = 24; |
123 | 131 |
this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; |
124 | 132 |
this.dgvMaster.RowTemplate.Height = 24; |
125 | 133 |
this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; |
126 |
this.dgvMaster.Size = new System.Drawing.Size(1260, 506);
|
|
134 |
this.dgvMaster.Size = new System.Drawing.Size(1260, 482);
|
|
127 | 135 |
this.dgvMaster.TabIndex = 7; |
128 | 136 |
this.dgvMaster.SelectionChanged += new System.EventHandler(this.dgvMaster_SelectionChanged); |
129 | 137 |
this.dgvMaster.SizeChanged += new System.EventHandler(this.dgvMaster_SizeChanged); |
... | ... | |
248 | 256 |
this.btnEnd.UseVisualStyleBackColor = false; |
249 | 257 |
this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click); |
250 | 258 |
// |
251 |
// groupBox1
|
|
259 |
// lblCellTotal
|
|
252 | 260 |
// |
253 |
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) |
|
254 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
255 |
this.groupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); |
|
256 |
this.groupBox1.BorderColor = System.Drawing.Color.White; |
|
257 |
this.groupBox1.Controls.Add(this.radioButton2); |
|
258 |
this.groupBox1.Controls.Add(this.radioButton1); |
|
259 |
this.groupBox1.Controls.Add(this.comboBox1); |
|
260 |
this.groupBox1.Controls.Add(this.lblTotal); |
|
261 |
this.groupBox1.Controls.Add(this.label1); |
|
262 |
this.groupBox1.Controls.Add(this.label7); |
|
263 |
this.groupBox1.Controls.Add(this.label6); |
|
264 |
this.groupBox1.Controls.Add(this.numericUpDown2); |
|
265 |
this.groupBox1.Controls.Add(this.label5); |
|
266 |
this.groupBox1.Controls.Add(this.comboBox3); |
|
267 |
this.groupBox1.Controls.Add(this.label4); |
|
268 |
this.groupBox1.Controls.Add(this.comboBox2); |
|
269 |
this.groupBox1.Controls.Add(this.label8); |
|
270 |
this.groupBox1.Controls.Add(this.label2); |
|
271 |
this.groupBox1.Location = new System.Drawing.Point(10, 40); |
|
272 |
this.groupBox1.Name = "groupBox1"; |
|
273 |
this.groupBox1.Size = new System.Drawing.Size(1260, 85); |
|
274 |
this.groupBox1.TabIndex = 21; |
|
275 |
this.groupBox1.TabStop = false; |
|
261 |
this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
262 |
this.lblCellTotal.AutoSize = true; |
|
263 |
this.lblCellTotal.BackColor = System.Drawing.Color.Black; |
|
264 |
this.lblCellTotal.Font = new System.Drawing.Font("MS P明朝", 9.75F, System.Drawing.FontStyle.Bold); |
|
265 |
this.lblCellTotal.ForeColor = System.Drawing.Color.WhiteSmoke; |
|
266 |
this.lblCellTotal.Location = new System.Drawing.Point(100, 650); |
|
267 |
this.lblCellTotal.Name = "lblCellTotal"; |
|
268 |
this.lblCellTotal.Size = new System.Drawing.Size(0, 13); |
|
269 |
this.lblCellTotal.TabIndex = 37; |
|
276 | 270 |
// |
271 |
// grpType1 |
|
272 |
// |
|
273 |
this.grpType1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); |
|
274 |
this.grpType1.BorderColor = System.Drawing.Color.White; |
|
275 |
this.grpType1.Controls.Add(this.radioButton2); |
|
276 |
this.grpType1.Controls.Add(this.label4); |
|
277 |
this.grpType1.Controls.Add(this.radioButton1); |
|
278 |
this.grpType1.Controls.Add(this.comboBox2); |
|
279 |
this.grpType1.Controls.Add(this.comboBox3); |
|
280 |
this.grpType1.Controls.Add(this.label5); |
|
281 |
this.grpType1.Location = new System.Drawing.Point(10, 116); |
|
282 |
this.grpType1.Name = "grpType1"; |
|
283 |
this.grpType1.Size = new System.Drawing.Size(1260, 36); |
|
284 |
this.grpType1.TabIndex = 38; |
|
285 |
this.grpType1.TabStop = false; |
|
286 |
// |
|
277 | 287 |
// radioButton2 |
278 | 288 |
// |
279 | 289 |
this.radioButton2.AutoSize = true; |
280 | 290 |
this.radioButton2.BackColor = System.Drawing.Color.Transparent; |
281 | 291 |
this.radioButton2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
282 | 292 |
this.radioButton2.ForeColor = System.Drawing.Color.Black; |
283 |
this.radioButton2.Location = new System.Drawing.Point(648, 66);
|
|
293 |
this.radioButton2.Location = new System.Drawing.Point(475, 17);
|
|
284 | 294 |
this.radioButton2.Name = "radioButton2"; |
285 | 295 |
this.radioButton2.Size = new System.Drawing.Size(77, 20); |
286 | 296 |
this.radioButton2.TabIndex = 46; |
... | ... | |
288 | 298 |
this.radioButton2.TextAlign = System.Drawing.ContentAlignment.BottomCenter; |
289 | 299 |
this.radioButton2.UseVisualStyleBackColor = false; |
290 | 300 |
// |
301 |
// label4 |
|
302 |
// |
|
303 |
this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
304 |
this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
305 |
this.label4.CausesValidation = false; |
|
306 |
this.label4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
307 |
this.label4.Location = new System.Drawing.Point(20, 4); |
|
308 |
this.label4.Name = "label4"; |
|
309 |
this.label4.Size = new System.Drawing.Size(120, 27); |
|
310 |
this.label4.TabIndex = 35; |
|
311 |
this.label4.Text = "部 署"; |
|
312 |
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
313 |
// |
|
291 | 314 |
// radioButton1 |
292 | 315 |
// |
293 | 316 |
this.radioButton1.AutoSize = true; |
... | ... | |
295 | 318 |
this.radioButton1.Checked = true; |
296 | 319 |
this.radioButton1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
297 | 320 |
this.radioButton1.ForeColor = System.Drawing.Color.Black; |
298 |
this.radioButton1.Location = new System.Drawing.Point(648, 46);
|
|
321 |
this.radioButton1.Location = new System.Drawing.Point(475, 0);
|
|
299 | 322 |
this.radioButton1.Name = "radioButton1"; |
300 | 323 |
this.radioButton1.Size = new System.Drawing.Size(77, 20); |
301 | 324 |
this.radioButton1.TabIndex = 45; |
... | ... | |
305 | 328 |
this.radioButton1.UseVisualStyleBackColor = false; |
306 | 329 |
this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged); |
307 | 330 |
// |
331 |
// comboBox2 |
|
332 |
// |
|
333 |
this.comboBox2.BackColor = System.Drawing.Color.White; |
|
334 |
this.comboBox2.DisplayMember = "Value"; |
|
335 |
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
336 |
this.comboBox2.DropDownWidth = 120; |
|
337 |
this.comboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
338 |
this.comboBox2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
339 |
this.comboBox2.FormattingEnabled = true; |
|
340 |
this.comboBox2.Location = new System.Drawing.Point(148, 5); |
|
341 |
this.comboBox2.Name = "comboBox2"; |
|
342 |
this.comboBox2.Size = new System.Drawing.Size(300, 24); |
|
343 |
this.comboBox2.TabIndex = 5; |
|
344 |
this.comboBox2.ValueMember = "Key"; |
|
345 |
// |
|
346 |
// comboBox3 |
|
347 |
// |
|
348 |
this.comboBox3.BackColor = System.Drawing.Color.White; |
|
349 |
this.comboBox3.DisplayMember = "Value"; |
|
350 |
this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
351 |
this.comboBox3.DropDownWidth = 120; |
|
352 |
this.comboBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
353 |
this.comboBox3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
354 |
this.comboBox3.FormattingEnabled = true; |
|
355 |
this.comboBox3.Location = new System.Drawing.Point(692, 5); |
|
356 |
this.comboBox3.Name = "comboBox3"; |
|
357 |
this.comboBox3.Size = new System.Drawing.Size(200, 24); |
|
358 |
this.comboBox3.TabIndex = 6; |
|
359 |
this.comboBox3.ValueMember = "Key"; |
|
360 |
// |
|
361 |
// label5 |
|
362 |
// |
|
363 |
this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
364 |
this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
365 |
this.label5.CausesValidation = false; |
|
366 |
this.label5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
367 |
this.label5.Location = new System.Drawing.Point(564, 4); |
|
368 |
this.label5.Name = "label5"; |
|
369 |
this.label5.Size = new System.Drawing.Size(120, 27); |
|
370 |
this.label5.TabIndex = 37; |
|
371 |
this.label5.Text = "担 当 者"; |
|
372 |
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
373 |
// |
|
374 |
// groupBox1 |
|
375 |
// |
|
376 |
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) |
|
377 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
378 |
this.groupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); |
|
379 |
this.groupBox1.BorderColor = System.Drawing.Color.White; |
|
380 |
this.groupBox1.Controls.Add(this.comboBox1); |
|
381 |
this.groupBox1.Controls.Add(this.lblTotal); |
|
382 |
this.groupBox1.Controls.Add(this.label1); |
|
383 |
this.groupBox1.Controls.Add(this.label7); |
|
384 |
this.groupBox1.Controls.Add(this.label6); |
|
385 |
this.groupBox1.Controls.Add(this.numericUpDown2); |
|
386 |
this.groupBox1.Controls.Add(this.label8); |
|
387 |
this.groupBox1.Controls.Add(this.label2); |
|
388 |
this.groupBox1.Location = new System.Drawing.Point(10, 40); |
|
389 |
this.groupBox1.Name = "groupBox1"; |
|
390 |
this.groupBox1.Size = new System.Drawing.Size(1260, 36); |
|
391 |
this.groupBox1.TabIndex = 21; |
|
392 |
this.groupBox1.TabStop = false; |
|
393 |
// |
|
308 | 394 |
// comboBox1 |
309 | 395 |
// |
310 | 396 |
this.comboBox1.BackColor = System.Drawing.Color.White; |
... | ... | |
314 | 400 |
this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
315 | 401 |
this.comboBox1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
316 | 402 |
this.comboBox1.FormattingEnabled = true; |
317 |
this.comboBox1.Location = new System.Drawing.Point(148, 52);
|
|
403 |
this.comboBox1.Location = new System.Drawing.Point(422, 5);
|
|
318 | 404 |
this.comboBox1.Name = "comboBox1"; |
319 | 405 |
this.comboBox1.Size = new System.Drawing.Size(130, 24); |
320 |
this.comboBox1.TabIndex = 32;
|
|
406 |
this.comboBox1.TabIndex = 2; |
|
321 | 407 |
this.comboBox1.ValueMember = "Key"; |
322 | 408 |
// |
323 | 409 |
// lblTotal |
... | ... | |
325 | 411 |
this.lblTotal.BackColor = System.Drawing.Color.White; |
326 | 412 |
this.lblTotal.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
327 | 413 |
this.lblTotal.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
328 |
this.lblTotal.Location = new System.Drawing.Point(422, 14);
|
|
414 |
this.lblTotal.Location = new System.Drawing.Point(1054, 2);
|
|
329 | 415 |
this.lblTotal.Name = "lblTotal"; |
330 | 416 |
this.lblTotal.Size = new System.Drawing.Size(200, 30); |
331 | 417 |
this.lblTotal.TabIndex = 22; |
... | ... | |
337 | 423 |
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
338 | 424 |
this.label1.CausesValidation = false; |
339 | 425 |
this.label1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
340 |
this.label1.Location = new System.Drawing.Point(20, 51);
|
|
426 |
this.label1.Location = new System.Drawing.Point(294, 4);
|
|
341 | 427 |
this.label1.Name = "label1"; |
342 | 428 |
this.label1.Size = new System.Drawing.Size(120, 27); |
343 | 429 |
this.label1.TabIndex = 41; |
... | ... | |
348 | 434 |
// |
349 | 435 |
this.label7.AutoSize = true; |
350 | 436 |
this.label7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
351 |
this.label7.Location = new System.Drawing.Point(253, 21);
|
|
437 |
this.label7.Location = new System.Drawing.Point(253, 9);
|
|
352 | 438 |
this.label7.Name = "label7"; |
353 | 439 |
this.label7.Size = new System.Drawing.Size(25, 16); |
354 | 440 |
this.label7.TabIndex = 40; |
... | ... | |
358 | 444 |
// |
359 | 445 |
this.label6.AutoSize = true; |
360 | 446 |
this.label6.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
361 |
this.label6.Location = new System.Drawing.Point(148, 21);
|
|
447 |
this.label6.Location = new System.Drawing.Point(148, 9);
|
|
362 | 448 |
this.label6.Name = "label6"; |
363 | 449 |
this.label6.Size = new System.Drawing.Size(25, 16); |
364 | 450 |
this.label6.TabIndex = 39; |
... | ... | |
367 | 453 |
// numericUpDown2 |
368 | 454 |
// |
369 | 455 |
this.numericUpDown2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
370 |
this.numericUpDown2.Location = new System.Drawing.Point(173, 18);
|
|
456 |
this.numericUpDown2.Location = new System.Drawing.Point(173, 6);
|
|
371 | 457 |
this.numericUpDown2.Maximum = new decimal(new int[] { |
372 | 458 |
12, |
373 | 459 |
0, |
... | ... | |
380 | 466 |
0}); |
381 | 467 |
this.numericUpDown2.Name = "numericUpDown2"; |
382 | 468 |
this.numericUpDown2.Size = new System.Drawing.Size(80, 23); |
383 |
this.numericUpDown2.TabIndex = 38;
|
|
469 |
this.numericUpDown2.TabIndex = 1;
|
|
384 | 470 |
this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; |
385 | 471 |
this.numericUpDown2.Value = new decimal(new int[] { |
386 | 472 |
1, |
... | ... | |
389 | 475 |
0}); |
390 | 476 |
this.numericUpDown2.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged); |
391 | 477 |
// |
392 |
// label5 |
|
393 |
// |
|
394 |
this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
395 |
this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
396 |
this.label5.CausesValidation = false; |
|
397 |
this.label5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
398 |
this.label5.Location = new System.Drawing.Point(725, 51); |
|
399 |
this.label5.Name = "label5"; |
|
400 |
this.label5.Size = new System.Drawing.Size(120, 27); |
|
401 |
this.label5.TabIndex = 37; |
|
402 |
this.label5.Text = "担 当 者"; |
|
403 |
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
404 |
// |
|
405 |
// comboBox3 |
|
406 |
// |
|
407 |
this.comboBox3.BackColor = System.Drawing.Color.White; |
|
408 |
this.comboBox3.DisplayMember = "Value"; |
|
409 |
this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
410 |
this.comboBox3.DropDownWidth = 120; |
|
411 |
this.comboBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
412 |
this.comboBox3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
413 |
this.comboBox3.FormattingEnabled = true; |
|
414 |
this.comboBox3.Location = new System.Drawing.Point(853, 52); |
|
415 |
this.comboBox3.Name = "comboBox3"; |
|
416 |
this.comboBox3.Size = new System.Drawing.Size(194, 24); |
|
417 |
this.comboBox3.TabIndex = 36; |
|
418 |
this.comboBox3.ValueMember = "Key"; |
|
419 |
// |
|
420 |
// label4 |
|
421 |
// |
|
422 |
this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
423 |
this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
424 |
this.label4.CausesValidation = false; |
|
425 |
this.label4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
426 |
this.label4.Location = new System.Drawing.Point(294, 51); |
|
427 |
this.label4.Name = "label4"; |
|
428 |
this.label4.Size = new System.Drawing.Size(120, 27); |
|
429 |
this.label4.TabIndex = 35; |
|
430 |
this.label4.Text = "部 署"; |
|
431 |
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
432 |
// |
|
433 |
// comboBox2 |
|
434 |
// |
|
435 |
this.comboBox2.BackColor = System.Drawing.Color.White; |
|
436 |
this.comboBox2.DisplayMember = "Value"; |
|
437 |
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
438 |
this.comboBox2.DropDownWidth = 120; |
|
439 |
this.comboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
440 |
this.comboBox2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
441 |
this.comboBox2.FormattingEnabled = true; |
|
442 |
this.comboBox2.Location = new System.Drawing.Point(422, 52); |
|
443 |
this.comboBox2.Name = "comboBox2"; |
|
444 |
this.comboBox2.Size = new System.Drawing.Size(200, 24); |
|
445 |
this.comboBox2.TabIndex = 34; |
|
446 |
this.comboBox2.ValueMember = "Key"; |
|
447 |
// |
|
448 | 478 |
// label8 |
449 | 479 |
// |
450 | 480 |
this.label8.BackColor = System.Drawing.Color.Black; |
... | ... | |
452 | 482 |
this.label8.CausesValidation = false; |
453 | 483 |
this.label8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
454 | 484 |
this.label8.ForeColor = System.Drawing.Color.White; |
455 |
this.label8.Location = new System.Drawing.Point(294, 14);
|
|
485 |
this.label8.Location = new System.Drawing.Point(926, 2);
|
|
456 | 486 |
this.label8.Name = "label8"; |
457 | 487 |
this.label8.Size = new System.Drawing.Size(120, 30); |
458 | 488 |
this.label8.TabIndex = 33; |
... | ... | |
465 | 495 |
this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
466 | 496 |
this.label2.CausesValidation = false; |
467 | 497 |
this.label2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
468 |
this.label2.Location = new System.Drawing.Point(20, 16);
|
|
498 |
this.label2.Location = new System.Drawing.Point(20, 4);
|
|
469 | 499 |
this.label2.Name = "label2"; |
470 | 500 |
this.label2.Size = new System.Drawing.Size(120, 27); |
471 | 501 |
this.label2.TabIndex = 33; |
472 | 502 |
this.label2.Text = "営業期"; |
473 | 503 |
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
474 | 504 |
// |
475 |
// lblCellTotal
|
|
505 |
// grpType2
|
|
476 | 506 |
// |
477 |
this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
478 |
this.lblCellTotal.AutoSize = true; |
|
479 |
this.lblCellTotal.BackColor = System.Drawing.Color.Black; |
|
480 |
this.lblCellTotal.Font = new System.Drawing.Font("MS P明朝", 9.75F, System.Drawing.FontStyle.Bold); |
|
481 |
this.lblCellTotal.ForeColor = System.Drawing.Color.WhiteSmoke; |
|
482 |
this.lblCellTotal.Location = new System.Drawing.Point(100, 650); |
|
483 |
this.lblCellTotal.Name = "lblCellTotal"; |
|
484 |
this.lblCellTotal.Size = new System.Drawing.Size(0, 13); |
|
485 |
this.lblCellTotal.TabIndex = 37; |
|
507 |
this.grpType2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); |
|
508 |
this.grpType2.BorderColor = System.Drawing.Color.White; |
|
509 |
this.grpType2.Controls.Add(this.label9); |
|
510 |
this.grpType2.Controls.Add(this.comboBox4); |
|
511 |
this.grpType2.Controls.Add(this.comboBox5); |
|
512 |
this.grpType2.Controls.Add(this.label10); |
|
513 |
this.grpType2.Location = new System.Drawing.Point(10, 78); |
|
514 |
this.grpType2.Name = "grpType2"; |
|
515 |
this.grpType2.Size = new System.Drawing.Size(1260, 36); |
|
516 |
this.grpType2.TabIndex = 39; |
|
517 |
this.grpType2.TabStop = false; |
|
486 | 518 |
// |
519 |
// label9 |
|
520 |
// |
|
521 |
this.label9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
522 |
this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
523 |
this.label9.CausesValidation = false; |
|
524 |
this.label9.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
525 |
this.label9.Location = new System.Drawing.Point(20, 4); |
|
526 |
this.label9.Name = "label9"; |
|
527 |
this.label9.Size = new System.Drawing.Size(120, 27); |
|
528 |
this.label9.TabIndex = 35; |
|
529 |
this.label9.Text = "発注区分"; |
|
530 |
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
531 |
// |
|
532 |
// comboBox4 |
|
533 |
// |
|
534 |
this.comboBox4.BackColor = System.Drawing.Color.White; |
|
535 |
this.comboBox4.DisplayMember = "Value"; |
|
536 |
this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
537 |
this.comboBox4.DropDownWidth = 120; |
|
538 |
this.comboBox4.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
539 |
this.comboBox4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
540 |
this.comboBox4.FormattingEnabled = true; |
|
541 |
this.comboBox4.Location = new System.Drawing.Point(148, 5); |
|
542 |
this.comboBox4.Name = "comboBox4"; |
|
543 |
this.comboBox4.Size = new System.Drawing.Size(404, 24); |
|
544 |
this.comboBox4.TabIndex = 3; |
|
545 |
this.comboBox4.ValueMember = "Key"; |
|
546 |
// |
|
547 |
// comboBox5 |
|
548 |
// |
|
549 |
this.comboBox5.BackColor = System.Drawing.Color.White; |
|
550 |
this.comboBox5.DisplayMember = "Value"; |
|
551 |
this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
552 |
this.comboBox5.DropDownWidth = 120; |
|
553 |
this.comboBox5.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
554 |
this.comboBox5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
555 |
this.comboBox5.FormattingEnabled = true; |
|
556 |
this.comboBox5.Location = new System.Drawing.Point(692, 5); |
|
557 |
this.comboBox5.Name = "comboBox5"; |
|
558 |
this.comboBox5.Size = new System.Drawing.Size(400, 24); |
|
559 |
this.comboBox5.TabIndex = 4; |
|
560 |
this.comboBox5.ValueMember = "Key"; |
|
561 |
// |
|
562 |
// label10 |
|
563 |
// |
|
564 |
this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
565 |
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
566 |
this.label10.CausesValidation = false; |
|
567 |
this.label10.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
568 |
this.label10.Location = new System.Drawing.Point(564, 4); |
|
569 |
this.label10.Name = "label10"; |
|
570 |
this.label10.Size = new System.Drawing.Size(120, 27); |
|
571 |
this.label10.TabIndex = 37; |
|
572 |
this.label10.Text = "発 注 者"; |
|
573 |
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
574 |
// |
|
487 | 575 |
// FrmSalesConfirm |
488 | 576 |
// |
489 | 577 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
490 | 578 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
491 | 579 |
this.BackColor = System.Drawing.Color.Black; |
492 | 580 |
this.ClientSize = new System.Drawing.Size(1280, 677); |
581 |
this.Controls.Add(this.grpType1); |
|
493 | 582 |
this.Controls.Add(this.lblCellTotal); |
494 | 583 |
this.Controls.Add(this.groupBox1); |
495 | 584 |
this.Controls.Add(this.btnEnd); |
496 | 585 |
this.Controls.Add(this.dgvMaster); |
497 | 586 |
this.Controls.Add(this.label3); |
587 |
this.Controls.Add(this.grpType2); |
|
498 | 588 |
this.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
499 | 589 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
500 | 590 |
this.Margin = new System.Windows.Forms.Padding(4); |
... | ... | |
504 | 594 |
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmSalesConfirm_FormClosing); |
505 | 595 |
this.Load += new System.EventHandler(this.FrmSalesConfirm_Load); |
506 | 596 |
((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit(); |
597 |
this.grpType1.ResumeLayout(false); |
|
598 |
this.grpType1.PerformLayout(); |
|
507 | 599 |
this.groupBox1.ResumeLayout(false); |
508 | 600 |
this.groupBox1.PerformLayout(); |
509 | 601 |
((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); |
602 |
this.grpType2.ResumeLayout(false); |
|
510 | 603 |
this.ResumeLayout(false); |
511 | 604 |
this.PerformLayout(); |
512 | 605 |
|
... | ... | |
543 | 636 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column9; |
544 | 637 |
private System.Windows.Forms.RadioButton radioButton2; |
545 | 638 |
private System.Windows.Forms.RadioButton radioButton1; |
639 |
private CustomControls.GroupBoxEx grpType1; |
|
640 |
private CustomControls.GroupBoxEx grpType2; |
|
641 |
private System.Windows.Forms.Label label9; |
|
642 |
private System.Windows.Forms.ComboBox comboBox4; |
|
643 |
private System.Windows.Forms.ComboBox comboBox5; |
|
644 |
private System.Windows.Forms.Label label10; |
|
546 | 645 |
} |
547 | 646 |
} |
548 | 647 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs | ||
---|---|---|
73 | 73 |
/// <summary> 担当者コンボボックス用リスト</summary> |
74 | 74 |
public List<KeyValuePair<int, String>> listPerson = new List<KeyValuePair<int, String>>(); |
75 | 75 |
|
76 |
/// <summary> 発注者区分コンボボックス用リスト</summary> |
|
77 |
public List<KeyValuePair<int, String>> listDivision = new List<KeyValuePair<int, String>>(); |
|
78 |
|
|
79 |
/// <summary> 発注者者コンボボックス用リスト</summary> |
|
80 |
public List<KeyValuePair<int, String>> listOrderer = new List<KeyValuePair<int, String>>(); |
|
81 |
|
|
76 | 82 |
/// <summary> |
77 | 83 |
/// 行選択色 |
78 | 84 |
/// </summary> |
... | ... | |
81 | 87 |
/// <summary> |
82 | 88 |
/// 月選択 |
83 | 89 |
/// </summary> |
84 |
private int s_SelectedMonth = 1 << 3;
|
|
90 |
private long s_SelectedMonth = 1 << 3;
|
|
85 | 91 |
/// <summary> |
86 | 92 |
/// 部署選択 |
87 | 93 |
/// </summary> |
88 |
private int s_SelectedDepartment = 1 << 2;
|
|
94 |
private long s_SelectedDepartment = 1 << 2;
|
|
89 | 95 |
/// <summary> |
90 | 96 |
/// 担当者選択 |
91 | 97 |
/// </summary> |
92 |
private int s_SelectedPerson = 1; |
|
98 |
private long s_SelectedPerson = 1; |
|
99 |
/// <summary> |
|
100 |
/// 発注者区分選択 |
|
101 |
/// </summary> |
|
102 |
private long s_SelectedDivision = 1 << 4; |
|
103 |
/// <summary> |
|
104 |
/// 発注者選択 |
|
105 |
/// </summary> |
|
106 |
private long s_SelectedOrderer = 1 << 5; |
|
93 | 107 |
|
94 | 108 |
#endregion |
95 | 109 |
|
... | ... | |
130 | 144 |
comboBox1.SelectedIndexChanged -= new System.EventHandler(this.comboBox1_SelectedIndexChanged); |
131 | 145 |
comboBox2.SelectedIndexChanged -= new System.EventHandler(this.comboBox2_SelectedIndexChanged); |
132 | 146 |
comboBox3.SelectedIndexChanged -= new System.EventHandler(this.comboBox3_SelectedIndexChanged); |
147 |
comboBox4.SelectedIndexChanged -= new System.EventHandler(this.comboBox4_SelectedIndexChanged); |
|
148 |
comboBox5.SelectedIndexChanged -= new System.EventHandler(this.comboBox5_SelectedIndexChanged); |
|
133 | 149 |
numericUpDown2.ValueChanged -= new System.EventHandler(this.numericUpDown2_ValueChanged); |
134 | 150 |
|
135 | 151 |
|
... | ... | |
169 | 185 |
comboBox3.DataSource = listPerson; |
170 | 186 |
comboBox3.SelectedIndex = 0; |
171 | 187 |
|
188 |
// 発注者区分 |
|
189 |
this.listDivision = getOrderDivisionList(0); |
|
190 |
|
|
191 |
comboBox4.DataSource = listDivision; |
|
192 |
comboBox4.SelectedIndex = 0; |
|
193 |
|
|
194 |
// 発注者 |
|
195 |
this.listOrderer = getOrdererList(0); |
|
196 |
|
|
197 |
comboBox5.DataSource = listOrderer; |
|
198 |
comboBox5.SelectedIndex = 0; |
|
199 |
|
|
172 | 200 |
/////////////////////////////////////////////////////////////////////////// |
173 | 201 |
// ■一覧表示設定 |
174 | 202 |
/////////////////////////////////////////////////////////////////////////// |
... | ... | |
194 | 222 |
comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); |
195 | 223 |
comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); |
196 | 224 |
comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); |
225 |
comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged); |
|
226 |
comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged); |
|
197 | 227 |
numericUpDown2.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged); |
198 | 228 |
} |
199 | 229 |
} |
... | ... | |
316 | 346 |
this.listDepartment = getDepartmentList(iSelectedValue); |
317 | 347 |
|
318 | 348 |
//担当者の部署にて、担当者コンボボックスの絞り込みを行う |
319 |
//comboBox2.SelectedIndexChanged -= new System.EventHandler(this.comboBox2_SelectedIndexChanged);
|
|
349 |
comboBox2.SelectedIndexChanged -= new System.EventHandler(this.comboBox2_SelectedIndexChanged); |
|
320 | 350 |
|
321 |
//comboBox2.SelectedValue = listDepartment[1].Key;
|
|
351 |
comboBox2.SelectedValue = listDepartment[1].Key; |
|
322 | 352 |
|
323 | 353 |
//絞り込み前に選択した担当者を担当者コンボボックスに表示する(部署の絞り込み発動防止) |
324 | 354 |
comboBox3.SelectedIndexChanged -= new System.EventHandler(this.comboBox3_SelectedIndexChanged); |
355 |
this.listPerson = getPersonList(CommonMotions.cnvInt(comboBox2.SelectedValue)); |
|
356 |
comboBox3.DataSource = listPerson; |
|
325 | 357 |
comboBox3.SelectedValue = iSelectedValue; |
326 | 358 |
comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); |
327 | 359 |
|
328 |
//comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
|
|
360 |
comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); |
|
329 | 361 |
|
330 | 362 |
// 一覧再取得 |
331 | 363 |
DisplayData(); |
332 | 364 |
} |
333 | 365 |
#endregion |
334 | 366 |
|
367 |
#region 表示条件.発注者区分設定時のイベント |
|
368 |
/// <summary> |
|
369 |
/// 表示条件.発注者区分設定時 |
|
370 |
/// </summary> |
|
371 |
/// <param name="index"></param> |
|
372 |
/// <returns></returns> |
|
373 |
private void comboBox4_SelectedIndexChanged(object sender, EventArgs e) |
|
374 |
{ |
|
375 |
// 発注者再取得 |
|
376 |
comboBox5.SelectedIndexChanged -= new System.EventHandler(this.comboBox5_SelectedIndexChanged); |
|
377 |
|
|
378 |
comboBox5.DataSource = getOrdererList(CommonMotions.cnvInt(comboBox4.SelectedValue)); |
|
379 |
comboBox5.SelectedIndex = 0; |
|
380 |
|
|
381 |
comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged); |
|
382 |
|
|
383 |
// 一覧再取得 |
|
384 |
DisplayData(); |
|
385 |
} |
|
386 |
#endregion |
|
387 |
|
|
388 |
#region 表示条件.担当者設定時のイベント |
|
389 |
/// <summary> |
|
390 |
/// 表示条件.担当者設定時 |
|
391 |
/// </summary> |
|
392 |
/// <param name="index"></param> |
|
393 |
/// <returns></returns> |
|
394 |
private void comboBox5_SelectedIndexChanged(object sender, EventArgs e) |
|
395 |
{ |
|
396 |
|
|
397 |
// 選択した発注者を基に発注者区分再取得 |
|
398 |
int iSelectedValue = CommonMotions.cnvInt(comboBox5.SelectedValue); |
|
399 |
string strOrdererName = comboBox5.Text; |
|
400 |
this.listDivision = getOrderDivisionList(iSelectedValue, strOrdererName); |
|
401 |
|
|
402 |
//担当者の部署にて、担当者コンボボックスの絞り込みを行う |
|
403 |
comboBox4.SelectedIndexChanged -= new System.EventHandler(this.comboBox4_SelectedIndexChanged); |
|
404 |
|
|
405 |
comboBox4.SelectedValue = listDivision[1].Key; |
|
406 |
|
|
407 |
//絞り込み前に選択した担当者を担当者コンボボックスに表示する(部署の絞り込み発動防止) |
|
408 |
comboBox5.SelectedIndexChanged -= new System.EventHandler(this.comboBox5_SelectedIndexChanged); |
|
409 |
this.listOrderer = getOrdererList(CommonMotions.cnvInt(comboBox4.SelectedValue)); |
|
410 |
comboBox5.DataSource = listOrderer; |
|
411 |
comboBox5.SelectedValue = iSelectedValue; |
|
412 |
comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged); |
|
413 |
|
|
414 |
comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged); |
|
415 |
|
|
416 |
// 一覧再取得 |
|
417 |
DisplayData(); |
|
418 |
} |
|
419 |
#endregion |
|
420 |
|
|
335 | 421 |
#region 営業・工事担当者変更 |
336 | 422 |
/// <summary> |
337 | 423 |
/// 営業・工事担当者変更 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs | ||
---|---|---|
58 | 58 |
/// <param name="e"></param> |
59 | 59 |
private List<KeyValuePair<int, String>> getDepartmentList(int iPersonCode) |
60 | 60 |
{ |
61 |
var listDepartment = new List<KeyValuePair<int, String>>(); |
|
61 |
try |
|
62 |
{ |
|
63 |
var listDepartment = new List<KeyValuePair<int, String>>(); |
|
62 | 64 |
|
63 |
listDepartment.Add(new KeyValuePair<int, String>(0, "?????")); |
|
65 |
listDepartment.Add(new KeyValuePair<int, String>(0, "?????"));
|
|
64 | 66 |
|
65 |
var listResultSQL = new ArrayList(); |
|
66 |
listResultSQL = getDepartmentListQuery(iPersonCode); |
|
67 |
var listResultSQL = new ArrayList();
|
|
68 |
listResultSQL = getDepartmentListQuery(iPersonCode);
|
|
67 | 69 |
|
68 |
foreach (object[] result in listResultSQL) |
|
70 |
foreach (object[] result in listResultSQL) |
|
71 |
{ |
|
72 |
int iDepartmentCode = CommonMotions.cnvInt(result[0]); |
|
73 |
String strDepartmentName = CommonMotions.cnvString(result[1]); |
|
74 |
listDepartment.Add(new KeyValuePair<int, String>(iDepartmentCode, strDepartmentName)); |
|
75 |
} |
|
76 |
|
|
77 |
return listDepartment; |
|
78 |
} |
|
79 |
catch (Exception ex) |
|
69 | 80 |
{ |
70 |
int iDepartmentCode = CommonMotions.cnvInt(result[0]); |
|
71 |
String strDepartmentName = CommonMotions.cnvString(result[1]); |
|
72 |
listDepartment.Add(new KeyValuePair<int, String>(iDepartmentCode, strDepartmentName)); |
|
81 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
82 |
return null; |
|
73 | 83 |
} |
74 |
|
|
75 |
return listDepartment; |
|
76 |
|
|
77 | 84 |
} |
78 | 85 |
|
79 | 86 |
/// <summary> |
... | ... | |
90 | 97 |
var sql = new StringBuilder(); |
91 | 98 |
|
92 | 99 |
sql.Append("SELECT "); |
93 |
sql.Append("DEPM.DepartmentCode "); // ?????}?X?^?D?????R?[?h |
|
100 |
sql.Append("DEPM.DepartmentCode "); // ?????}?X?^?D?????R?[?h
|
|
94 | 101 |
sql.Append(",DEPM.DepartmentString "); // ?????}?X?^?D?????? |
95 | 102 |
sql.Append("FROM "); |
96 |
sql.Append("departmentmaster DEPM "); // ?????}?X?^ |
|
103 |
sql.Append("departmentmaster DEPM "); // ?????}?X?^
|
|
97 | 104 |
|
98 | 105 |
///////////////////////////////////////////////////////////////////////////// |
99 | 106 |
// ????????(???I)START |
100 | 107 |
///////////////////////////////////////////////////////////////////////////// |
101 | 108 |
if (!iPersonCode.Equals(0)) |
102 | 109 |
{ |
103 |
sql.Append("INNER JOIN personinchargemaster PERIM "); // ?S????}?X?^ |
|
104 |
sql.Append("ON DEPM.DepartmentCode = PERIM.DepartmentCode "); // ?S????}?X?^?D?????R?[?h = ?????}?X?^?D?????R?[?h |
|
105 |
sql.AppendFormat("AND PERIM.PersonCode = {0} ", iPersonCode); // ?S????}?X?^?D?S????R?[?h = ???D?S????R?[?h?i?B??????j |
|
110 |
sql.Append("INNER JOIN personinchargemaster PERIM "); // ?S????}?X?^
|
|
111 |
sql.Append("ON DEPM.DepartmentCode = PERIM.DepartmentCode "); // ?S????}?X?^?D?????R?[?h = ?????}?X?^?D?????R?[?h
|
|
112 |
sql.AppendFormat("AND PERIM.PersonCode = {0} ", iPersonCode); // ?S????}?X?^?D?S????R?[?h = ???D?S????R?[?h?i?B??????j
|
|
106 | 113 |
} |
107 | 114 |
///////////////////////////////////////////////////////////////////////////// |
108 | 115 |
// ????????(???I)END |
109 | 116 |
///////////////////////////////////////////////////////////////////////////// |
110 | 117 |
|
111 | 118 |
sql.Append("WHERE "); |
112 |
sql.Append("DEPM.DeleteFlg = 0 "); // ?????}?X?^?D???t???O = 0 |
|
119 |
sql.Append("DEPM.DeleteFlg = 0 "); // ?????}?X?^?D???t???O = 0
|
|
113 | 120 |
sql.Append("ORDER BY "); |
114 |
sql.Append("DEPM.DisplayOrder ASC"); // ?????}?X?^?D?\?????i?????j |
|
121 |
sql.Append("DEPM.DisplayOrder ASC"); // ?????}?X?^?D?\?????i?????j
|
|
115 | 122 |
|
116 | 123 |
var data = new ArrayList(); |
117 | 124 |
if (!depDb.ExecuteReader(sql.ToString(), ref data)) return new ArrayList(); |
... | ... | |
139 | 146 |
/// <param name="e"></param> |
140 | 147 |
private List<KeyValuePair<int, String>> getPersonList(int iDepartmentCode) |
141 | 148 |
{ |
142 |
var listPerson = new List<KeyValuePair<int, String>>(); |
|
149 |
try |
|
150 |
{ |
|
151 |
var listPerson = new List<KeyValuePair<int, String>>(); |
|
143 | 152 |
|
144 |
listPerson.Add(new KeyValuePair<int, String>(0, "?????")); |
|
153 |
listPerson.Add(new KeyValuePair<int, String>(0, "?????"));
|
|
145 | 154 |
|
146 |
var listResultSQL = new ArrayList(); |
|
147 |
listResultSQL = getPersonListQuery(iDepartmentCode); |
|
155 |
var listResultSQL = new ArrayList();
|
|
156 |
listResultSQL = getPersonListQuery(iDepartmentCode);
|
|
148 | 157 |
|
149 |
foreach (object[] result in listResultSQL) |
|
158 |
foreach (object[] result in listResultSQL) |
|
159 |
{ |
|
160 |
int iResultPersonCode = CommonMotions.cnvInt(result[0]); |
|
161 |
String strResultPersonName = CommonMotions.cnvString(result[1]); |
|
162 |
listPerson.Add(new KeyValuePair<int, String>(iResultPersonCode, strResultPersonName)); |
|
163 |
} |
|
164 |
|
|
165 |
return listPerson; |
|
166 |
} |
|
167 |
catch (Exception ex) |
|
150 | 168 |
{ |
151 |
int iResultPersonCode = CommonMotions.cnvInt(result[0]); |
|
152 |
String strResultPersonName = CommonMotions.cnvString(result[1]); |
|
153 |
listPerson.Add(new KeyValuePair<int, String>(iResultPersonCode, strResultPersonName)); |
|
169 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
170 |
return null; |
|
154 | 171 |
} |
155 |
|
|
156 |
return listPerson; |
|
157 |
|
|
158 | 172 |
} |
159 | 173 |
|
160 | 174 |
/// <summary> |
... | ... | |
176 | 190 |
sql.Append("FROM "); |
177 | 191 |
sql.Append("personinchargemaster PERIM "); // ?S????}?X?^ |
178 | 192 |
sql.Append("WHERE "); |
179 |
sql.Append("PERIM.DeleteFlg = 0 "); // ?????}?X?^?D???t???O = 0 |
|
193 |
sql.Append("PERIM.DeleteFlg = 0 "); // ?S????}?X?^?D???t???O = 0
|
|
180 | 194 |
|
181 | 195 |
///////////////////////////////////////////////////////////////////////////// |
182 | 196 |
// ????????(???I)START |
... | ... | |
190 | 204 |
///////////////////////////////////////////////////////////////////////////// |
191 | 205 |
|
192 | 206 |
sql.Append("ORDER BY "); |
193 |
sql.Append("PERIM.EmployeeClassFlg ASC, PERIM.DisplayOrder ASC"); // ?????}?X?^?D?\?????i?????j |
|
207 |
sql.Append("PERIM.EmployeeClassFlg ASC, PERIM.DisplayOrder ASC"); // ?S????}?X?^?D?\?????i?????j
|
|
194 | 208 |
|
195 | 209 |
var data = new ArrayList(); |
196 | 210 |
if (!depDb.ExecuteReader(sql.ToString(), ref data)) return new ArrayList(); |
... | ... | |
260 | 274 |
} |
261 | 275 |
#endregion |
262 | 276 |
|
277 |
#region ?????????Z?b?g |
|
278 |
/// <summary> |
|
279 |
/// ?????????Z?b?g |
|
280 |
/// </summary> |
|
281 |
/// <param name="sender"></param> |
|
282 |
/// <param name="e"></param> |
|
283 |
private List<KeyValuePair<int, String>> getOrderDivisionList(int iOrdererCode, string strOrderer = "") |
|
284 |
{ |
|
285 |
try |
|
286 |
{ |
|
287 |
var listOrderDivi = new List<KeyValuePair<int, String>>(); |
|
288 |
|
|
289 |
listOrderDivi.Add(new KeyValuePair<int, String>(0, "?????")); |
|
290 |
|
|
291 |
var listResultSQL = new ArrayList(); |
|
292 |
listResultSQL = getOrderDivListQuery(iOrdererCode, strOrderer); |
|
293 |
|
|
294 |
foreach (object[] result in listResultSQL) |
|
295 |
{ |
|
296 |
int iResultDiviCode = CommonMotions.cnvInt(result[0]); |
|
297 |
String strResultDiviName = CommonMotions.cnvString(result[1]); |
|
298 |
listOrderDivi.Add(new KeyValuePair<int, String>(iResultDiviCode, strResultDiviName)); |
|
299 |
} |
|
300 |
|
|
301 |
return listOrderDivi; |
|
302 |
} |
|
303 |
catch (Exception ex) |
|
304 |
{ |
|
305 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
306 |
return null; |
|
307 |
} |
|
308 |
} |
|
309 |
|
|
310 |
/// <summary> |
|
311 |
/// ?????????SQL???s |
|
312 |
/// </summary> |
|
313 |
/// <param name="sender"></param> |
|
314 |
/// <param name="e"></param> |
|
315 |
private ArrayList getOrderDivListQuery(int iOrdererCode, string strOrderer) |
|
316 |
{ |
|
317 |
IOMDivision diviDb = new IOMDivision(); |
|
318 |
|
|
319 |
try |
|
320 |
{ |
|
321 |
var sql = new StringBuilder(); |
|
322 |
|
|
323 |
sql.Append("SELECT "); |
|
324 |
sql.Append("DIVI.NameCode "); // ???}?X?^?D???R?[?h |
|
325 |
sql.Append(",DIVI.NameString "); // ???}?X?^?D???? |
|
326 |
sql.Append("FROM "); |
|
327 |
sql.Append("divisionmaster As DIVI "); // ???}?X?^ |
|
328 |
sql.Append("WHERE "); |
|
329 |
sql.AppendFormat("DIVI.DivisionCode = {0} " // ???}?X?^?D???R?[?h |
|
330 |
, (int)DivisionMaster.DivisionMasterCodeDefine.OrderDivision); |
|
331 |
sql.Append("And DIVI.DeleteFlg = 0 "); // ???}?X?^?D???t???O = 0 |
|
332 |
|
|
333 |
///////////////////////////////////////////////////////////////////////////// |
|
334 |
// ????????(???I)START |
|
335 |
///////////////////////////////////////////////////////////////////////////// |
|
336 |
if (!iOrdererCode.Equals(0)) // ???}?X?^?D????R?[?h |
|
337 |
{ |
|
338 |
sql.Append("And DIVI.NameCode in (SELECT Orm.OrderCotegory From orderersmaster As Orm "); |
|
339 |
sql.AppendFormat("Where Orm.OrderersCode = {0} ", iOrdererCode); |
|
340 |
string[] strWork = strOrderer.Split('\t'); |
|
341 |
sql.AppendFormat("And Orm.OrderersName1 = '{0}'", strWork[0]); |
|
342 |
if (strWork[1].Length > 0) sql.AppendFormat("And Orm.OrderersName2 = '{0}'", strWork[1]); |
|
343 |
sql.Append(") "); |
|
344 |
} |
|
345 |
///////////////////////////////////////////////////////////////////////////// |
|
346 |
// ????????(???I)END |
|
347 |
///////////////////////////////////////////////////////////////////////////// |
|
348 |
|
|
349 |
sql.Append("ORDER BY "); |
|
350 |
sql.Append("DIVI.DisplayOrder ASC"); // ???}?X?^?D?\?????i?????j |
|
351 |
|
|
352 |
var data = new ArrayList(); |
|
353 |
if (!diviDb.ExecuteReader(sql.ToString(), ref data)) return new ArrayList(); |
|
354 |
return data; |
|
355 |
} |
|
356 |
catch (Exception ex) |
|
357 |
{ |
|
358 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
359 |
return new ArrayList(); |
|
360 |
} |
|
361 |
finally |
|
362 |
{ |
|
363 |
diviDb.close(); |
|
364 |
diviDb = null; |
|
365 |
} |
|
366 |
} |
|
367 |
#endregion |
|
368 |
|
|
369 |
#region ?????????Z?b?g |
|
370 |
/// <summary> |
|
371 |
/// ?????????Z?b?g |
|
372 |
/// </summary> |
|
373 |
/// <param name="sender"></param> |
|
374 |
/// <param name="e"></param> |
|
375 |
private List<KeyValuePair<int, String>> getOrdererList(int iOrdererCode) |
|
376 |
{ |
|
377 |
try |
|
378 |
{ |
|
379 |
var listOrderer = new List<KeyValuePair<int, String>>(); |
|
380 |
|
|
381 |
listOrderer.Add(new KeyValuePair<int, String>(0, "?????")); |
|
382 |
|
|
383 |
var listResultSQL = new ArrayList(); |
|
384 |
listResultSQL = getOrdererListQuery(iOrdererCode); |
|
385 |
|
|
386 |
foreach (object[] result in listResultSQL) |
|
387 |
{ |
|
388 |
int iResultOrdererCode = CommonMotions.cnvInt(result[0]); |
|
389 |
String strResultOrdererName1 = CommonMotions.cnvString(result[1]); |
|
390 |
String strResultOrdererName2 = CommonMotions.cnvString(result[2]); |
|
391 |
string strSetValue = string.Format("{0}\t{1}", strResultOrdererName1, strResultOrdererName2); |
|
392 |
listOrderer.Add(new KeyValuePair<int, String>(iResultOrdererCode, strSetValue)); |
|
393 |
} |
|
394 |
|
|
395 |
return listOrderer; |
|
396 |
} |
|
397 |
catch (Exception ex) |
|
398 |
{ |
|
399 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
400 |
return null; |
|
401 |
} |
|
402 |
} |
|
403 |
|
|
404 |
/// <summary> |
|
405 |
/// ?????????SQL???s |
|
406 |
/// </summary> |
|
407 |
/// <param name="sender"></param> |
|
408 |
/// <param name="e"></param> |
|
409 |
private ArrayList getOrdererListQuery(int iOrdererCode) |
|
410 |
{ |
|
411 |
var orDb = new IOMOrderers(); |
|
412 |
|
|
413 |
try |
|
414 |
{ |
|
415 |
var sql = new StringBuilder(); |
|
416 |
|
|
417 |
sql.Append("SELECT "); |
|
418 |
sql.Append("Orm.OrderersCode "); // ??????}?X?^?D??????R?[?h |
|
419 |
sql.Append(",Orm.OrderersName1 "); // ??????}?X?^?D???????1 |
|
420 |
sql.Append(",Orm.OrderersName2 "); // ??????}?X?^?D???????2 |
|
421 |
sql.Append("FROM "); |
|
422 |
sql.Append("orderersmaster As Orm "); // ??????}?X?^ |
|
423 |
sql.Append("WHERE "); |
|
424 |
sql.Append("Orm.DeleteFlg = 0 "); // ?????}?X?^?D???t???O = 0 |
|
425 |
|
|
426 |
///////////////////////////////////////////////////////////////////////////// |
|
427 |
// ????????(???I)START |
|
428 |
///////////////////////////////////////////////////////////////////////////// |
|
429 |
if (!iOrdererCode.Equals(0)) |
|
430 |
{ |
|
431 |
sql.AppendFormat("AND Orm.OrderCotegory = {0} ", iOrdererCode); // ??????}?X?^?D????????R?[?h |
|
432 |
} |
|
433 |
///////////////////////////////////////////////////////////////////////////// |
|
434 |
// ????????(???I)END |
|
435 |
///////////////////////////////////////////////////////////////////////////// |
|
436 |
|
|
437 |
sql.Append("ORDER BY "); |
|
438 |
sql.Append("Orm.OrderCotegory ASC, Orm.DisplayOrder ASC"); // ??????}?X?^?D?\?????i?????j |
|
439 |
|
|
440 |
var data = new ArrayList(); |
|
441 |
if (!orDb.ExecuteReader(sql.ToString(), ref data)) return new ArrayList(); |
|
442 |
return data; |
|
443 |
} |
|
444 |
catch (Exception ex) |
|
445 |
{ |
|
446 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
447 |
return new ArrayList(); |
|
448 |
} |
|
449 |
finally |
|
450 |
{ |
|
451 |
orDb.close(); |
|
452 |
orDb = null; |
|
453 |
} |
|
454 |
|
|
455 |
} |
|
456 |
#endregion |
|
457 |
|
|
263 | 458 |
#region ????? |
264 | 459 |
/// <summary> |
265 | 460 |
/// ????? |
... | ... | |
321 | 516 |
else |
322 | 517 |
dgv.Columns[(int)GridColumn.ConstrPersonName].HeaderText = "?H???S????"; |
323 | 518 |
|
324 |
int SelComb = 0;
|
|
519 |
long SelComb = 0;
|
|
325 | 520 |
int CntNo = 1; |
326 | 521 |
long lTotal = 0; |
327 | 522 |
string strConstrName = string.Empty; |
... | ... | |
389 | 584 |
/// ?R???{?{?b?N?X??I?????? |
390 | 585 |
/// </summary> |
391 | 586 |
/// <returns></returns> |
392 |
private int SelectedCondition()
|
|
587 |
private long SelectedCondition()
|
|
393 | 588 |
{ |
394 | 589 |
try |
395 | 590 |
{ |
396 |
int selValue = 0;
|
|
591 |
long selValue = 0;
|
|
397 | 592 |
|
398 | 593 |
if (CommonMotions.cnvInt(comboBox1.SelectedValue) != 0) selValue += s_SelectedMonth; |
399 | 594 |
if (CommonMotions.cnvInt(comboBox2.SelectedValue) != 0) selValue += s_SelectedDepartment; |
... | ... | |
421 | 616 |
int SelMonth = CommonMotions.cnvInt(comboBox1.SelectedValue); |
422 | 617 |
int SelDepartment = CommonMotions.cnvInt(comboBox2.SelectedValue); |
423 | 618 |
int SelPerson = CommonMotions.cnvInt(comboBox3.SelectedValue); |
619 |
int SelDivision = CommonMotions.cnvInt(comboBox4.SelectedValue); |
|
620 |
int SelOrderer = CommonMotions.cnvInt(comboBox5.SelectedValue); |
|
424 | 621 |
|
425 |
|
|
426 | 622 |
sql.Append("select"); |
427 | 623 |
|
428 | 624 |
sql.Append(" A1.REQUESTNO"); |
... | ... | |
454 | 650 |
sql.Append(", SUM(A1.REQUESTAMOUNT) AS Value"); |
455 | 651 |
|
456 | 652 |
sql.Append(" from requesthead AS A1"); |
457 |
sql.Append(" LEFT JOIN orderersmaster AS A2 ON A2.OrderCotegory = A1.ORDERERSDIVISION AND A2.OrderersCode = A1.ORDERERSCODE"); |
|
458 |
sql.AppendFormat(" LEFT JOIN divisionmaster AS Divi ON Divi.DivisionCode = {0} And Divi.NameCode = A2.OrderCotegory", |
|
459 |
(int)DivisionMaster.DivisionMasterCodeDefine.OrderDivision); |
|
653 |
sql.Append(" LEFT JOIN orderersmaster AS A2"); |
|
654 |
sql.Append(" ON A2.OrderCotegory = A1.ORDERERSDIVISION"); |
|
655 |
sql.Append(" And A2.OrderersCode = A1.ORDERERSCODE"); |
|
656 |
sql.Append(" LEFT JOIN divisionmaster AS Divi"); |
|
657 |
sql.AppendFormat(" ON Divi.DivisionCode = {0}", (int)DivisionMaster.DivisionMasterCodeDefine.OrderDivision); |
|
658 |
sql.Append(" And Divi.NameCode = A2.OrderCotegory"); |
|
460 | 659 |
|
461 | 660 |
sql.Append(", constructionbaseinfo AS C1"); |
462 | 661 |
sql.Append(" LEFT JOIN constructionbaseinfodetail C2"); |
463 |
sql.AppendFormat(" ON C2.ConstructionCode = C1.ConstructionCode AND C2.DetailNo= {0}", |
|
464 |
(int)ConstructionBaseInfoDetail.DataNoDef.OrderersName); |
|
662 |
sql.Append(" ON C2.ConstructionCode = C1.ConstructionCode"); |
|
663 |
sql.AppendFormat(" And C2.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName); |
|
664 |
|
|
465 | 665 |
sql.Append(" LEFT JOIN personinchargemaster D1"); |
466 | 666 |
|
467 | 667 |
if (radioButton1.Checked) |
... | ... | |
478 | 678 |
if (SelMonth != 0) sql.AppendFormat(" AND A1.REQUESTMONTH = {0}", SelMonth); |
479 | 679 |
if (SelDepartment != 0) sql.AppendFormat(" AND E1.DepartmentCode = {0}", SelDepartment); |
480 | 680 |
if (SelPerson != 0) sql.AppendFormat(" AND D1.PersonCode = {0}", SelPerson); |
681 |
if (SelDivision != 0) sql.AppendFormat(" AND A2.OrderCotegory = {0}", SelDivision); |
|
682 |
if (SelOrderer != 0) sql.AppendFormat(" AND A2.OrderersCode = {0}", SelOrderer); |
|
481 | 683 |
|
482 |
int SelComb = SelectedCondition(); |
|
684 |
|
|
685 |
long SelComb = SelectedCondition(); |
|
483 | 686 |
StringBuilder strGroup = new StringBuilder(); |
484 | 687 |
StringBuilder strOrder = new StringBuilder(); |
485 | 688 |
strOrder.Append("Value DESC"); |
... | ... | |
487 | 690 |
if (SelComb == 0) |
488 | 691 |
{ // ?S????? |
489 | 692 |
strGroup.Append("A2.OrderCotegory, A2.OrderersCode"); |
693 |
|
|
490 | 694 |
if (strOrder.ToString().Length > 0) strOrder.Append(","); |
491 | 695 |
strOrder.Append("Divi.DisplayOrder, A2.DisplayOrder"); |
492 | 696 |
} |
... | ... | |
494 | 698 |
{ // ??????I????????? |
495 | 699 |
if (strGroup.ToString().Length > 0) strGroup.Append(", "); |
496 | 700 |
strGroup.Append("A2.OrderCotegory, A2.OrderersCode, D1.PersonCode"); |
701 |
|
|
497 | 702 |
if (strOrder.ToString().Length > 0) strOrder.Append(", "); |
498 | 703 |
strOrder.Append("D1.DisplayOrder"); |
499 | 704 |
} |
... | ... | |
501 | 706 |
{ // ??????I?????????? |
502 | 707 |
if (strGroup.ToString().Length > 0) strGroup.Append(", "); |
503 | 708 |
strGroup.Append("E1.DepartmentCode"); |
709 |
|
|
504 | 710 |
if (strOrder.ToString().Length > 0) strOrder.Append(", "); |
505 | 711 |
strOrder.Append("E1.DisplayOrder"); |
506 | 712 |
} |
... | ... | |
511 | 717 |
{ // ?S?????I?????????? |
512 | 718 |
if (strGroup.ToString().Length > 0) strGroup.Append(", "); |
513 | 719 |
strGroup.Append("D1.PersonCode"); |
720 |
|
|
514 | 721 |
if (strOrder.ToString().Length > 0) strOrder.Append(", "); |
515 | 722 |
strOrder.Append("D1.DisplayOrder"); |
516 | 723 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartment.cs | ||
---|---|---|
1009 | 1009 |
if (RowCnt > 0) |
1010 | 1010 |
{ |
1011 | 1011 |
dgvExpenses.Rows.Add(RowCnt); |
1012 |
dgvExpenses.Columns[(int)ExpGridColumn.ExpensesName].Width = s_CellSize[(int)ExpGridColumn.ExpensesName] + dgvExpenses.RowHeadersWidth; |
|
1012 |
//dgvExpenses.Columns[(int)ExpGridColumn.ExpensesName].Width = s_CellSize[(int)ExpGridColumn.ExpensesName] + dgvExpenses.RowHeadersWidth;
|
|
1013 | 1013 |
} |
1014 | 1014 |
|
1015 | 1015 |
m_bChengeAns = false; |
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartment.designer.cs | ||
---|---|---|
228 | 228 |
this.dgvExpenses.AllowUserToDeleteRows = false; |
229 | 229 |
this.dgvExpenses.AllowUserToResizeColumns = false; |
230 | 230 |
this.dgvExpenses.AllowUserToResizeRows = false; |
231 |
this.dgvExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
232 |
| System.Windows.Forms.AnchorStyles.Left))); |
|
231 | 233 |
this.dgvExpenses.BackgroundColor = System.Drawing.Color.White; |
232 | 234 |
this.dgvExpenses.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
233 | 235 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
... | ... | |
253 | 255 |
this.dgvExpenses.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; |
254 | 256 |
this.dgvExpenses.RowTemplate.Height = 21; |
255 | 257 |
this.dgvExpenses.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; |
256 |
this.dgvExpenses.Size = new System.Drawing.Size(580, 105);
|
|
258 |
this.dgvExpenses.Size = new System.Drawing.Size(580, 110);
|
|
257 | 259 |
this.dgvExpenses.TabIndex = 2; |
258 | 260 |
this.dgvExpenses.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvExpenses_CellValidated); |
259 | 261 |
// |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.cs | ||
---|---|---|
392 | 392 |
SetLoginUserData(wrkrec); |
393 | 393 |
|
394 | 394 |
// ----- 参照部署データ取得 |
395 |
List<PersonDepartmentMaster> depList = new List<PersonDepartmentMaster>(); |
|
395 |
CommonMotions.LoginUserDepartment.Clear(); |
|
396 |
List<PersonDepartmentMaster> depList = CommonMotions.LoginUserDepartment; |
|
396 | 397 |
string strpdSQL = pdDB.CreatePrimarykeyString(LoginUserID); |
397 | 398 |
// 担当者参照部署マスタ読込 |
398 | 399 |
if (!pdDB.SelectAction(strSQL, ref depList)) return false; |
399 |
foreach (PersonDepartmentMaster wrkRec in depList) |
|
400 |
{ |
|
401 |
CommonMotions.LoginUserDepartment.Add(wrkRec); |
|
402 |
} |
|
403 | 400 |
|
404 | 401 |
return true; |
405 | 402 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
1611 | 1611 |
/// </summary> |
1612 | 1612 |
private DialogResult LoginAction() |
1613 | 1613 |
{ |
1614 |
IOMPersonInCharge pmDB = new IOMPersonInCharge(); |
|
1615 | 1614 |
IOMSecurity secDB = new IOMSecurity(); |
1616 | 1615 |
IOMProcessExcute execDB = new IOMProcessExcute(); |
1617 | 1616 |
FrmLogin frm = new FrmLogin(); |
... | ... | |
1645 | 1644 |
|
1646 | 1645 |
// ----- ユーザーとしてのログイン |
1647 | 1646 |
// セキュリティデータ取得 |
1648 |
SecurityMaster secRec = new SecurityMaster();
|
|
1647 |
SecurityMaster secRec = CommonMotions.LoginUserSecurity;
|
|
1649 | 1648 |
string strSec = secDB.CreatePrimarykeyString(CommonMotions.LoginUserData.SecCode); |
1650 | 1649 |
secDB.SelectAction(strSec, ref secRec); |
1651 |
CommonMotions.LoginUserSecurity = secRec; |
|
1652 | 1650 |
|
1653 | 1651 |
// 起動データ取得 |
1654 |
List<ProcessExcute> exeList = new List<ProcessExcute>();
|
|
1652 |
List<ProcessExcute> exeList = CommonMotions.LoginUserProcExe;
|
|
1655 | 1653 |
string strExe = execDB.CreatePrimarykeyString(CommonMotions.LoginUserData.SecCode) + " ORDER BY EXECCODE"; |
1656 | 1654 |
execDB.SelectAction(strExe, ref exeList); |
1657 |
CommonMotions.LoginUserProcExe.Clear(); |
|
1658 |
foreach (ProcessExcute wrkRec in exeList) |
|
1659 |
{ |
|
1660 |
CommonMotions.LoginUserProcExe.Add(wrkRec); |
|
1661 |
} |
|
1662 | 1655 |
|
1663 | 1656 |
return drRet; |
1664 | 1657 |
} |
... | ... | |
1673 | 1666 |
DisplayScreenSetup(); |
1674 | 1667 |
|
1675 | 1668 |
// DB使用終了 |
1676 |
pmDB.close(); pmDB = null; |
|
1677 | 1669 |
secDB.close(); secDB = null; |
1678 | 1670 |
execDB.close(); execDB = null; |
1679 | 1671 |
|
... | ... | |
2086 | 2078 |
bool bDataExist = false; |
2087 | 2079 |
try |
2088 | 2080 |
{ |
2081 |
int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("非 受 注")).Key; |
|
2082 |
|
|
2089 | 2083 |
// 工事承認をチェックする |
2090 | 2084 |
StringBuilder strSQL = new StringBuilder(); |
2091 |
strSQL.Append("SELECT count(*) FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B, APPROVALMASTER C"); |
|
2085 |
strSQL.Append("SELECT count(*)"); |
|
2086 |
strSQL.Append(" FROM PROCESSAPPROVAL A"); |
|
2087 |
strSQL.Append(", PERSONINCHARGEMASTER B"); |
|
2088 |
strSQL.Append(", APPROVALMASTER C"); |
|
2089 |
strSQL.Append(", CONSTRUCTIONBASEINFO As D"); |
|
2090 |
|
|
2092 | 2091 |
strSQL.AppendFormat(" WHERE (A.SEQNO = 1 AND A.APPROVALSTATUS <> {0})", (int)CommonDefine.ApprovalStatus.Approval); |
2093 | 2092 |
strSQL.Append(" AND NOT EXISTS (SELECT * FROM PROCESSAPPROVAL D"); |
2094 | 2093 |
strSQL.Append(" WHERE D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND D.APPROVALCODE = A.APPROVALCODE AND D.ORDERNO = A.ORDERNO AND D.SEQNO <> 1"); |
... | ... | |
2096 | 2095 |
strSQL.Append(" AND B.PERSONCODE = A.PERSONCODE"); |
2097 | 2096 |
strSQL.Append(" AND (C.APPROVALCODE = A.APPROVALCODE AND C.DEPARTMENTCODE = B.DEPARTMENTCODE)"); |
2098 | 2097 |
strSQL.AppendFormat(" AND C.APPROVALPERSON = {0}", CommonMotions.LoginUserData.PersonCode); |
2098 |
strSQL.Append(" And D.ConstructionCode= A.ConstructionCode"); |
|
2099 |
strSQL.AppendFormat(" And D.ConstructionStatusFlg <> {0}", iStatus); |
|
2100 |
|
|
2099 | 2101 |
ArrayList arList = new ArrayList(); |
2100 | 2102 |
if (!AppDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
2101 | 2103 |
|
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.99")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.99")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.100")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.100")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff