リビジョン 401
入金確認
完了後一括と出来高分割を同じページで表示するよう修正
入金合計が0の場合は色を変更しないように修正
請求区分の項目を追加し、出来高分割か完了後一括かを表示
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
---|---|---|
2237 | 2237 |
return; |
2238 | 2238 |
} |
2239 | 2239 |
|
2240 |
if (CurrentPara.IntExecParameter.Count != 0) |
|
2241 |
{ |
|
2242 |
frm.ExecuteFlg = CurrentPara.IntExecParameter[0]; |
|
2243 |
} |
|
2244 | 2240 |
// フォーム表示 |
2245 | 2241 |
frm.ShowDialog(); |
2246 | 2242 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.Designer.cs | ||
---|---|---|
28 | 28 |
/// </summary> |
29 | 29 |
private void InitializeComponent() |
30 | 30 |
{ |
31 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
32 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
41 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
42 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
43 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
44 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
45 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
46 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
31 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
32 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
41 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
42 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
43 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
44 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
45 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
46 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
47 | 47 |
this.lblTitle = new System.Windows.Forms.Label(); |
48 | 48 |
this.panel1 = new System.Windows.Forms.Panel(); |
49 | 49 |
this.lblRequestAmount = new System.Windows.Forms.Label(); |
... | ... | |
68 | 68 |
this.OrderersDivision = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
69 | 69 |
this.OrderersCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
70 | 70 |
this.OrderersName = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
71 |
this.BillingCateLbl = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
71 | 72 |
this.ConstructionCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
72 | 73 |
this.ConstructionName = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
73 | 74 |
this.BillPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
252 | 253 |
this.button1.TabIndex = 3; |
253 | 254 |
this.button1.Text = "・・・"; |
254 | 255 |
this.button1.UseVisualStyleBackColor = true; |
256 |
this.button1.Visible = false; |
|
255 | 257 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
256 | 258 |
// |
257 | 259 |
// Registration |
... | ... | |
316 | 318 |
| System.Windows.Forms.AnchorStyles.Left) |
317 | 319 |
| System.Windows.Forms.AnchorStyles.Right))); |
318 | 320 |
this.dgvMaster.BackgroundColor = System.Drawing.Color.White; |
319 |
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
320 |
dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
|
|
321 |
dataGridViewCellStyle17.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
322 |
dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
323 |
dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
324 |
dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
325 |
dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
326 |
this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
|
|
321 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
322 |
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; |
|
323 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
324 |
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; |
|
325 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; |
|
326 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; |
|
327 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; |
|
328 |
this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; |
|
327 | 329 |
this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; |
328 | 330 |
this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
329 | 331 |
this.KB, |
... | ... | |
333 | 335 |
this.OrderersDivision, |
334 | 336 |
this.OrderersCode, |
335 | 337 |
this.OrderersName, |
338 |
this.BillingCateLbl, |
|
336 | 339 |
this.ConstructionCode, |
337 | 340 |
this.ConstructionName, |
338 | 341 |
this.BillPrice, |
... | ... | |
371 | 374 |
// |
372 | 375 |
// KB |
373 | 376 |
// |
374 |
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
375 |
this.KB.DefaultCellStyle = dataGridViewCellStyle18;
|
|
377 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
378 |
this.KB.DefaultCellStyle = dataGridViewCellStyle2;
|
|
376 | 379 |
this.KB.HeaderText = "行区分"; |
377 | 380 |
this.KB.Name = "KB"; |
378 | 381 |
this.KB.ReadOnly = true; |
... | ... | |
382 | 385 |
// |
383 | 386 |
// No |
384 | 387 |
// |
385 |
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
386 |
this.No.DefaultCellStyle = dataGridViewCellStyle19;
|
|
388 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
389 |
this.No.DefaultCellStyle = dataGridViewCellStyle3;
|
|
387 | 390 |
this.No.HeaderText = "No."; |
388 | 391 |
this.No.Name = "No"; |
389 | 392 |
this.No.ReadOnly = true; |
... | ... | |
434 | 437 |
this.OrderersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
435 | 438 |
this.OrderersName.Width = 200; |
436 | 439 |
// |
440 |
// BillingCateLbl |
|
441 |
// |
|
442 |
this.BillingCateLbl.HeaderText = "請求区分"; |
|
443 |
this.BillingCateLbl.Name = "BillingCateLbl"; |
|
444 |
this.BillingCateLbl.ReadOnly = true; |
|
445 |
this.BillingCateLbl.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
446 |
// |
|
437 | 447 |
// ConstructionCode |
438 | 448 |
// |
439 | 449 |
this.ConstructionCode.HeaderText = "■工事番号"; |
... | ... | |
452 | 462 |
// |
453 | 463 |
// BillPrice |
454 | 464 |
// |
455 |
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
456 |
this.BillPrice.DefaultCellStyle = dataGridViewCellStyle20;
|
|
465 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
466 |
this.BillPrice.DefaultCellStyle = dataGridViewCellStyle4;
|
|
457 | 467 |
this.BillPrice.HeaderText = "請求金額\r\n(税抜)"; |
458 | 468 |
this.BillPrice.Name = "BillPrice"; |
459 | 469 |
this.BillPrice.ReadOnly = true; |
... | ... | |
463 | 473 |
// |
464 | 474 |
// TaxPrice |
465 | 475 |
// |
466 |
dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
467 |
this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle21;
|
|
476 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
477 |
this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle5;
|
|
468 | 478 |
this.TaxPrice.HeaderText = "請求金額\r\n(消費税)"; |
469 | 479 |
this.TaxPrice.Name = "TaxPrice"; |
470 | 480 |
this.TaxPrice.ReadOnly = true; |
... | ... | |
474 | 484 |
// |
475 | 485 |
// DepositAmountCash |
476 | 486 |
// |
477 |
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
478 |
this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle22;
|
|
487 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
488 |
this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle6;
|
|
479 | 489 |
this.DepositAmountCash.HeaderText = "入金金額\r\n(振込)"; |
480 | 490 |
this.DepositAmountCash.Name = "DepositAmountCash"; |
481 | 491 |
this.DepositAmountCash.ReadOnly = true; |
... | ... | |
485 | 495 |
// |
486 | 496 |
// DepositAmountBill |
487 | 497 |
// |
488 |
dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
489 |
this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle23;
|
|
498 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
499 |
this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle7;
|
|
490 | 500 |
this.DepositAmountBill.HeaderText = "入金金額\r\n(手形)"; |
491 | 501 |
this.DepositAmountBill.Name = "DepositAmountBill"; |
492 | 502 |
this.DepositAmountBill.ReadOnly = true; |
... | ... | |
505 | 515 |
// |
506 | 516 |
// DepositAmount |
507 | 517 |
// |
508 |
dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
509 |
this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle24;
|
|
518 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
519 |
this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle8;
|
|
510 | 520 |
this.DepositAmount.HeaderText = "入金金額\r\n(税抜)"; |
511 | 521 |
this.DepositAmount.Name = "DepositAmount"; |
512 | 522 |
this.DepositAmount.ReadOnly = true; |
... | ... | |
516 | 526 |
// |
517 | 527 |
// TaxAmount |
518 | 528 |
// |
519 |
dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
520 |
this.TaxAmount.DefaultCellStyle = dataGridViewCellStyle25;
|
|
529 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
530 |
this.TaxAmount.DefaultCellStyle = dataGridViewCellStyle9;
|
|
521 | 531 |
this.TaxAmount.HeaderText = "入金金額\r\n(消費税)"; |
522 | 532 |
this.TaxAmount.Name = "TaxAmount"; |
523 | 533 |
this.TaxAmount.ReadOnly = true; |
... | ... | |
527 | 537 |
// |
528 | 538 |
// DiscountAmount |
529 | 539 |
// |
530 |
dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
531 |
this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle26;
|
|
540 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
541 |
this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle10;
|
|
532 | 542 |
this.DiscountAmount.HeaderText = "値引金額"; |
533 | 543 |
this.DiscountAmount.Name = "DiscountAmount"; |
534 | 544 |
this.DiscountAmount.ReadOnly = true; |
... | ... | |
538 | 548 |
// |
539 | 549 |
// CnstrPrice |
540 | 550 |
// |
541 |
dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
542 |
this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle27;
|
|
551 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
552 |
this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle11;
|
|
543 | 553 |
this.CnstrPrice.HeaderText = "協力金"; |
544 | 554 |
this.CnstrPrice.Name = "CnstrPrice"; |
545 | 555 |
this.CnstrPrice.ReadOnly = true; |
... | ... | |
549 | 559 |
// |
550 | 560 |
// Fees |
551 | 561 |
// |
552 |
dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
553 |
this.Fees.DefaultCellStyle = dataGridViewCellStyle28;
|
|
562 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
563 |
this.Fees.DefaultCellStyle = dataGridViewCellStyle12;
|
|
554 | 564 |
this.Fees.HeaderText = "手数料"; |
555 | 565 |
this.Fees.Name = "Fees"; |
556 | 566 |
this.Fees.ReadOnly = true; |
... | ... | |
560 | 570 |
// |
561 | 571 |
// OtherAdjustments |
562 | 572 |
// |
563 |
dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
564 |
this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle29;
|
|
573 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
574 |
this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle13;
|
|
565 | 575 |
this.OtherAdjustments.HeaderText = "送料"; |
566 | 576 |
this.OtherAdjustments.Name = "OtherAdjustments"; |
567 | 577 |
this.OtherAdjustments.ReadOnly = true; |
... | ... | |
571 | 581 |
// |
572 | 582 |
// CarryAmount |
573 | 583 |
// |
574 |
dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
575 |
this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle30;
|
|
584 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
585 |
this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle14;
|
|
576 | 586 |
this.CarryAmount.HeaderText = "差分"; |
577 | 587 |
this.CarryAmount.Name = "CarryAmount"; |
578 | 588 |
this.CarryAmount.ReadOnly = true; |
... | ... | |
638 | 648 |
// |
639 | 649 |
// PersonName |
640 | 650 |
// |
641 |
dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
642 |
this.PersonName.DefaultCellStyle = dataGridViewCellStyle31;
|
|
651 |
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
652 |
this.PersonName.DefaultCellStyle = dataGridViewCellStyle15;
|
|
643 | 653 |
this.PersonName.HeaderText = "確認"; |
644 | 654 |
this.PersonName.Name = "PersonName"; |
645 | 655 |
this.PersonName.ReadOnly = true; |
... | ... | |
649 | 659 |
// |
650 | 660 |
// NoteDD |
651 | 661 |
// |
652 |
dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
653 |
this.NoteDD.DefaultCellStyle = dataGridViewCellStyle32;
|
|
662 |
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
663 |
this.NoteDD.DefaultCellStyle = dataGridViewCellStyle16;
|
|
654 | 664 |
this.NoteDD.HeaderText = "備考"; |
655 | 665 |
this.NoteDD.Name = "NoteDD"; |
656 | 666 |
this.NoteDD.ReadOnly = true; |
... | ... | |
713 | 723 |
private System.Windows.Forms.DataGridViewTextBoxColumn OrderersDivision; |
714 | 724 |
private System.Windows.Forms.DataGridViewTextBoxColumn OrderersCode; |
715 | 725 |
private System.Windows.Forms.DataGridViewTextBoxColumn OrderersName; |
726 |
private System.Windows.Forms.DataGridViewTextBoxColumn BillingCateLbl; |
|
716 | 727 |
private System.Windows.Forms.DataGridViewTextBoxColumn ConstructionCode; |
717 | 728 |
private System.Windows.Forms.DataGridViewTextBoxColumn ConstructionName; |
718 | 729 |
private System.Windows.Forms.DataGridViewTextBoxColumn BillPrice; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs | ||
---|---|---|
50 | 50 |
{ |
51 | 51 |
// 請求書データ(自動入力) |
52 | 52 |
KB = 0, // ■KB |
53 |
No, // No. |
|
53 |
No, // No.
|
|
54 | 54 |
RequestMonth, // ■請求月 |
55 | 55 |
RequestNo, // ■請求書No. |
56 | 56 |
OrderersDivision, // ■発注者区分 |
57 | 57 |
OrderersCode, // ■発注者コード |
58 | 58 |
OrderersName, // 請求先名・請求日 |
59 |
BillingCate, // 請求区分 |
|
59 | 60 |
ConstructionCode, // ■工事番号 |
60 | 61 |
ConstructionName, // 現場名 |
61 | 62 |
BillPrice, // 請求金額 (税抜) |
... | ... | |
138 | 139 |
ConstructionPersonCode, // ■工事担当者 |
139 | 140 |
ConstrSubPersonCode, // ■工事副担当 |
140 | 141 |
ConstructionInstructor, // ■指導員 |
142 |
BillingSpritFlg, // 請求区分 |
|
141 | 143 |
PersonName, // 担当者名 |
142 | 144 |
DepartmentCode, // ■部署コード |
143 | 145 |
} |
144 | 146 |
#endregion |
145 | 147 |
|
146 |
#region 分割フラグ項目 |
|
147 |
/// <summary> |
|
148 |
/// 分割フラグ項目 |
|
149 |
/// </summary> |
|
150 |
private enum BillingSplitFlg |
|
151 |
{ |
|
152 |
/// <summary> |
|
153 |
/// 0:一括請求 |
|
154 |
/// </summary> |
|
155 |
AllOnBilling = 0, |
|
156 |
/// <summary> |
|
157 |
/// 1:分割請求 |
|
158 |
/// </summary> |
|
159 |
SplitBilling, |
|
160 |
/// <summary> |
|
161 |
/// 2:全部表示用項目 |
|
162 |
/// </summary> |
|
163 |
DisplayAll, |
|
164 |
} |
|
165 |
#endregion |
|
166 |
|
|
167 | 148 |
#region 入金確認行区分 |
168 | 149 |
/// <summary> |
169 | 150 |
/// 入金確認行区分 |
... | ... | |
235 | 216 |
public int OrderersDivision; |
236 | 217 |
public int OrderersCode; |
237 | 218 |
public string OrderersName; |
219 |
public int BillingCategoryLabel; |
|
238 | 220 |
public List<Deposit> Deposits = new List<Deposit>(); |
239 | 221 |
public List<Deposit> VisibleDeposits |
240 | 222 |
{ |
... | ... | |
388 | 370 |
/// エラー行 |
389 | 371 |
/// </summary> |
390 | 372 |
private List<int> m_lstErrorRow = new List<int>(); |
391 |
|
|
392 |
/// <summary> |
|
393 |
/// 分割フラグ |
|
394 |
/// </summary> |
|
395 |
private int m_ExecuteFlg = (int)BillingSplitFlg.DisplayAll; |
|
396 |
|
|
397 |
/// <summary> |
|
398 |
/// 分割フラグ |
|
399 |
/// </summary> |
|
400 |
public int ExecuteFlg |
|
401 |
{ |
|
402 |
get { return m_ExecuteFlg; } |
|
403 |
set { m_ExecuteFlg = value; } |
|
404 |
} |
|
405 | 373 |
#endregion |
406 | 374 |
|
407 | 375 |
#region コンストラクタ |
... | ... | |
466 | 434 |
{ |
467 | 435 |
DepositBtn.Visible = false; |
468 | 436 |
} |
469 |
|
|
470 |
//タイトル部分に分割か一括かの表示 |
|
471 |
var strSubTitle = ""; |
|
472 |
if (m_ExecuteFlg == (int)BillingSplitFlg.SplitBilling) |
|
473 |
{ |
|
474 |
strSubTitle = " (出来高)"; |
|
475 |
lblTitle.Text = lblTitle.Text + strSubTitle; |
|
476 |
} |
|
477 |
else if (m_ExecuteFlg == (int)BillingSplitFlg.AllOnBilling) |
|
478 |
{ |
|
479 |
// 処理名称表示 |
|
480 |
strSubTitle = " (完了後)"; |
|
481 |
lblTitle.Text = lblTitle.Text + strSubTitle; |
|
482 |
} |
|
483 | 437 |
} |
484 | 438 |
catch (Exception ex) |
485 | 439 |
{ |
... | ... | |
487 | 441 |
} |
488 | 442 |
finally |
489 | 443 |
{ |
490 |
//dgvMaster.CellDoubleClick += DataGridView_DoubleCellClick; |
|
491 |
//dgvMaster.CellEnter += DataGridView_CellEnter; |
|
492 |
//dgvMaster.CellValueChanged += DataGridView_CellValueChanged; |
|
493 |
|
|
494 | 444 |
IoDd.close(); |
495 | 445 |
IoDd = null; |
496 | 446 |
} |
... | ... | |
861 | 811 |
var headerIndex = DetectHeaderIndex(e.RowIndex); |
862 | 812 |
UpdateDepositOrdererRows(depositOrderer, headerIndex); |
863 | 813 |
} |
864 |
else if (CommonMotions.cnvInt(dgvMaster[(int)DispColumn.ConfirmationEndFlg, e.RowIndex].Value) == 1) |
|
814 |
else if (CommonMotions.cnvInt(dgvMaster[(int)DispColumn.ConfirmationEndFlg, e.RowIndex].Value) == 1 && m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority)
|
|
865 | 815 |
{ |
866 | 816 |
if (MessageBox.Show("担当者確認を外しますか?", "担当者確認", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) |
867 | 817 |
{ |
... | ... | |
1242 | 1192 |
o.OrderersCode = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersCode]); |
1243 | 1193 |
o.OrderersDivision = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersDivision]); |
1244 | 1194 |
o.OrderersName = CommonMotions.cnvString(invoice[(int)GetDataFirst.OrderersName]); |
1245 |
|
|
1195 |
o.BillingCategoryLabel = CommonMotions.cnvInt(invoice[(int)GetDataFirst.BillingSpritFlg]); |
|
1246 | 1196 |
if (o.KB == (int)paymentLineClass.detailLine) |
1247 | 1197 |
{ |
1248 | 1198 |
o.No = no; |
... | ... | |
1414 | 1364 |
sql.Append(" , NULL AS CONSTRUCTIONPERSONCODEAS "); |
1415 | 1365 |
sql.Append(" , NULL AS CONSTRSUBPERSONCODEAS "); |
1416 | 1366 |
sql.Append(" , NULL AS CONSTRUCTIONINSTRUCTORAS "); |
1367 |
sql.Append(" , NULL AS BILLINGSPLITFLG "); |
|
1417 | 1368 |
sql.Append(" , NULL AS PERSONNAME "); |
1418 | 1369 |
sql.Append(" , NULL AS DEPARTMENTCODE "); |
1419 | 1370 |
sql.Append(" FROM "); |
... | ... | |
1425 | 1376 |
sql.Append(" ON H.REQCONSTRUCTIONCODE = CBI.CONSTRUCTIONCODE "); |
1426 | 1377 |
sql.Append(" WHERE "); |
1427 | 1378 |
sql.AppendFormat(" H.REQUESTMONTH = {0} ",m_Select_TargetDate); |
1428 |
if (m_ExecuteFlg == (int)BillingSplitFlg.AllOnBilling || m_ExecuteFlg == (int)BillingSplitFlg.SplitBilling) |
|
1429 |
{ |
|
1430 |
sql.AppendFormat(" AND CBI.BILLINGSPLITFLG = {0} ", m_ExecuteFlg); |
|
1431 |
} |
|
1432 | 1379 |
sql.Append(" ) "); |
1433 | 1380 |
sql.Append(" UNION ( "); |
1434 | 1381 |
sql.Append(" SELECT "); |
... | ... | |
1465 | 1412 |
sql.Append(" , CBI.CONSTRUCTIONPERSONCODE "); |
1466 | 1413 |
sql.Append(" , CBI.CONSTRSUBPERSONCODE "); |
1467 | 1414 |
sql.Append(" , CBI.CONSTRUCTIONINSTRUCTOR "); |
1415 |
sql.Append(" , CBI.BILLINGSPLITFLG "); |
|
1468 | 1416 |
sql.Append(" , PICM.SEALPRINTNAME AS PERSONNAME "); |
1469 | 1417 |
sql.Append(" , PICM.DEPARTMENTCODE "); |
1470 | 1418 |
sql.Append(" FROM "); |
... | ... | |
1484 | 1432 |
sql.Append(" ON CBI.CONSTRUCTIONPERSONCODE = PICM.PERSONCODE "); |
1485 | 1433 |
sql.Append(" WHERE "); |
1486 | 1434 |
sql.AppendFormat(" I.REQUESTMONTH = {0} ", m_Select_TargetDate); |
1487 |
if(m_ExecuteFlg == (int)BillingSplitFlg.AllOnBilling || m_ExecuteFlg == (int)BillingSplitFlg.SplitBilling) |
|
1488 |
{ |
|
1489 |
sql.AppendFormat(" AND CBI.BILLINGSPLITFLG = {0} ", m_ExecuteFlg); |
|
1490 |
} |
|
1491 | 1435 |
sql.Append(" ) "); |
1492 | 1436 |
sql.Append(" ORDER BY "); |
1493 | 1437 |
sql.Append(" ORDERERSDIVISION "); |
... | ... | |
1589 | 1533 |
sql.AppendFormat(" H.ORDERERSDIVISION = {0} ", orderersDiv); |
1590 | 1534 |
sql.AppendFormat(" AND H.ORDERERSCODE = {0} ", orderersCd); |
1591 | 1535 |
sql.AppendFormat(" AND H.REQUESTMONTH = {0} ", targetDate); |
1592 |
if(m_ExecuteFlg == (int)BillingSplitFlg.AllOnBilling || m_ExecuteFlg == (int)BillingSplitFlg.SplitBilling) |
|
1593 |
{ |
|
1594 |
sql.AppendFormat(" AND CBI.BILLINGSPLITFLG = {0} ", m_ExecuteFlg); |
|
1595 |
} |
|
1596 | 1536 |
} |
1597 | 1537 |
else if(tgl == 2) |
1598 | 1538 |
{ |
... | ... | |
1731 | 1671 |
ordererRow.Cells[(int)DispColumn.OrderersDivision].Value = depositOrderer.OrderersDivision; |
1732 | 1672 |
ordererRow.Cells[(int)DispColumn.OrderersCode].Value = depositOrderer.OrderersCode; |
1733 | 1673 |
ordererRow.Cells[(int)DispColumn.OrderersName].Value = depositOrderer.OrderersName; |
1674 |
ordererRow.Cells[(int)DispColumn.BillingCate].Style.BackColor = Color.Gainsboro; |
|
1734 | 1675 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.Gainsboro; |
1735 | 1676 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.Gainsboro; |
1736 | 1677 |
|
... | ... | |
1816 | 1757 |
// 入金合計と請求合計の差異があった場合は色を変更する |
1817 | 1758 |
long depositAmount = SumDepositAmountCash + SumDepositAmountBill; |
1818 | 1759 |
long requestAmount = SumRequestBill + SumRequestTax; |
1819 |
if (requestAmount != depositAmount) |
|
1760 |
if (requestAmount != depositAmount && depositAmount != 0)
|
|
1820 | 1761 |
{ |
1821 | 1762 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.Yellow; |
1822 | 1763 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.ForeColor = Color.Red; |
... | ... | |
1861 | 1802 |
ordererRow.Cells[(int)DispColumn.RequestMonth].Style.BackColor = Color.LightGoldenrodYellow; |
1862 | 1803 |
ordererRow.Cells[(int)DispColumn.OrderersName].Style.BackColor = Color.LightGoldenrodYellow; |
1863 | 1804 |
|
1805 |
ordererRow.Cells[(int)DispColumn.BillingCate].Style.BackColor = Color.LightGoldenrodYellow; |
|
1806 |
|
|
1864 | 1807 |
ordererRow.Cells[(int)DispColumn.ConstructionCode].Style.BackColor = Color.LightGoldenrodYellow; |
1865 | 1808 |
ordererRow.Cells[(int)DispColumn.RequestNo].Style.BackColor = Color.LightGoldenrodYellow; |
1866 | 1809 |
ordererRow.Cells[(int)DispColumn.ConstructionName].Style.BackColor = Color.LightGoldenrodYellow; |
... | ... | |
1930 | 1873 |
ordererRow.Cells[(int)DispColumn.No].Style.BackColor = Color.White; |
1931 | 1874 |
ordererRow.Cells[(int)DispColumn.RequestMonth].Style.BackColor = Color.White; |
1932 | 1875 |
ordererRow.Cells[(int)DispColumn.OrderersName].Style.BackColor = Color.White; |
1876 |
ordererRow.Cells[(int)DispColumn.BillingCate].Style.BackColor = Color.White; |
|
1933 | 1877 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.White; |
1934 | 1878 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.White; |
1935 | 1879 |
ordererRow.Cells[(int)DispColumn.ConstructionCode].Style.BackColor = Color.White; |
... | ... | |
1981 | 1925 |
ordererRow.Cells[(int)DispColumn.No].Value = depositOrderer.No; |
1982 | 1926 |
ordererRow.Cells[(int)DispColumn.RequestMonth].Value = depositOrderer.RequestMonth; |
1983 | 1927 |
ordererRow.Cells[(int)DispColumn.OrderersDivision].Value = depositOrderer.OrderersDivision; |
1984 |
ordererRow.Cells[(int)DispColumn.OrderersCode].Value = depositOrderer.OrderersCode; |
|
1985 |
|
|
1928 |
if (depositOrderer.BillingCategoryLabel == 0) |
|
1929 |
{ |
|
1930 |
ordererRow.Cells[(int)DispColumn.BillingCate].Value = "完了後一括"; |
|
1931 |
} |
|
1932 |
else |
|
1933 |
{ |
|
1934 |
ordererRow.Cells[(int)DispColumn.BillingCate].Value = "出来高分割"; |
|
1935 |
ordererRow.Cells[(int)DispColumn.BillingCate].Style.ForeColor = Color.Red; |
|
1936 |
} |
|
1986 | 1937 |
ordererRow.Cells[(int)DispColumn.No].Style.BackColor = Color.FromArgb(192, 255, 192); |
1987 | 1938 |
ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.PeachPuff; |
1988 | 1939 |
ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.PeachPuff; |
1989 |
|
|
1940 |
ordererRow.Cells[(int)DispColumn.BillingCate].Style.BackColor = Color.FromArgb(192, 255, 192); |
|
1990 | 1941 |
index = 0; |
1991 | 1942 |
foreach (var depositDetail in depositOrderer.VisibleDepositDetails) |
1992 | 1943 |
{ |
... | ... | |
2288 | 2239 |
-1, // ■発注者区分 |
2289 | 2240 |
-1, // ■発注先コード |
2290 | 2241 |
0, // 請求先名・請求日 |
2242 |
0, // 請求区分 |
|
2291 | 2243 |
-1, // ■工事番号 |
2292 | 2244 |
0, // 現場名 |
2293 | 2245 |
0, // 請求金額 (税抜) |
... | ... | |
2420 | 2372 |
} |
2421 | 2373 |
// 自分の担当の場合は表示 |
2422 | 2374 |
else if(CommonMotions.LoginUserData.PersonCode == SalesPersonCodeData || |
2423 |
CommonMotions.LoginUserData.PersonCode == SalesSubPersonCodeData || |
|
2424 |
CommonMotions.LoginUserData.PersonCode == ConstructionPersonCodeData || |
|
2425 |
CommonMotions.LoginUserData.PersonCode == ConstrSubPersonCodeData || |
|
2426 |
CommonMotions.LoginUserData.PersonCode == ConstructionInstructorData) |
|
2375 |
CommonMotions.LoginUserData.PersonCode == SalesSubPersonCodeData ||
|
|
2376 |
CommonMotions.LoginUserData.PersonCode == ConstructionPersonCodeData ||
|
|
2377 |
CommonMotions.LoginUserData.PersonCode == ConstrSubPersonCodeData ||
|
|
2378 |
CommonMotions.LoginUserData.PersonCode == ConstructionInstructorData)
|
|
2427 | 2379 |
{ |
2428 | 2380 |
return true; |
2429 | 2381 |
} |
... | ... | |
2492 | 2444 |
sql.AppendFormat(" H.REQUESTMONTH = {0} ", depositOrderer.RequestMonth); |
2493 | 2445 |
sql.AppendFormat(" AND H.ORDERERSDIVISION = {0} ", depositOrderer.OrderersDivision); |
2494 | 2446 |
sql.AppendFormat(" AND H.ORDERERSCODE = {0} ", depositOrderer.OrderersCode); |
2495 |
if (m_ExecuteFlg == (int)BillingSplitFlg.AllOnBilling || m_ExecuteFlg == (int)BillingSplitFlg.SplitBilling) |
|
2496 |
{ |
|
2497 |
sql.AppendFormat(" AND CBI.BILLINGSPLITFLG = {0}; ", m_ExecuteFlg); |
|
2498 |
} |
|
2499 | 2447 |
if (!ioRH.ExecuteReader(sql.ToString(), ref data)) |
2500 | 2448 |
{ |
2501 | 2449 |
return false; |
... | ... | |
2550 | 2498 |
} |
2551 | 2499 |
// 自分の担当の場合は表示 |
2552 | 2500 |
else if (CommonMotions.LoginUserData.PersonCode == SalesPersonCodeData || |
2553 |
CommonMotions.LoginUserData.PersonCode == SalesSubPersonCodeData || |
|
2554 |
CommonMotions.LoginUserData.PersonCode == ConstructionPersonCodeData || |
|
2555 |
CommonMotions.LoginUserData.PersonCode == ConstrSubPersonCodeData || |
|
2556 |
CommonMotions.LoginUserData.PersonCode == ConstructionInstructorData) |
|
2501 |
CommonMotions.LoginUserData.PersonCode == SalesSubPersonCodeData ||
|
|
2502 |
CommonMotions.LoginUserData.PersonCode == ConstructionPersonCodeData ||
|
|
2503 |
CommonMotions.LoginUserData.PersonCode == ConstrSubPersonCodeData ||
|
|
2504 |
CommonMotions.LoginUserData.PersonCode == ConstructionInstructorData)
|
|
2557 | 2505 |
{ |
2558 | 2506 |
return true; |
2559 | 2507 |
} |
... | ... | |
2744 | 2692 |
} |
2745 | 2693 |
|
2746 | 2694 |
if ((tcol == (int)DispColumn.DepositAmount) || // 入金金額(税抜) |
2747 |
(tcol == (int)DispColumn.TaxAmount) || // 入金金額(消費税) |
|
2695 |
(tcol == (int)DispColumn.TaxAmount) || // 入金金額(消費税)
|
|
2748 | 2696 |
(tcol == (int)DispColumn.DiscountAmount) || // 値引金額 |
2749 | 2697 |
(tcol == (int)DispColumn.CnstrPrice) || // 協力金 |
2750 | 2698 |
(tcol == (int)DispColumn.Fees) || // 手数料 |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.resx | ||
---|---|---|
138 | 138 |
<metadata name="OrderersName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
139 | 139 |
<value>True</value> |
140 | 140 |
</metadata> |
141 |
<metadata name="BillingCateLbl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
142 |
<value>True</value> |
|
143 |
</metadata> |
|
141 | 144 |
<metadata name="ConstructionCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
142 | 145 |
<value>True</value> |
143 | 146 |
</metadata> |
他の形式にエクスポート: Unified diff