リビジョン 395
請求状況確認:SQL取得条件の変更、タイトルを「請求状況確認」、「申請」の列名を「請求回数」、ソートを「請求月の降順→発給日の降順」に変更、さらに請求月でブロック分けして表示するように変更
入金入力:更新した場合に入金確認者が更新されていなかった不具合を修正
入金確認:
入金明細に入力された合計と請求金額に差異がある場合に表示色を変更するように修正
セルの入力時に合計行が反映されない不具合の修正。
コンボボックスのアイテムの数を10に修正。
入金明細における乳kン金額入力時の消費税自動計算の実装。
入金行における合計値が請求金額合計と差異があった場合に色が変わるように修正。
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatus.designer.cs | ||
---|---|---|
89 | 89 |
this.label1.Name = "label1"; |
90 | 90 |
this.label1.Size = new System.Drawing.Size(400, 20); |
91 | 91 |
this.label1.TabIndex = 6; |
92 |
this.label1.Text = "請 求 承 認 状 況";
|
|
92 |
this.label1.Text = "請 求 状 況 確 認";
|
|
93 | 93 |
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
94 | 94 |
// |
95 | 95 |
// btnDataUpDate |
... | ... | |
348 | 348 |
this.Column7.HeaderText = "工 事 名 称"; |
349 | 349 |
this.Column7.Name = "Column7"; |
350 | 350 |
this.Column7.ReadOnly = true; |
351 |
this.Column7.Width = 550; |
|
351 |
this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
352 |
this.Column7.Width = 500; |
|
352 | 353 |
// |
353 | 354 |
// Column3 |
354 | 355 |
// |
... | ... | |
391 | 392 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
392 | 393 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
393 | 394 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle8; |
394 |
this.Column5.HeaderText = "申請";
|
|
395 |
this.Column5.HeaderText = "請求回数";
|
|
395 | 396 |
this.Column5.Name = "Column5"; |
396 | 397 |
this.Column5.ReadOnly = true; |
397 | 398 |
this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
398 | 399 |
this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
399 |
this.Column5.Width = 50; |
|
400 | 400 |
// |
401 | 401 |
// FrmReqApprovalStatus |
402 | 402 |
// |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs | ||
---|---|---|
348 | 348 |
strSQL.Append(", J.DetailString"); |
349 | 349 |
strSQL.Append(", B.OrdersDecisionPrice"); |
350 | 350 |
strSQL.Append(", A.REQUESTAMOUNT"); |
351 |
strSQL.Append(", (B.OrdersDecisionPrice - A.REQUESTAMOUNT)");
|
|
351 |
strSQL.Append(", (B.OrdersDecisionPrice - ifnull(A.REQUESTAMOUNT,0))");
|
|
352 | 352 |
strSQL.Append(", A.REQUESTCNT"); |
353 | 353 |
strSQL.Append(", A.MAINCONSTRUCTIONCODE"); |
354 | 354 |
strSQL.Append(" From"); |
... | ... | |
369 | 369 |
strSQL.Append(" , MIN(ConstructionStatusFlg) AS ConstructionStatusFlg"); |
370 | 370 |
strSQL.Append(" , SUM(OrdersDecisionPrice) AS OrdersDecisionPrice"); |
371 | 371 |
strSQL.Append(" FROM"); |
372 |
strSQL.Append(" constructionbaseinfo AS B"); |
|
372 |
strSQL.Append(" constructionbaseinfo"); |
|
373 |
strSQL.Append(" WHERE"); |
|
374 |
strSQL.AppendFormat(" (ConstructionPeriod = {0}", numUDConstPro.Value); |
|
375 |
strSQL.AppendFormat(" AND (ConstructionStatusFlg != {0}))", nNotStatus); |
|
373 | 376 |
strSQL.Append(" GROUP BY"); |
374 | 377 |
strSQL.Append(" TRUNCATE(ConstructionCode / 100, 0)"); |
375 | 378 |
strSQL.Append(" ) AS B"); |
... | ... | |
433 | 436 |
strSQL.Append(" ON B.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE"); |
434 | 437 |
|
435 | 438 |
strSQL.Append(" WHERE"); |
436 |
strSQL.Append(" (B.ConstructionCode = A.MAINCONSTRUCTIONCODE"); |
|
437 |
strSQL.AppendFormat(" AND B.ConstructionPeriod = {0}", numUDConstPro.Value); |
|
438 |
strSQL.AppendFormat(" AND (B.ConstructionStatusFlg != {0}))", nNotStatus); |
|
439 |
strSQL.Append(" (B.ConstructionCode = A.MAINCONSTRUCTIONCODE)"); |
|
439 | 440 |
|
440 | 441 |
// ???????I??????????? |
441 | 442 |
strSQL.Append(GetDepartmentString()); |
... | ... | |
527 | 528 |
SetToGridData(arData); |
528 | 529 |
} |
529 | 530 |
|
530 |
// ?f?[?^??????????\?[?g????? |
|
531 |
if (CommonDefine.s_MaxInitLineCount < dgvMaster.RowCount) |
|
532 |
{ |
|
533 |
foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) |
|
534 |
wrkCol.SortMode = DataGridViewColumnSortMode.Automatic; |
|
535 |
} |
|
536 |
else |
|
537 |
{ |
|
538 |
// ?b???\?[?g?????? |
|
539 |
foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) |
|
540 |
wrkCol.SortMode = DataGridViewColumnSortMode.Automatic; |
|
541 |
} |
|
542 | 531 |
} |
543 | 532 |
catch (Exception ex) |
544 | 533 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.designer.cs | ||
---|---|---|
30 | 30 |
{ |
31 | 31 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); |
32 | 32 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); |
33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 | 34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); |
35 | 35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); |
36 | 36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); |
... | ... | |
40 | 40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); |
41 | 41 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); |
42 | 42 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); |
43 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
43 | 44 |
this.btnEnd = new System.Windows.Forms.Button(); |
44 | 45 |
this.label1 = new System.Windows.Forms.Label(); |
45 | 46 |
this.btnDataUpDate = new System.Windows.Forms.Button(); |
... | ... | |
58 | 59 |
this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
59 | 60 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
60 | 61 |
this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
62 |
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
61 | 63 |
this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
62 | 64 |
this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
63 | 65 |
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
65 | 67 |
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
66 | 68 |
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
67 | 69 |
this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
68 |
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
69 | 70 |
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
70 | 71 |
this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
71 | 72 |
this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
300 | 301 |
this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
301 | 302 |
this.Column1, |
302 | 303 |
this.Column12, |
304 |
this.Column8, |
|
303 | 305 |
this.Column10, |
304 | 306 |
this.Column6, |
305 | 307 |
this.Column4, |
... | ... | |
307 | 309 |
this.Column3, |
308 | 310 |
this.Column2, |
309 | 311 |
this.Column9, |
310 |
this.Column8, |
|
311 | 312 |
this.Column5, |
312 | 313 |
this.Column13, |
313 | 314 |
this.Column11}); |
314 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
315 |
dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;
|
|
316 |
dataGridViewCellStyle12.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
317 |
dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;
|
|
318 |
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
|
|
319 |
dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
320 |
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
|
321 |
this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle12;
|
|
315 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
316 |
dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
|
|
317 |
dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
318 |
dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
|
|
319 |
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
|
|
320 |
dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
321 |
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
|
322 |
this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
|
|
322 | 323 |
this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; |
323 | 324 |
this.dgvMaster.EnableHeadersVisualStyles = false; |
324 | 325 |
this.dgvMaster.Location = new System.Drawing.Point(8, 101); |
325 | 326 |
this.dgvMaster.Name = "dgvMaster"; |
327 |
this.dgvMaster.ReadOnly = true; |
|
326 | 328 |
this.dgvMaster.RowHeadersVisible = false; |
327 | 329 |
this.dgvMaster.RowHeadersWidth = 20; |
328 | 330 |
this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; |
... | ... | |
347 | 349 |
// |
348 | 350 |
// Column12 |
349 | 351 |
// |
352 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
353 |
this.Column12.DefaultCellStyle = dataGridViewCellStyle4; |
|
350 | 354 |
this.Column12.HeaderText = "請求月"; |
351 | 355 |
this.Column12.Name = "Column12"; |
356 |
this.Column12.ReadOnly = true; |
|
357 |
this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
358 |
this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
352 | 359 |
this.Column12.Width = 120; |
353 | 360 |
// |
361 |
// Column8 |
|
362 |
// |
|
363 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
364 |
dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
365 |
this.Column8.DefaultCellStyle = dataGridViewCellStyle5; |
|
366 |
this.Column8.HeaderText = "発 給 日"; |
|
367 |
this.Column8.Name = "Column8"; |
|
368 |
this.Column8.ReadOnly = true; |
|
369 |
this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
370 |
this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
371 |
this.Column8.Width = 115; |
|
372 |
// |
|
354 | 373 |
// Column10 |
355 | 374 |
// |
356 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
357 |
this.Column10.DefaultCellStyle = dataGridViewCellStyle4;
|
|
375 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
376 |
this.Column10.DefaultCellStyle = dataGridViewCellStyle6;
|
|
358 | 377 |
this.Column10.HeaderText = "部 署"; |
359 | 378 |
this.Column10.Name = "Column10"; |
360 | 379 |
this.Column10.ReadOnly = true; |
... | ... | |
364 | 383 |
// |
365 | 384 |
// Column6 |
366 | 385 |
// |
367 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
368 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle5;
|
|
386 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
387 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
|
|
369 | 388 |
this.Column6.HeaderText = "担 当 者"; |
370 | 389 |
this.Column6.Name = "Column6"; |
371 | 390 |
this.Column6.ReadOnly = true; |
... | ... | |
376 | 395 |
// |
377 | 396 |
// Column4 |
378 | 397 |
// |
379 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
380 |
this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
|
|
398 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
399 |
this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
|
|
381 | 400 |
this.Column4.HeaderText = "宛 名"; |
382 | 401 |
this.Column4.Name = "Column4"; |
383 | 402 |
this.Column4.ReadOnly = true; |
384 | 403 |
this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
385 | 404 |
this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
386 |
this.Column4.Width = 720;
|
|
405 |
this.Column4.Width = 640;
|
|
387 | 406 |
// |
388 | 407 |
// Column7 |
389 | 408 |
// |
390 | 409 |
this.Column7.HeaderText = "工 事 名"; |
391 | 410 |
this.Column7.Name = "Column7"; |
392 | 411 |
this.Column7.ReadOnly = true; |
412 |
this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
393 | 413 |
this.Column7.Visible = false; |
394 | 414 |
this.Column7.Width = 390; |
395 | 415 |
// |
396 | 416 |
// Column3 |
397 | 417 |
// |
398 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
399 |
dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
400 |
this.Column3.DefaultCellStyle = dataGridViewCellStyle7;
|
|
418 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
419 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
420 |
this.Column3.DefaultCellStyle = dataGridViewCellStyle9;
|
|
401 | 421 |
this.Column3.HeaderText = "請求金額"; |
402 | 422 |
this.Column3.Name = "Column3"; |
403 | 423 |
this.Column3.ReadOnly = true; |
404 | 424 |
this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
405 | 425 |
this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
406 |
this.Column3.Width = 120;
|
|
426 |
this.Column3.Width = 200;
|
|
407 | 427 |
// |
408 | 428 |
// Column2 |
409 | 429 |
// |
410 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
411 |
this.Column2.DefaultCellStyle = dataGridViewCellStyle8;
|
|
430 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
431 |
this.Column2.DefaultCellStyle = dataGridViewCellStyle10;
|
|
412 | 432 |
this.Column2.HeaderText = "工事コード"; |
413 | 433 |
this.Column2.Name = "Column2"; |
414 | 434 |
this.Column2.ReadOnly = true; |
... | ... | |
419 | 439 |
// |
420 | 440 |
// Column9 |
421 | 441 |
// |
422 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
423 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
424 |
this.Column9.DefaultCellStyle = dataGridViewCellStyle9;
|
|
442 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
443 |
dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
444 |
this.Column9.DefaultCellStyle = dataGridViewCellStyle11;
|
|
425 | 445 |
this.Column9.HeaderText = "請求承認日"; |
426 | 446 |
this.Column9.Name = "Column9"; |
427 | 447 |
this.Column9.ReadOnly = true; |
... | ... | |
430 | 450 |
this.Column9.Visible = false; |
431 | 451 |
this.Column9.Width = 140; |
432 | 452 |
// |
433 |
// Column8 |
|
434 |
// |
|
435 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
436 |
dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
437 |
this.Column8.DefaultCellStyle = dataGridViewCellStyle10; |
|
438 |
this.Column8.HeaderText = "発 給 日"; |
|
439 |
this.Column8.Name = "Column8"; |
|
440 |
this.Column8.ReadOnly = true; |
|
441 |
this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
442 |
this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
443 |
this.Column8.Width = 115; |
|
444 |
// |
|
445 | 453 |
// Column5 |
446 | 454 |
// |
447 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
448 |
dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
449 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle11;
|
|
455 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
456 |
dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
457 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle12;
|
|
450 | 458 |
this.Column5.HeaderText = "郵 送 日"; |
451 | 459 |
this.Column5.Name = "Column5"; |
452 | 460 |
this.Column5.ReadOnly = true; |
... | ... | |
469 | 477 |
this.Column11.HeaderText = "請求書番号"; |
470 | 478 |
this.Column11.Name = "Column11"; |
471 | 479 |
this.Column11.ReadOnly = true; |
480 |
this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
472 | 481 |
this.Column11.Visible = false; |
473 | 482 |
this.Column11.Width = 160; |
474 | 483 |
// |
... | ... | |
525 | 534 |
private System.Windows.Forms.Label lblCellTotal; |
526 | 535 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column1; |
527 | 536 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column12; |
537 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column8; |
|
528 | 538 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column10; |
529 | 539 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column6; |
530 | 540 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column4; |
... | ... | |
532 | 542 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column3; |
533 | 543 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column2; |
534 | 544 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column9; |
535 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column8; |
|
536 | 545 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column5; |
537 | 546 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column13; |
538 | 547 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column11; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.resx | ||
---|---|---|
123 | 123 |
<metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
124 | 124 |
<value>True</value> |
125 | 125 |
</metadata> |
126 |
<metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
127 |
<value>True</value> |
|
128 |
</metadata> |
|
126 | 129 |
<metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
127 | 130 |
<value>True</value> |
128 | 131 |
</metadata> |
... | ... | |
144 | 147 |
<metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
145 | 148 |
<value>True</value> |
146 | 149 |
</metadata> |
147 |
<metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
148 |
<value>True</value> |
|
149 |
</metadata> |
|
150 | 150 |
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
151 | 151 |
<value>True</value> |
152 | 152 |
</metadata> |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs | ||
---|---|---|
458 | 458 |
strSQL.Append(wrkBuff.ToString()); |
459 | 459 |
|
460 | 460 |
// ORDER BY ??? |
461 |
strSQL.Append(" ORDER BY C.OrderCotegory ASC"); |
|
462 |
strSQL.Append(", C.OrderersCode ASC"); |
|
461 |
strSQL.Append(" ORDER BY 1=1"); |
|
462 |
strSQL.Append(", H.REQUESTMONTH DESC"); |
|
463 |
strSQL.Append(", ApprovalDate DESC"); |
|
463 | 464 |
strSQL.Append(", H.INVOICENO DESC"); |
464 |
strSQL.Append(", A.REQUESTNO DESC"); |
|
465 |
strSQL.Append(", ApprovalDate DESC");
|
|
466 |
strSQL.Append(", SendDate DESC");
|
|
465 |
//strSQL.Append(", A.REQUESTNO DESC");
|
|
466 |
//strSQL.Append(",C.OrderCotegory ASC");
|
|
467 |
//strSQL.Append(", SendData DESC");
|
|
467 | 468 |
} |
468 | 469 |
catch (Exception ex) |
469 | 470 |
{ |
... | ... | |
490 | 491 |
string strDspNo = string.Empty; |
491 | 492 |
string strOrderMonth = string.Empty; |
492 | 493 |
string strRequestAmount = string.Empty; |
493 |
int BreakOrdererCotegory = 0; |
|
494 |
int BreakOrdererCode = 0; |
|
495 |
int BreakInvoiceNo = 0; |
|
494 |
string BreakOrderMonth = string.Empty; |
|
495 |
int NowInvoiceNo = 0; |
|
496 | 496 |
int BreakConstrCode = 0; |
497 | 497 |
int OrderNo = 1; |
498 | 498 |
int RequestAmount = 0; |
... | ... | |
504 | 504 |
objwrk = (object[])arData[iy]; |
505 | 505 |
strOrderName = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTNAME]); |
506 | 506 |
|
507 |
// ??????u???C?N???? |
|
508 |
if (BreakOrdererCode == CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERSCODE]) |
|
509 |
&& BreakOrdererCotegory == CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERCOTEGORY]))?@ |
|
507 |
//?s?i???o?[ |
|
508 |
strDspNo = (ino++).ToString(); |
|
509 |
|
|
510 |
//???????????O??s????????????????s?J???? |
|
511 |
if (BreakOrderMonth != CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH])) |
|
510 | 512 |
{ |
511 |
//?????????????????????????i?????????????????????j
|
|
512 |
strOrderName = string.Empty;
|
|
513 |
if (BreakOrderMonth != string.Empty) dgv.Rows.Add(1);
|
|
514 |
BreakOrderMonth = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]);
|
|
513 | 515 |
} |
514 |
else |
|
515 |
{ // ??????1?s??? |
|
516 |
if (BreakOrdererCode != 0) dgv.Rows.Add(1); |
|
517 |
BreakOrdererCode = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERSCODE]); |
|
518 |
BreakOrdererCotegory = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERCOTEGORY]); |
|
519 |
} |
|
520 | 516 |
|
517 |
//???????Z?b?g |
|
518 |
strOrderMonth = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]); |
|
519 |
strOrderMonth = strOrderMonth.Insert(4, "?N") + "??"; |
|
520 |
|
|
521 | 521 |
// ?H??????Z?b?g |
522 | 522 |
strConstrName = string.Empty; |
523 | 523 |
strConstrName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME]); |
... | ... | |
528 | 528 |
// ??t????Z?b?g |
529 | 529 |
OrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]); |
530 | 530 |
if (OrderNo != 1) strConstrName = string.Format("{0} [{1}???]", strConstrName, OrderNo); |
531 |
//???????Z?b?g |
|
532 |
strOrderMonth = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]); |
|
533 |
strOrderMonth = strOrderMonth.Insert(4, "?N")?@+"??"; |
|
534 | 531 |
|
535 | 532 |
Array.Clear(DspDate, 0, DspDate.Length); |
536 | 533 |
if (CommonMotions.cnvDate(objwrk[(int)GetData.APPROVALDATE]).Date != DateTime.MinValue.Date) |
... | ... | |
541 | 538 |
DspDate[2] = CommonMotions.cnvDate(objwrk[(int)GetData.SENDDATE]).ToShortDateString(); |
542 | 539 |
|
543 | 540 |
// ???????u???C?N |
544 |
if (BreakInvoiceNo == CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO])) |
|
545 |
{ |
|
546 |
strDspNo = string.Empty; |
|
547 |
strOrderName = string.Empty; |
|
548 |
DspDate[1] = string.Empty; |
|
549 |
DspDate[2] = string.Empty; |
|
550 |
} |
|
551 |
else |
|
552 |
{ |
|
553 |
strDspNo = (ino++).ToString(); |
|
554 |
if (BreakOrdererCode != 0) |
|
555 |
BreakInvoiceNo = CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO]); |
|
541 |
if (BreakOrderMonth != string.Empty) |
|
542 |
NowInvoiceNo = CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO]); |
|
556 | 543 |
|
557 | 544 |
//???????z?Z?b?g |
558 | 545 |
RequestAmount = CommonMotions.cnvInt(objwrk[(int)GetData.REQUESTAMOUNT]); |
... | ... | |
561 | 548 |
for(int i=1; iy + i < arData.Count;i++) |
562 | 549 |
{ |
563 | 550 |
objNext = (object[])arData[(iy + i)]; |
564 |
if (CommonMotions.cnvInt(objNext[(int)GetData.INVOICENO]) == BreakInvoiceNo)
|
|
565 |
{
|
|
551 |
if (CommonMotions.cnvInt(objNext[(int)GetData.INVOICENO]) == NowInvoiceNo)
|
|
552 |
{ |
|
566 | 553 |
?@?@?@?@?@?@?@?@ RequestAmount += CommonMotions.cnvInt(((object[])arData[(iy + i)])[(int)GetData.REQUESTAMOUNT]); |
567 | 554 |
} |
568 | 555 |
else |
... | ... | |
573 | 560 |
} |
574 | 561 |
} |
575 | 562 |
strRequestAmount = RequestAmount.ToString("#,0"); |
576 |
} |
|
577 | 563 |
|
578 | 564 |
dgv.Rows.Add(strDspNo |
579 |
, strOrderMonth |
|
565 |
, strOrderMonth |
|
566 |
, DspDate[1] |
|
580 | 567 |
, CommonMotions.cnvString(objwrk[(int)GetData.DEPARTMENTSTRING]) |
581 | 568 |
, CommonMotions.cnvString(objwrk[(int)GetData.PERSONNAME]) |
582 | 569 |
, strOrderName |
... | ... | |
584 | 571 |
, strRequestAmount |
585 | 572 |
, CommonMotions.cnvInt(objwrk[(int)GetData.MAINCONSTRUCTIONCODE]) |
586 | 573 |
, DspDate[0] |
587 |
, DspDate[1] |
|
588 | 574 |
, DspDate[2] |
589 | 575 |
, CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]) |
590 | 576 |
, CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO]) |
... | ... | |
599 | 585 |
} |
600 | 586 |
#endregion |
601 | 587 |
|
602 |
#region ?w?b?_?s?\?? |
|
588 |
#region ?w?b?_?s?\???i???\??j
|
|
603 | 589 |
/// <summary> |
604 | 590 |
/// ?w?b?_?s?\?? |
605 | 591 |
/// ???\??????R?????g?A?E?g?A????????????????m????????? |
... | ... | |
676 | 662 |
// ?O???b?h??Z?b?g????? |
677 | 663 |
SetToGridData(arData); |
678 | 664 |
} |
679 |
|
|
680 |
// ?f?[?^??????????\?[?g????? |
|
681 |
if (CommonDefine.s_MaxInitLineCount < dgvMaster.RowCount) |
|
682 |
{ |
|
683 |
foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) |
|
684 |
wrkCol.SortMode = DataGridViewColumnSortMode.Automatic; |
|
685 |
} |
|
686 |
else |
|
687 |
{ |
|
688 |
// ?b???\?[?g?????? |
|
689 |
foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) |
|
690 |
wrkCol.SortMode = DataGridViewColumnSortMode.Automatic; |
|
691 |
} |
|
692 | 665 |
} |
693 | 666 |
catch (Exception ex) |
694 | 667 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.Designer.cs | ||
---|---|---|
35 | 35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); |
36 | 36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); |
37 | 37 |
this.dgv1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
38 |
this.btnAccept = new System.Windows.Forms.Button(); |
|
39 |
this.btnEnd = new System.Windows.Forms.Button(); |
|
40 |
this.label1 = new System.Windows.Forms.Label(); |
|
41 |
this.OrderersName = new System.Windows.Forms.Label(); |
|
42 |
this.button1 = new System.Windows.Forms.Button(); |
|
43 |
this.btnDelete = new System.Windows.Forms.Button(); |
|
38 | 44 |
this.OrderersDivision = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
39 | 45 |
this.OrderersCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
40 | 46 |
this.TargetDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
47 | 53 |
this.DepositPersonCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
48 | 54 |
this.DepositPersonName = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
49 | 55 |
this.Note = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
50 |
this.btnAccept = new System.Windows.Forms.Button(); |
|
51 |
this.btnEnd = new System.Windows.Forms.Button(); |
|
52 |
this.label1 = new System.Windows.Forms.Label(); |
|
53 |
this.OrderersName = new System.Windows.Forms.Label(); |
|
54 |
this.button1 = new System.Windows.Forms.Button(); |
|
55 |
this.btnDelete = new System.Windows.Forms.Button(); |
|
56 | 56 |
((System.ComponentModel.ISupportInitialize)(this.dgv1)).BeginInit(); |
57 | 57 |
this.SuspendLayout(); |
58 | 58 |
// |
... | ... | |
85 | 85 |
this.DepositPersonName, |
86 | 86 |
this.Note}); |
87 | 87 |
this.dgv1.EnableHeadersVisualStyles = false; |
88 |
this.dgv1.Location = new System.Drawing.Point(12, 63);
|
|
88 |
this.dgv1.Location = new System.Drawing.Point(8, 53);
|
|
89 | 89 |
this.dgv1.Name = "dgv1"; |
90 | 90 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
91 | 91 |
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; |
... | ... | |
98 | 98 |
this.dgv1.RowHeadersVisible = false; |
99 | 99 |
this.dgv1.RowTemplate.Height = 21; |
100 | 100 |
this.dgv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; |
101 |
this.dgv1.Size = new System.Drawing.Size(652, 172);
|
|
101 |
this.dgv1.Size = new System.Drawing.Size(706, 172);
|
|
102 | 102 |
this.dgv1.TabIndex = 9; |
103 | 103 |
this.dgv1.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgv1_CellBeginEdit); |
104 | 104 |
this.dgv1.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellEnter); |
... | ... | |
106 | 106 |
this.dgv1.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dgv1_CellValidating); |
107 | 107 |
this.dgv1.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellValueChanged); |
108 | 108 |
// |
109 |
// btnAccept |
|
110 |
// |
|
111 |
this.btnAccept.BackColor = System.Drawing.Color.Lime; |
|
112 |
this.btnAccept.ForeColor = System.Drawing.Color.Black; |
|
113 |
this.btnAccept.Location = new System.Drawing.Point(468, 239); |
|
114 |
this.btnAccept.Name = "btnAccept"; |
|
115 |
this.btnAccept.Size = new System.Drawing.Size(120, 32); |
|
116 |
this.btnAccept.TabIndex = 12; |
|
117 |
this.btnAccept.Text = "登 録"; |
|
118 |
this.btnAccept.UseVisualStyleBackColor = false; |
|
119 |
this.btnAccept.Click += new System.EventHandler(this.btnAccept_Click); |
|
120 |
// |
|
121 |
// btnEnd |
|
122 |
// |
|
123 |
this.btnEnd.BackColor = System.Drawing.Color.Blue; |
|
124 |
this.btnEnd.ForeColor = System.Drawing.Color.Transparent; |
|
125 |
this.btnEnd.Location = new System.Drawing.Point(594, 239); |
|
126 |
this.btnEnd.Name = "btnEnd"; |
|
127 |
this.btnEnd.Size = new System.Drawing.Size(120, 32); |
|
128 |
this.btnEnd.TabIndex = 11; |
|
129 |
this.btnEnd.Text = "閉じる"; |
|
130 |
this.btnEnd.UseVisualStyleBackColor = false; |
|
131 |
this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click); |
|
132 |
// |
|
133 |
// label1 |
|
134 |
// |
|
135 |
this.label1.BackColor = System.Drawing.Color.LightGoldenrodYellow; |
|
136 |
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
137 |
this.label1.Location = new System.Drawing.Point(8, 12); |
|
138 |
this.label1.Name = "label1"; |
|
139 |
this.label1.Size = new System.Drawing.Size(140, 25); |
|
140 |
this.label1.TabIndex = 15; |
|
141 |
this.label1.Text = "発 注 者"; |
|
142 |
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
143 |
// |
|
144 |
// OrderersName |
|
145 |
// |
|
146 |
this.OrderersName.BackColor = System.Drawing.Color.White; |
|
147 |
this.OrderersName.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
148 |
this.OrderersName.Location = new System.Drawing.Point(154, 12); |
|
149 |
this.OrderersName.Name = "OrderersName"; |
|
150 |
this.OrderersName.Size = new System.Drawing.Size(560, 25); |
|
151 |
this.OrderersName.TabIndex = 16; |
|
152 |
this.OrderersName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; |
|
153 |
// |
|
154 |
// button1 |
|
155 |
// |
|
156 |
this.button1.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
157 |
this.button1.Location = new System.Drawing.Point(154, 248); |
|
158 |
this.button1.Name = "button1"; |
|
159 |
this.button1.Size = new System.Drawing.Size(60, 23); |
|
160 |
this.button1.TabIndex = 15; |
|
161 |
this.button1.Text = "・・・"; |
|
162 |
this.button1.UseVisualStyleBackColor = true; |
|
163 |
this.button1.Visible = false; |
|
164 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
165 |
// |
|
166 |
// btnDelete |
|
167 |
// |
|
168 |
this.btnDelete.BackColor = System.Drawing.Color.Magenta; |
|
169 |
this.btnDelete.ForeColor = System.Drawing.Color.Black; |
|
170 |
this.btnDelete.Location = new System.Drawing.Point(8, 239); |
|
171 |
this.btnDelete.Name = "btnDelete"; |
|
172 |
this.btnDelete.Size = new System.Drawing.Size(120, 32); |
|
173 |
this.btnDelete.TabIndex = 16; |
|
174 |
this.btnDelete.Text = "入金削除"; |
|
175 |
this.btnDelete.UseVisualStyleBackColor = false; |
|
176 |
this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); |
|
177 |
// |
|
109 | 178 |
// OrderersDivision |
110 | 179 |
// |
111 | 180 |
this.OrderersDivision.HeaderText = "■発注者区分"; |
... | ... | |
216 | 285 |
this.Note.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
217 | 286 |
this.Note.Width = 200; |
218 | 287 |
// |
219 |
// btnAccept |
|
220 |
// |
|
221 |
this.btnAccept.BackColor = System.Drawing.Color.Lime; |
|
222 |
this.btnAccept.ForeColor = System.Drawing.Color.Black; |
|
223 |
this.btnAccept.Location = new System.Drawing.Point(418, 241); |
|
224 |
this.btnAccept.Name = "btnAccept"; |
|
225 |
this.btnAccept.Size = new System.Drawing.Size(120, 32); |
|
226 |
this.btnAccept.TabIndex = 12; |
|
227 |
this.btnAccept.Text = "登 録"; |
|
228 |
this.btnAccept.UseVisualStyleBackColor = false; |
|
229 |
this.btnAccept.Click += new System.EventHandler(this.btnAccept_Click); |
|
230 |
// |
|
231 |
// btnEnd |
|
232 |
// |
|
233 |
this.btnEnd.BackColor = System.Drawing.Color.Blue; |
|
234 |
this.btnEnd.ForeColor = System.Drawing.Color.Transparent; |
|
235 |
this.btnEnd.Location = new System.Drawing.Point(544, 241); |
|
236 |
this.btnEnd.Name = "btnEnd"; |
|
237 |
this.btnEnd.Size = new System.Drawing.Size(120, 32); |
|
238 |
this.btnEnd.TabIndex = 11; |
|
239 |
this.btnEnd.Text = "閉じる"; |
|
240 |
this.btnEnd.UseVisualStyleBackColor = false; |
|
241 |
this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click); |
|
242 |
// |
|
243 |
// label1 |
|
244 |
// |
|
245 |
this.label1.BackColor = System.Drawing.Color.Yellow; |
|
246 |
this.label1.Location = new System.Drawing.Point(12, 18); |
|
247 |
this.label1.Name = "label1"; |
|
248 |
this.label1.Size = new System.Drawing.Size(106, 25); |
|
249 |
this.label1.TabIndex = 13; |
|
250 |
this.label1.Text = "発注者"; |
|
251 |
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
252 |
// |
|
253 |
// OrderersName |
|
254 |
// |
|
255 |
this.OrderersName.BackColor = System.Drawing.Color.White; |
|
256 |
this.OrderersName.Location = new System.Drawing.Point(124, 18); |
|
257 |
this.OrderersName.Name = "OrderersName"; |
|
258 |
this.OrderersName.Size = new System.Drawing.Size(414, 25); |
|
259 |
this.OrderersName.TabIndex = 14; |
|
260 |
this.OrderersName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; |
|
261 |
// |
|
262 |
// button1 |
|
263 |
// |
|
264 |
this.button1.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
265 |
this.button1.Location = new System.Drawing.Point(604, 18); |
|
266 |
this.button1.Name = "button1"; |
|
267 |
this.button1.Size = new System.Drawing.Size(60, 23); |
|
268 |
this.button1.TabIndex = 15; |
|
269 |
this.button1.Text = "・・・"; |
|
270 |
this.button1.UseVisualStyleBackColor = true; |
|
271 |
this.button1.Visible = false; |
|
272 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
273 |
// |
|
274 |
// btnDelete |
|
275 |
// |
|
276 |
this.btnDelete.BackColor = System.Drawing.Color.Magenta; |
|
277 |
this.btnDelete.ForeColor = System.Drawing.Color.Black; |
|
278 |
this.btnDelete.Location = new System.Drawing.Point(12, 242); |
|
279 |
this.btnDelete.Name = "btnDelete"; |
|
280 |
this.btnDelete.Size = new System.Drawing.Size(120, 32); |
|
281 |
this.btnDelete.TabIndex = 16; |
|
282 |
this.btnDelete.Text = "入金削除"; |
|
283 |
this.btnDelete.UseVisualStyleBackColor = false; |
|
284 |
this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); |
|
285 |
// |
|
286 | 288 |
// FrmEntryDeposit |
287 | 289 |
// |
288 | 290 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; |
289 | 291 |
this.BackColor = System.Drawing.Color.Black; |
290 |
this.ClientSize = new System.Drawing.Size(676, 286);
|
|
292 |
this.ClientSize = new System.Drawing.Size(723, 286);
|
|
291 | 293 |
this.Controls.Add(this.btnDelete); |
292 | 294 |
this.Controls.Add(this.button1); |
293 | 295 |
this.Controls.Add(this.OrderersName); |
... | ... | |
317 | 319 |
private System.Windows.Forms.Label label1; |
318 | 320 |
private System.Windows.Forms.Label OrderersName; |
319 | 321 |
private System.Windows.Forms.Button button1; |
322 |
private System.Windows.Forms.Button btnDelete; |
|
320 | 323 |
private System.Windows.Forms.DataGridViewTextBoxColumn OrderersDivision; |
321 | 324 |
private System.Windows.Forms.DataGridViewTextBoxColumn OrderersCode; |
322 | 325 |
private System.Windows.Forms.DataGridViewTextBoxColumn TargetDate; |
... | ... | |
329 | 332 |
private System.Windows.Forms.DataGridViewTextBoxColumn DepositPersonCode; |
330 | 333 |
private System.Windows.Forms.DataGridViewTextBoxColumn DepositPersonName; |
331 | 334 |
private System.Windows.Forms.DataGridViewTextBoxColumn Note; |
332 |
private System.Windows.Forms.Button btnDelete; |
|
333 | 335 |
} |
334 | 336 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs | ||
---|---|---|
307 | 307 |
dgv1.Rows[i].Cells[(int)DispColumn.seqNo].Value = Dlist[i].seqNo; |
308 | 308 |
dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value = Dlist[i].depositPersonCode; |
309 | 309 |
dgv1.Rows[i].Cells[(int)DispColumn.personName].Value = Dlist[i].personName; |
310 |
dgv1.Rows[i].Cells[(int)DispColumn.personName].Style.ForeColor = Color.Red; |
|
311 | 310 |
} |
312 | 311 |
else |
313 | 312 |
{ |
... | ... | |
316 | 315 |
dgv1.Rows[i].Cells[(int)DispColumn.seqNo].Value = maxSeqNo + 1; |
317 | 316 |
dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value = CommonMotions.LoginUserData.PersonCode; |
318 | 317 |
dgv1.Rows[i].Cells[(int)DispColumn.personName].Value = CommonMotions.LoginUserData.SealPrintName; |
319 |
dgv1.Rows[i].Cells[(int)DispColumn.personName].Style.ForeColor = Color.Gray; |
|
320 | 318 |
} |
321 | 319 |
dgv1.Rows[i].Cells[(int)DispColumn.note].Value = Dlist[i].note; |
322 | 320 |
} |
... | ... | |
423 | 421 |
{ |
424 | 422 |
try |
425 | 423 |
{ |
424 |
|
|
425 |
// データグリッドがActiveでなければ処理しない |
|
426 |
if (ActiveControl == null) return; |
|
427 |
if (!ActiveControl.GetType().Equals(typeof(DataGridViewEX))) return; |
|
428 |
|
|
429 |
DataGridViewEX dgv = (DataGridViewEX)sender; |
|
430 |
|
|
431 |
// 読込専用セルは処理しない |
|
432 |
if (dgv.CurrentCell.ReadOnly) return; |
|
433 |
|
|
426 | 434 |
if (dgv1.RowCount == 0) |
427 | 435 |
{ |
428 | 436 |
return; |
429 | 437 |
} |
430 | 438 |
oldCellValue = CommonMotions.cnvString(dgv1[e.ColumnIndex, e.RowIndex].Value); |
431 | 439 |
|
440 |
//IMEのモードを変更する |
|
441 |
switch (e.ColumnIndex) |
|
442 |
{ |
|
443 |
case (int)DispColumn.note: // 備考 |
|
444 |
dgv.ImeMode = ImeMode.On; |
|
445 |
break; |
|
446 |
default: |
|
447 |
dgv.ImeMode = ImeMode.Disable; |
|
448 |
break; |
|
449 |
} |
|
450 |
// セル内容選択 |
|
451 |
dgv.BeginEdit(true); |
|
432 | 452 |
} |
433 |
catch (Exception ex) |
|
453 |
catch (System.Exception ex)
|
|
434 | 454 |
{ |
435 | 455 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
436 | 456 |
} |
... | ... | |
776 | 796 |
DepositAmount = Dlist[i].depositAmountCash + Dlist[i].depositAmountBill, |
777 | 797 |
DepositAmountCash = Dlist[i].depositAmountCash, |
778 | 798 |
DepositAmountBill = Dlist[i].depositAmountBill, |
779 |
DepositPersonCode = (int)dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value, |
|
799 |
DepositPersonCode = CommonMotions.LoginUserData.PersonCode, |
|
800 |
//DepositPersonCode = (int)dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value, |
|
780 | 801 |
Note = m_note |
781 | 802 |
}; |
782 | 803 |
|
... | ... | |
816 | 837 |
#endregion |
817 | 838 |
} |
818 | 839 |
CommonMotions.EntryEndMessage("入金入力"); |
840 |
this.Close(); |
|
819 | 841 |
} |
820 | 842 |
catch (Exception ex) |
821 | 843 |
{ |
... | ... | |
828 | 850 |
dgv1.CellValueChanged += dgv1_CellValueChanged; |
829 | 851 |
ioDepositData.close(); |
830 | 852 |
ioDepositData = null; |
831 |
try |
|
832 |
{ |
|
833 |
this.Close(); |
|
834 |
} |
|
835 |
catch (Exception ex) |
|
836 |
{ |
|
837 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
838 |
} |
|
839 | 853 |
} |
840 | 854 |
} |
841 | 855 |
#endregion |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.Designer.cs | ||
---|---|---|
209 | 209 |
this.cbTargetMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
210 | 210 |
this.cbTargetMonth.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
211 | 211 |
this.cbTargetMonth.FormattingEnabled = true; |
212 |
this.cbTargetMonth.IntegralHeight = false; |
|
212 | 213 |
this.cbTargetMonth.Location = new System.Drawing.Point(164, 8); |
213 | 214 |
this.cbTargetMonth.Name = "cbTargetMonth"; |
214 | 215 |
this.cbTargetMonth.Size = new System.Drawing.Size(100, 24); |
... | ... | |
429 | 430 |
// |
430 | 431 |
this.OrderersName.HeaderText = "請求先名/請求日"; |
431 | 432 |
this.OrderersName.Name = "OrderersName"; |
433 |
this.OrderersName.ReadOnly = true; |
|
432 | 434 |
this.OrderersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
433 | 435 |
this.OrderersName.Width = 200; |
434 | 436 |
// |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs | ||
---|---|---|
385 | 385 |
|
386 | 386 |
cbTargetMonth.Items.AddRange(lstDate.ToArray()); |
387 | 387 |
cbTargetMonth.SelectedIndex = lstDate.IndexOf(strNow); |
388 |
cbTargetMonth.MaxDropDownItems = 10; |
|
388 | 389 |
|
389 | 390 |
// ユーザ権限設定 |
390 | 391 |
ClsSecurityPermission.SetUserType(m_UserInfo); |
... | ... | |
874 | 875 |
{ |
875 | 876 |
try |
876 | 877 |
{ |
877 |
if (dgvMaster.RowCount == 0) |
|
878 |
return; |
|
878 |
// データグリッドがActiveでなければ処理しない |
|
879 |
if (ActiveControl == null) return; |
|
880 |
if (!ActiveControl.GetType().Equals(typeof(DataGridViewEX))) return; |
|
881 |
|
|
882 |
DataGridViewEX dgv = (DataGridViewEX)sender; |
|
883 |
|
|
884 |
// 読込専用セルは処理しない |
|
885 |
if (dgv.CurrentCell.ReadOnly) return; |
|
886 |
|
|
887 |
|
|
888 |
if (dgvMaster.RowCount == 0)return; |
|
879 | 889 |
oldCellValue = CommonMotions.cnvString(dgvMaster[e.ColumnIndex, e.RowIndex].Value); |
880 | 890 |
|
891 |
//IMEのモードを変更する |
|
892 |
switch (e.ColumnIndex) |
|
893 |
{ |
|
894 |
case (int)DispColumn.NoteDD: // 備考 |
|
895 |
dgv.ImeMode = ImeMode.On; |
|
896 |
break; |
|
897 |
default: |
|
898 |
dgv.ImeMode = ImeMode.Disable; |
|
899 |
break; |
|
900 |
} |
|
901 |
// セル内容選択 |
|
902 |
dgv.BeginEdit(true); |
|
903 |
|
|
881 | 904 |
} |
882 | 905 |
catch (Exception ex) |
883 | 906 |
{ |
... | ... | |
1001 | 1024 |
{ |
1002 | 1025 |
case (int)DispColumn.DepositAmount: |
1003 | 1026 |
depositDetail.DepositAmount = amount; |
1027 |
// 消費税額計算 |
|
1028 |
depositDetail.TaxAmount = CommonMotions.cnvRound(amount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
1004 | 1029 |
bUpdateCarryAmount = true; |
1005 | 1030 |
sumDataCheck = true; |
1006 | 1031 |
break; |
... | ... | |
1682 | 1707 |
SetPrice(ordererRow.Cells, (int)DispColumn.DepositAmountCash, (long)SumDepositAmountCash); |
1683 | 1708 |
SetPrice(ordererRow.Cells, (int)DispColumn.DepositAmountBill, (long)SumDepositAmountBill); |
1684 | 1709 |
|
1710 |
// 入金合計と請求合計の差異があった場合は色を変更する |
|
1711 |
long depositAmount = SumDepositAmountCash + SumDepositAmountBill; |
|
1712 |
long requestAmount = SumRequestBill + SumRequestTax; |
|
1713 |
if (requestAmount != depositAmount) |
|
1714 |
{ |
|
1715 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.Yellow; |
|
1716 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.ForeColor = Color.Red; |
|
1717 |
|
|
1718 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.Yellow; |
|
1719 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.ForeColor = Color.Red; |
|
1720 |
} |
|
1721 |
else |
|
1722 |
{ |
|
1723 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.LightGoldenrodYellow; |
|
1724 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.LightGoldenrodYellow; |
|
1725 |
} |
|
1726 |
|
|
1685 | 1727 |
// 入金明細金額の合計を算出 |
1686 | 1728 |
var DepositDetailSum = DepositDetailSumCalc(depositOrderer.OrderersDivision, depositOrderer.OrderersCode, depositOrderer.RequestMonth).OfType<object[]>(); |
1687 | 1729 |
int DepositAmountSum = 0; |
... | ... | |
1712 | 1754 |
ordererRow.Cells[(int)DispColumn.No].Style.BackColor = Color.LightGoldenrodYellow; |
1713 | 1755 |
ordererRow.Cells[(int)DispColumn.RequestMonth].Style.BackColor = Color.LightGoldenrodYellow; |
1714 | 1756 |
ordererRow.Cells[(int)DispColumn.OrderersName].Style.BackColor = Color.LightGoldenrodYellow; |
1715 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.LightGoldenrodYellow; |
|
1716 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.LightGoldenrodYellow; |
|
1717 | 1757 |
|
1718 | 1758 |
ordererRow.Cells[(int)DispColumn.ConstructionCode].Style.BackColor = Color.LightGoldenrodYellow; |
1719 | 1759 |
ordererRow.Cells[(int)DispColumn.RequestNo].Style.BackColor = Color.LightGoldenrodYellow; |
... | ... | |
1731 | 1771 |
ordererRow.Cells[(int)DispColumn.CnstrPrice].Style.BackColor = Color.LightGoldenrodYellow; |
1732 | 1772 |
ordererRow.Cells[(int)DispColumn.Fees].Style.BackColor = Color.LightGoldenrodYellow; |
1733 | 1773 |
ordererRow.Cells[(int)DispColumn.OtherAdjustments].Style.BackColor = Color.LightGoldenrodYellow; |
1734 |
if (DifferenceAmountSum < 0) |
|
1735 |
{ |
|
1736 |
ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.Yellow; |
|
1737 |
} |
|
1738 |
else |
|
1739 |
{ |
|
1740 |
ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightGoldenrodYellow; |
|
1741 |
} |
|
1742 | 1774 |
|
1743 | 1775 |
SetPrice(ordererRow.Cells, (int)DispColumn.DepositAmount, DepositAmountSum); |
1744 | 1776 |
SetPrice(ordererRow.Cells, (int)DispColumn.TaxAmount, TaxAmountSum); |
... | ... | |
1748 | 1780 |
SetPrice(ordererRow.Cells, (int)DispColumn.OtherAdjustments, OtherAdjustmentsSum); |
1749 | 1781 |
SetPrice(ordererRow.Cells, (int)DispColumn.DifferentAmount, DifferenceAmountSum); |
1750 | 1782 |
|
1783 |
//差異が0以外の場合は表示色を変更する |
|
1784 |
if (DifferenceAmountSum != 0) |
|
1785 |
{ |
|
1786 |
ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.Yellow; |
|
1787 |
ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.ForeColor = Color.Red; |
|
1788 |
} |
|
1789 |
else |
|
1790 |
{ |
|
1791 |
ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightGoldenrodYellow; |
|
1792 |
} |
|
1793 |
|
|
1751 | 1794 |
ordererRow.Cells[(int)DispColumn.DepositAmount].ReadOnly = true; |
1752 | 1795 |
ordererRow.Cells[(int)DispColumn.TaxAmount].ReadOnly = true; |
1753 | 1796 |
ordererRow.Cells[(int)DispColumn.DiscountAmount].ReadOnly = true; |
... | ... | |
1868 | 1911 |
row.Cells[(int)DispColumn.CnstrPrice].Style.BackColor = Color.LightCyan; |
1869 | 1912 |
row.Cells[(int)DispColumn.Fees].Style.BackColor = Color.LightCyan; |
1870 | 1913 |
row.Cells[(int)DispColumn.OtherAdjustments].Style.BackColor = Color.LightCyan; |
1871 |
row.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightCyan; |
|
1872 | 1914 |
|
1873 | 1915 |
long RequestAmount = depositDetail.BillPrice + depositDetail.TaxPrice; |
1874 | 1916 |
long DepositAmount = depositDetail.DepositAmount + depositDetail.TaxAmount + depositDetail.DiscountAmount |
... | ... | |
1877 | 1919 |
|
1878 | 1920 |
SetPrice(row.Cells, (int)DispColumn.DifferentAmount, depositDetail.DifferenceAmount); |
1879 | 1921 |
|
1922 |
//差異が0以外の場合は表示色を変更する |
|
1923 |
if (depositDetail.DifferenceAmount != 0) |
|
1924 |
{ |
|
1925 |
row.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.Yellow; |
|
1926 |
row.Cells[(int)DispColumn.DifferentAmount].Style.ForeColor = Color.Red; |
|
1927 |
} |
|
1928 |
else |
|
1929 |
{ |
|
1930 |
row.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightCyan; |
|
1931 |
} |
|
1880 | 1932 |
row.Cells[(int)DispColumn.ConfirmationPersonCode].Value = depositDetail.ConstructionPersonCode; |
1881 | 1933 |
row.Cells[(int)DispColumn.ConfirmationDate].Value = depositDetail.ConfirmationDate; |
1882 | 1934 |
row.Cells[(int)DispColumn.ConfirmationEndFlg].Value = depositDetail.ConfirmationEndFlg; |
... | ... | |
2671 | 2723 |
|| e.ColumnIndex == (int)DispColumn.DifferentAmount) |
2672 | 2724 |
{ |
2673 | 2725 |
// マイナス値は赤 |
2674 |
if (CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) < 0)
|
|
2726 |
if (e.ColumnIndex == (int)DispColumn.DifferentAmount && CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) != 0)
|
|
2675 | 2727 |
{ |
2676 | 2728 |
dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = Color.Red; |
2677 | 2729 |
} |
2730 |
else if (CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) < 0) |
|
2731 |
{ |
|
2732 |
dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = Color.Red; |
|
2733 |
} |
|
2678 | 2734 |
else |
2679 | 2735 |
{ |
2680 | 2736 |
dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = SystemColors.ControlText; |
他の形式にエクスポート: Unified diff