リビジョン 399
取引先入金確認の出来高と完了後で分ける処理を実装
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 |
} |
|
2240 | 2244 |
// フォーム表示 |
2241 | 2245 |
frm.ShowDialog(); |
2242 | 2246 |
} |
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 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 |
this.label3 = new System.Windows.Forms.Label();
|
|
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();
|
|
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(); |
50 | 50 |
this.label5 = new System.Windows.Forms.Label(); |
... | ... | |
95 | 95 |
((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit(); |
96 | 96 |
this.SuspendLayout(); |
97 | 97 |
// |
98 |
// label3
|
|
98 |
// lblTitle
|
|
99 | 99 |
// |
100 |
this.label3.Anchor = System.Windows.Forms.AnchorStyles.Top;
|
|
101 |
this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
|
102 |
this.label3.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
103 |
this.label3.Location = new System.Drawing.Point(414, 10);
|
|
104 |
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
105 |
this.label3.Name = "label3";
|
|
106 |
this.label3.Size = new System.Drawing.Size(500, 20);
|
|
107 |
this.label3.TabIndex = 0;
|
|
108 |
this.label3.Text = "入 金 確 認";
|
|
109 |
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
|
100 |
this.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top;
|
|
101 |
this.lblTitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
|
102 |
this.lblTitle.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
103 |
this.lblTitle.Location = new System.Drawing.Point(414, 10);
|
|
104 |
this.lblTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
105 |
this.lblTitle.Name = "lblTitle";
|
|
106 |
this.lblTitle.Size = new System.Drawing.Size(500, 20);
|
|
107 |
this.lblTitle.TabIndex = 0;
|
|
108 |
this.lblTitle.Text = "入 金 確 認";
|
|
109 |
this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
|
110 | 110 |
// |
111 | 111 |
// panel1 |
112 | 112 |
// |
... | ... | |
316 | 316 |
| System.Windows.Forms.AnchorStyles.Left) |
317 | 317 |
| System.Windows.Forms.AnchorStyles.Right))); |
318 | 318 |
this.dgvMaster.BackgroundColor = System.Drawing.Color.White; |
319 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
320 |
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; |
|
321 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
322 |
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; |
|
323 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; |
|
324 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; |
|
325 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; |
|
326 |
this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; |
|
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;
|
|
327 | 327 |
this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; |
328 | 328 |
this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
329 | 329 |
this.KB, |
... | ... | |
371 | 371 |
// |
372 | 372 |
// KB |
373 | 373 |
// |
374 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
375 |
this.KB.DefaultCellStyle = dataGridViewCellStyle2;
|
|
374 |
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
375 |
this.KB.DefaultCellStyle = dataGridViewCellStyle18;
|
|
376 | 376 |
this.KB.HeaderText = "行区分"; |
377 | 377 |
this.KB.Name = "KB"; |
378 | 378 |
this.KB.ReadOnly = true; |
... | ... | |
382 | 382 |
// |
383 | 383 |
// No |
384 | 384 |
// |
385 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
386 |
this.No.DefaultCellStyle = dataGridViewCellStyle3;
|
|
385 |
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
386 |
this.No.DefaultCellStyle = dataGridViewCellStyle19;
|
|
387 | 387 |
this.No.HeaderText = "No."; |
388 | 388 |
this.No.Name = "No"; |
389 | 389 |
this.No.ReadOnly = true; |
... | ... | |
452 | 452 |
// |
453 | 453 |
// BillPrice |
454 | 454 |
// |
455 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
456 |
this.BillPrice.DefaultCellStyle = dataGridViewCellStyle4;
|
|
455 |
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
456 |
this.BillPrice.DefaultCellStyle = dataGridViewCellStyle20;
|
|
457 | 457 |
this.BillPrice.HeaderText = "請求金額\r\n(税抜)"; |
458 | 458 |
this.BillPrice.Name = "BillPrice"; |
459 | 459 |
this.BillPrice.ReadOnly = true; |
... | ... | |
463 | 463 |
// |
464 | 464 |
// TaxPrice |
465 | 465 |
// |
466 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
467 |
this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle5;
|
|
466 |
dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
467 |
this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle21;
|
|
468 | 468 |
this.TaxPrice.HeaderText = "請求金額\r\n(消費税)"; |
469 | 469 |
this.TaxPrice.Name = "TaxPrice"; |
470 | 470 |
this.TaxPrice.ReadOnly = true; |
... | ... | |
474 | 474 |
// |
475 | 475 |
// DepositAmountCash |
476 | 476 |
// |
477 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
478 |
this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle6;
|
|
477 |
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
478 |
this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle22;
|
|
479 | 479 |
this.DepositAmountCash.HeaderText = "入金金額\r\n(振込)"; |
480 | 480 |
this.DepositAmountCash.Name = "DepositAmountCash"; |
481 | 481 |
this.DepositAmountCash.ReadOnly = true; |
... | ... | |
485 | 485 |
// |
486 | 486 |
// DepositAmountBill |
487 | 487 |
// |
488 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
489 |
this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle7;
|
|
488 |
dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
489 |
this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle23;
|
|
490 | 490 |
this.DepositAmountBill.HeaderText = "入金金額\r\n(手形)"; |
491 | 491 |
this.DepositAmountBill.Name = "DepositAmountBill"; |
492 | 492 |
this.DepositAmountBill.ReadOnly = true; |
... | ... | |
505 | 505 |
// |
506 | 506 |
// DepositAmount |
507 | 507 |
// |
508 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
509 |
this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle8;
|
|
508 |
dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
509 |
this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle24;
|
|
510 | 510 |
this.DepositAmount.HeaderText = "入金金額\r\n(税抜)"; |
511 | 511 |
this.DepositAmount.Name = "DepositAmount"; |
512 | 512 |
this.DepositAmount.ReadOnly = true; |
... | ... | |
516 | 516 |
// |
517 | 517 |
// TaxAmount |
518 | 518 |
// |
519 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
520 |
this.TaxAmount.DefaultCellStyle = dataGridViewCellStyle9;
|
|
519 |
dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
520 |
this.TaxAmount.DefaultCellStyle = dataGridViewCellStyle25;
|
|
521 | 521 |
this.TaxAmount.HeaderText = "入金金額\r\n(消費税)"; |
522 | 522 |
this.TaxAmount.Name = "TaxAmount"; |
523 | 523 |
this.TaxAmount.ReadOnly = true; |
... | ... | |
527 | 527 |
// |
528 | 528 |
// DiscountAmount |
529 | 529 |
// |
530 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
531 |
this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle10;
|
|
530 |
dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
531 |
this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle26;
|
|
532 | 532 |
this.DiscountAmount.HeaderText = "値引金額"; |
533 | 533 |
this.DiscountAmount.Name = "DiscountAmount"; |
534 | 534 |
this.DiscountAmount.ReadOnly = true; |
... | ... | |
538 | 538 |
// |
539 | 539 |
// CnstrPrice |
540 | 540 |
// |
541 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
542 |
this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle11;
|
|
541 |
dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
542 |
this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle27;
|
|
543 | 543 |
this.CnstrPrice.HeaderText = "協力金"; |
544 | 544 |
this.CnstrPrice.Name = "CnstrPrice"; |
545 | 545 |
this.CnstrPrice.ReadOnly = true; |
... | ... | |
549 | 549 |
// |
550 | 550 |
// Fees |
551 | 551 |
// |
552 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
553 |
this.Fees.DefaultCellStyle = dataGridViewCellStyle12;
|
|
552 |
dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
553 |
this.Fees.DefaultCellStyle = dataGridViewCellStyle28;
|
|
554 | 554 |
this.Fees.HeaderText = "手数料"; |
555 | 555 |
this.Fees.Name = "Fees"; |
556 | 556 |
this.Fees.ReadOnly = true; |
... | ... | |
560 | 560 |
// |
561 | 561 |
// OtherAdjustments |
562 | 562 |
// |
563 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
564 |
this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle13;
|
|
563 |
dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
564 |
this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle29;
|
|
565 | 565 |
this.OtherAdjustments.HeaderText = "送料"; |
566 | 566 |
this.OtherAdjustments.Name = "OtherAdjustments"; |
567 | 567 |
this.OtherAdjustments.ReadOnly = true; |
... | ... | |
571 | 571 |
// |
572 | 572 |
// CarryAmount |
573 | 573 |
// |
574 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
575 |
this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle14;
|
|
574 |
dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
575 |
this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle30;
|
|
576 | 576 |
this.CarryAmount.HeaderText = "差分"; |
577 | 577 |
this.CarryAmount.Name = "CarryAmount"; |
578 | 578 |
this.CarryAmount.ReadOnly = true; |
... | ... | |
638 | 638 |
// |
639 | 639 |
// PersonName |
640 | 640 |
// |
641 |
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
642 |
this.PersonName.DefaultCellStyle = dataGridViewCellStyle15;
|
|
641 |
dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
642 |
this.PersonName.DefaultCellStyle = dataGridViewCellStyle31;
|
|
643 | 643 |
this.PersonName.HeaderText = "確認"; |
644 | 644 |
this.PersonName.Name = "PersonName"; |
645 | 645 |
this.PersonName.ReadOnly = true; |
... | ... | |
649 | 649 |
// |
650 | 650 |
// NoteDD |
651 | 651 |
// |
652 |
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
653 |
this.NoteDD.DefaultCellStyle = dataGridViewCellStyle16;
|
|
652 |
dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
653 |
this.NoteDD.DefaultCellStyle = dataGridViewCellStyle32;
|
|
654 | 654 |
this.NoteDD.HeaderText = "備考"; |
655 | 655 |
this.NoteDD.Name = "NoteDD"; |
656 | 656 |
this.NoteDD.ReadOnly = true; |
... | ... | |
670 | 670 |
this.Controls.Add(this.button1); |
671 | 671 |
this.Controls.Add(this.dgvMaster); |
672 | 672 |
this.Controls.Add(this.panel1); |
673 |
this.Controls.Add(this.label3);
|
|
673 |
this.Controls.Add(this.lblTitle);
|
|
674 | 674 |
this.Controls.Add(this.btnShow); |
675 | 675 |
this.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
676 | 676 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; |
... | ... | |
689 | 689 |
|
690 | 690 |
#endregion |
691 | 691 |
|
692 |
private System.Windows.Forms.Label label3;
|
|
692 |
private System.Windows.Forms.Label lblTitle;
|
|
693 | 693 |
private System.Windows.Forms.Panel panel1; |
694 | 694 |
private System.Windows.Forms.Button btnShow; |
695 | 695 |
private System.Windows.Forms.ComboBox cbTargetMonth; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs | ||
---|---|---|
143 | 143 |
} |
144 | 144 |
#endregion |
145 | 145 |
|
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 |
#region 入金確認行区分 |
|
168 |
/// <summary> |
|
169 |
/// 入金確認行区分 |
|
170 |
/// </summary> |
|
171 |
private enum paymentLineClass |
|
172 |
{ |
|
173 |
/// <summary> |
|
174 |
/// 1:請求先名行 |
|
175 |
/// </summary> |
|
176 |
ordererLine = 1, |
|
177 |
/// <summary> |
|
178 |
/// 2:明細行 |
|
179 |
/// </summary> |
|
180 |
detailLine, |
|
181 |
/// <summary> |
|
182 |
/// 3:合計行 |
|
183 |
/// </summary> |
|
184 |
sumLine, |
|
185 |
/// <summary> |
|
186 |
/// 4:空行 |
|
187 |
/// </summary> |
|
188 |
EmptyLine, |
|
189 |
} |
|
190 |
#endregion |
|
191 |
|
|
146 | 192 |
#region 金額最大最小値 |
147 | 193 |
private const long amount_max = 9999999999; // 金額最大 |
148 | 194 |
private const long amount_min = -9999999999; // 金額最小 |
... | ... | |
343 | 389 |
/// </summary> |
344 | 390 |
private List<int> m_lstErrorRow = new List<int>(); |
345 | 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 |
} |
|
346 | 405 |
#endregion |
347 | 406 |
|
348 | 407 |
#region コンストラクタ |
... | ... | |
398 | 457 |
DisplayData(); |
399 | 458 |
|
400 | 459 |
// 入金入力ができる権限以外は入金入力ボタンを非表示 |
401 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision ||
|
|
460 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep ||
|
|
402 | 461 |
m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority) |
403 | 462 |
{ |
404 | 463 |
DepositBtn.Visible = true; |
... | ... | |
407 | 466 |
{ |
408 | 467 |
DepositBtn.Visible = false; |
409 | 468 |
} |
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 |
} |
|
410 | 483 |
} |
411 | 484 |
catch (Exception ex) |
412 | 485 |
{ |
... | ... | |
554 | 627 |
} |
555 | 628 |
|
556 | 629 |
// 入金入力画面の表示 |
557 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision ||
|
|
630 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep ||
|
|
558 | 631 |
m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority) |
559 | 632 |
{ |
560 | 633 |
if (isDirty && MessageBox.Show("データに変更があります、登録せずに入金入力を行いますか?", "終了確認", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) |
... | ... | |
731 | 804 |
if (e.ColumnIndex == (int)DispColumn.DepositAmountBill |
732 | 805 |
|| e.ColumnIndex == (int)DispColumn.DepositAmountCash) |
733 | 806 |
{ |
734 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision ||
|
|
807 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep ||
|
|
735 | 808 |
m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority) |
736 | 809 |
{ |
737 | 810 |
if (isDirty && MessageBox.Show("データに変更があります、登録せずに入金入力を行いますか?", "終了確認", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) |
... | ... | |
1139 | 1212 |
var data = new List<DepositOrderer>(); |
1140 | 1213 |
var no = 1; |
1141 | 1214 |
|
1142 |
bool sumDataBool = false; |
|
1143 |
bool lastSumDataCheck = false; |
|
1144 | 1215 |
int invoiceDataCount = invoiceData.Count(); |
1216 |
var oOrdererLineList = new DepositOrderer(); |
|
1217 |
|
|
1218 |
var invoiceDataList = new List<DepositOrderer>(); |
|
1219 |
bool ordererLineFlg = false; |
|
1220 |
bool sumEmpLineFlg = false; |
|
1221 |
|
|
1145 | 1222 |
int dataCount = 0; |
1146 | 1223 |
var oSumV = new DepositOrderer(); |
1147 | 1224 |
var oEmpty = new DepositOrderer(); |
1148 | 1225 |
|
1149 | 1226 |
foreach (var invoice in invoiceData) |
1150 | 1227 |
{ |
1151 |
// 最終行確認用 |
|
1228 |
var o = new DepositOrderer(); |
|
1229 |
o.KB = CommonMotions.cnvInt(invoice[(int)GetDataFirst.KB]); |
|
1230 |
invoiceDataList.Add(o); |
|
1231 |
} |
|
1232 |
|
|
1233 |
foreach (var invoice in invoiceData) |
|
1234 |
{ |
|
1235 |
//最終行判定用カウント |
|
1152 | 1236 |
dataCount = dataCount + 1; |
1153 | 1237 |
|
1154 | 1238 |
// 請求先情報 |
... | ... | |
1159 | 1243 |
o.OrderersDivision = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersDivision]); |
1160 | 1244 |
o.OrderersName = CommonMotions.cnvString(invoice[(int)GetDataFirst.OrderersName]); |
1161 | 1245 |
|
1162 |
if (o.KB == 1)
|
|
1246 |
if (o.KB == (int)paymentLineClass.detailLine)
|
|
1163 | 1247 |
{ |
1164 |
// 最終行ではない場合は合計行と空行を挿入する |
|
1165 |
if (invoiceDataCount != dataCount) |
|
1166 |
{ |
|
1167 |
if (sumDataBool == true) |
|
1168 |
{ |
|
1169 |
// 合計行用のデータを追加 |
|
1170 |
data.Add(oSumV); |
|
1171 |
|
|
1172 |
// 空行用のデータを追加 |
|
1173 |
data.Add(oEmpty); |
|
1174 |
|
|
1175 |
sumDataBool = false; |
|
1176 |
lastSumDataCheck = false; |
|
1177 |
} |
|
1178 |
} |
|
1179 |
o.No = 0; |
|
1180 |
} |
|
1181 |
else |
|
1182 |
{ |
|
1183 |
if (sumDataBool == false) |
|
1184 |
{ |
|
1185 |
//合計行用データの作成 |
|
1186 |
var oSum = new DepositOrderer(); |
|
1187 |
var dSum = new Deposit(); |
|
1188 |
|
|
1189 |
oSum.KB = 3; |
|
1190 |
oSum.RequestMonth = m_Select_TargetDate; |
|
1191 |
oSum.OrderersCode = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersCode]); |
|
1192 |
oSum.OrderersDivision = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersDivision]); |
|
1193 |
oSum.Deposits = new List<Deposit>(); |
|
1194 |
dSum.SeqNo = CommonMotions.cnvInt(invoice[(int)GetDataFirst.SeqNoD]); |
|
1195 |
dSum.DepositDate = CommonMotions.cnvString(invoice[(int)GetDataFirst.DepositDate]); |
|
1196 |
dSum.DepositAmountCash = CommonMotions.cnvLong(invoice[(int)GetDataFirst.DepositAmountCash]); |
|
1197 |
dSum.DepositAmountBill = CommonMotions.cnvLong(invoice[(int)GetDataFirst.DepositAmountBill]); |
|
1198 |
dSum.Note = CommonMotions.cnvString(invoice[(int)GetDataFirst.NoteD]); |
|
1199 |
oSum.Deposits.Add(dSum); |
|
1200 |
oSumV = oSum; |
|
1201 |
|
|
1202 |
//空行用のデータの作成 |
|
1203 |
var oEmp = new DepositOrderer(); |
|
1204 |
oEmpty.KB = 4; |
|
1205 |
oEmp.RequestMonth = m_Select_TargetDate; |
|
1206 |
oEmp.OrderersCode = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersCode]); |
|
1207 |
oEmp.OrderersDivision = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersDivision]); |
|
1208 |
oEmpty = oEmp; |
|
1209 |
sumDataBool = true; |
|
1210 |
lastSumDataCheck = true; |
|
1211 |
} |
|
1212 | 1248 |
o.No = no; |
1213 | 1249 |
no++; |
1214 | 1250 |
} |
1251 |
|
|
1215 | 1252 |
o.Deposits = new List<Deposit>(); |
1216 | 1253 |
o.DepositDetails = new List<DepositDetail>(); |
1217 | 1254 |
|
... | ... | |
1257 | 1294 |
dd.ConstrSubPersonCode = CommonMotions.cnvInt(invoice[(int)GetDataFirst.ConstrSubPersonCode]); |
1258 | 1295 |
dd.ConstructionInstructor = CommonMotions.cnvInt(invoice[(int)GetDataFirst.ConstructionInstructor]); |
1259 | 1296 |
|
1260 |
//dd.Visible = CheckPermission(dd.DepartmentCode, dd.ConstructionPersonCode, dd.ConstrSubPersonCode, dd.ConstructionInstructor); |
|
1261 | 1297 |
dd.Visible = true; |
1262 | 1298 |
dd.ConfirmationDate = ""; |
1263 | 1299 |
if (CommonMotions.cnvString(invoice[(int)GetDataFirst.ConfirmationDate]) != "0001-01-01") |
... | ... | |
1265 | 1301 |
|
1266 | 1302 |
o.DepositDetails.Add(dd); |
1267 | 1303 |
|
1268 |
data.Add(o); |
|
1304 |
if (CommonMotions.cnvInt(invoice[(int)GetDataFirst.KB]) == (int)paymentLineClass.ordererLine) |
|
1305 |
{ |
|
1306 |
oOrdererLineList = o; |
|
1307 |
ordererLineFlg = true; |
|
1269 | 1308 |
|
1270 |
// 最終行かつ最後の請求データに請求書データがない場合に合計行のみ追加する |
|
1271 |
if (lastSumDataCheck && invoiceDataCount == dataCount) |
|
1309 |
if (dataCount != invoiceDataCount && sumEmpLineFlg) |
|
1310 |
{ |
|
1311 |
//合計行の追加 |
|
1312 |
data.Add(oSumV); |
|
1313 |
|
|
1314 |
//空行の追加 |
|
1315 |
data.Add(oEmpty); |
|
1316 |
} |
|
1317 |
sumEmpLineFlg = false; |
|
1318 |
} |
|
1319 |
|
|
1320 |
else if (CommonMotions.cnvInt(invoice[(int)GetDataFirst.KB]) == (int)paymentLineClass.detailLine) |
|
1272 | 1321 |
{ |
1273 |
// 合計行用のデータを追加 |
|
1274 |
data.Add(oSumV); |
|
1322 |
// データの追加 |
|
1323 |
if (ordererLineFlg) |
|
1324 |
{ |
|
1325 |
data.Add(oOrdererLineList); |
|
1326 |
ordererLineFlg = false; |
|
1327 |
sumEmpLineFlg = true; |
|
1328 |
} |
|
1329 |
|
|
1330 |
data.Add(o); |
|
1331 |
|
|
1332 |
//合計行用データの作成 |
|
1333 |
var oSum = new DepositOrderer(); |
|
1334 |
var dSum = new Deposit(); |
|
1335 |
|
|
1336 |
oSum.KB = (int)paymentLineClass.sumLine; |
|
1337 |
oSum.RequestMonth = m_Select_TargetDate; |
|
1338 |
oSum.OrderersCode = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersCode]); |
|
1339 |
oSum.OrderersDivision = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersDivision]); |
|
1340 |
oSum.Deposits = new List<Deposit>(); |
|
1341 |
dSum.SeqNo = CommonMotions.cnvInt(invoice[(int)GetDataFirst.SeqNoD]); |
|
1342 |
dSum.DepositDate = CommonMotions.cnvString(invoice[(int)GetDataFirst.DepositDate]); |
|
1343 |
dSum.DepositAmountCash = CommonMotions.cnvLong(invoice[(int)GetDataFirst.DepositAmountCash]); |
|
1344 |
dSum.DepositAmountBill = CommonMotions.cnvLong(invoice[(int)GetDataFirst.DepositAmountBill]); |
|
1345 |
dSum.Note = CommonMotions.cnvString(invoice[(int)GetDataFirst.NoteD]); |
|
1346 |
oSum.Deposits.Add(dSum); |
|
1347 |
oSumV = oSum; |
|
1348 |
|
|
1349 |
//空行用のデータの作成 |
|
1350 |
var oEmp = new DepositOrderer(); |
|
1351 |
oEmp.KB = (int)paymentLineClass.EmptyLine; |
|
1352 |
oEmp.RequestMonth = m_Select_TargetDate; |
|
1353 |
oEmp.OrderersCode = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersCode]); |
|
1354 |
oEmp.OrderersDivision = CommonMotions.cnvInt(invoice[(int)GetDataFirst.OrderersDivision]); |
|
1355 |
oEmpty = oEmp; |
|
1356 |
|
|
1357 |
if (dataCount == invoiceDataCount) |
|
1358 |
{ |
|
1359 |
//合計行の追加 |
|
1360 |
data.Add(oSum); |
|
1361 |
//空行の追加 |
|
1362 |
data.Add(oEmp); |
|
1363 |
} |
|
1275 | 1364 |
} |
1276 | 1365 |
} |
1277 | 1366 |
return data; |
... | ... | |
1332 | 1421 |
sql.Append(" INNER JOIN ORDERERSMASTER AS O "); |
1333 | 1422 |
sql.Append(" ON O.ORDERERSCODE = H.ORDERERSCODE "); |
1334 | 1423 |
sql.Append(" AND O.ORDERCOTEGORY = H.ORDERERSDIVISION "); |
1424 |
sql.Append(" LEFT OUTER JOIN CONSTRUCTIONBASEINFO CBI "); |
|
1425 |
sql.Append(" ON H.REQCONSTRUCTIONCODE = CBI.CONSTRUCTIONCODE "); |
|
1335 | 1426 |
sql.Append(" WHERE "); |
1336 | 1427 |
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 |
} |
|
1337 | 1432 |
sql.Append(" ) "); |
1338 | 1433 |
sql.Append(" UNION ( "); |
1339 | 1434 |
sql.Append(" SELECT "); |
... | ... | |
1389 | 1484 |
sql.Append(" ON CBI.CONSTRUCTIONPERSONCODE = PICM.PERSONCODE "); |
1390 | 1485 |
sql.Append(" WHERE "); |
1391 | 1486 |
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 |
} |
|
1392 | 1491 |
sql.Append(" ) "); |
1393 | 1492 |
sql.Append(" ORDER BY "); |
1394 | 1493 |
sql.Append(" ORDERERSDIVISION "); |
... | ... | |
1482 | 1581 |
sql.Append(" REQUESTHEAD AS H "); |
1483 | 1582 |
sql.Append(" INNER JOIN INVOICEDATA AS I "); |
1484 | 1583 |
sql.Append(" ON I.INVOICENO = H.INVOICENO "); |
1584 |
sql.Append(" LEFT OUTER JOIN CONSTRUCTIONBASEINFO CBI "); |
|
1585 |
sql.Append(" ON H.REQCONSTRUCTIONCODE = CBI.CONSTRUCTIONCODE "); |
|
1485 | 1586 |
sql.Append(" WHERE "); |
1486 | 1587 |
if (tgl == 1) |
1487 | 1588 |
{ |
1488 | 1589 |
sql.AppendFormat(" H.ORDERERSDIVISION = {0} ", orderersDiv); |
1489 | 1590 |
sql.AppendFormat(" AND H.ORDERERSCODE = {0} ", orderersCd); |
1490 | 1591 |
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 |
} |
|
1491 | 1596 |
} |
1492 | 1597 |
else if(tgl == 2) |
1493 | 1598 |
{ |
... | ... | |
1535 | 1640 |
sql.Append(" , SUM(DIFFERENCEAMOUNT) "); |
1536 | 1641 |
sql.Append(" FROM "); |
1537 | 1642 |
sql.Append(" DEPOSITDATADETAIL "); |
1643 |
|
|
1538 | 1644 |
sql.Append(" WHERE "); |
1539 | 1645 |
sql.AppendFormat(" ORDERERSDIVISION = {0} ", orderersDiv); |
1540 | 1646 |
sql.AppendFormat(" AND ORDERERSCODE = {0} ", orderersCd); |
... | ... | |
1608 | 1714 |
var ordererRow = dgvMaster.Rows[position]; |
1609 | 1715 |
var index = 0; |
1610 | 1716 |
|
1611 |
if (depositOrderer.KB == 1)
|
|
1717 |
if (depositOrderer.KB == (int)paymentLineClass.ordererLine)
|
|
1612 | 1718 |
{ |
1613 | 1719 |
// 表示権限確認 |
1614 | 1720 |
var visibleCheck = CheckPermission(depositOrderer); |
... | ... | |
1671 | 1777 |
} |
1672 | 1778 |
} |
1673 | 1779 |
// 合計行の表示 |
1674 |
else if (depositOrderer.KB == 3)
|
|
1780 |
else if (depositOrderer.KB == (int)paymentLineClass.sumLine)
|
|
1675 | 1781 |
{ |
1676 | 1782 |
// 表示権限確認 |
1677 | 1783 |
var visibleCheck = CheckPermission(depositOrderer); |
... | ... | |
1810 | 1916 |
ordererRow.Cells[(int)DispColumn.NoteDD].Style.BackColor = Color.LightGoldenrodYellow; |
1811 | 1917 |
} |
1812 | 1918 |
// 空行を追加 |
1813 |
else if (depositOrderer.KB == 4)
|
|
1919 |
else if (depositOrderer.KB == (int)paymentLineClass.EmptyLine)
|
|
1814 | 1920 |
{ |
1815 | 1921 |
// 表示権限確認 |
1816 | 1922 |
var visibleCheck = CheckPermission(depositOrderer); |
... | ... | |
1863 | 1969 |
{ |
1864 | 1970 |
|
1865 | 1971 |
// 表示権限のチェックを行う |
1866 |
if (CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision &&
|
|
1972 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs != (int)SecurityMaster.GeneAffDef.GeneralDep &&
|
|
1867 | 1973 |
m_UserInfo.m_Type != CommonDefine.SecurityRankPos.SpecialAuthority) |
1868 | 1974 |
{ |
1869 | 1975 |
var visibleCheck = CheckDepositDetailPermission(depositOrderer); |
... | ... | |
2294 | 2400 |
} |
2295 | 2401 |
|
2296 | 2402 |
// 特別権限と総務は表示 |
2297 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision ||
|
|
2403 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep ||
|
|
2298 | 2404 |
m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority) |
2299 | 2405 |
{ |
2300 | 2406 |
return true; |
... | ... | |
2385 | 2491 |
sql.Append(" WHERE "); |
2386 | 2492 |
sql.AppendFormat(" H.REQUESTMONTH = {0} ", depositOrderer.RequestMonth); |
2387 | 2493 |
sql.AppendFormat(" AND H.ORDERERSDIVISION = {0} ", depositOrderer.OrderersDivision); |
2388 |
sql.AppendFormat(" AND H.ORDERERSCODE = {0}; ", depositOrderer.OrderersCode); |
|
2494 |
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 |
} |
|
2389 | 2499 |
if (!ioRH.ExecuteReader(sql.ToString(), ref data)) |
2390 | 2500 |
{ |
2391 | 2501 |
return false; |
... | ... | |
2420 | 2530 |
ConstructionInstructorData = CommonMotions.cnvInt(work[9]); |
2421 | 2531 |
|
2422 | 2532 |
// 特別権限と総務は表示 |
2423 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision ||
|
|
2533 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep ||
|
|
2424 | 2534 |
m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority) |
2425 | 2535 |
{ |
2426 | 2536 |
return true; |
... | ... | |
2440 | 2550 |
} |
2441 | 2551 |
// 自分の担当の場合は表示 |
2442 | 2552 |
else if (CommonMotions.LoginUserData.PersonCode == SalesPersonCodeData || |
2443 |
CommonMotions.LoginUserData.PersonCode == SalesSubPersonCodeData || |
|
2444 |
CommonMotions.LoginUserData.PersonCode == ConstructionPersonCodeData || |
|
2445 |
CommonMotions.LoginUserData.PersonCode == ConstrSubPersonCodeData || |
|
2446 |
CommonMotions.LoginUserData.PersonCode == ConstructionInstructorData) |
|
2553 |
CommonMotions.LoginUserData.PersonCode == SalesSubPersonCodeData ||
|
|
2554 |
CommonMotions.LoginUserData.PersonCode == ConstructionPersonCodeData ||
|
|
2555 |
CommonMotions.LoginUserData.PersonCode == ConstrSubPersonCodeData ||
|
|
2556 |
CommonMotions.LoginUserData.PersonCode == ConstructionInstructorData)
|
|
2447 | 2557 |
{ |
2448 | 2558 |
return true; |
2449 | 2559 |
} |
... | ... | |
2494 | 2604 |
} |
2495 | 2605 |
|
2496 | 2606 |
// 総務の場合は編集可能 |
2497 |
else if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision)
|
|
2607 |
else if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep)
|
|
2498 | 2608 |
{ |
2499 | 2609 |
return true; |
2500 | 2610 |
} |
... | ... | |
2513 | 2623 |
} |
2514 | 2624 |
#endregion |
2515 | 2625 |
|
2516 |
#region 上位承認者か判定する |
|
2517 |
/// <summary> |
|
2518 |
/// 上位承認者か判定する |
|
2519 |
/// </summary> |
|
2520 |
/// <param name="depositDetail"></param> |
|
2521 |
/// <returns></returns> |
|
2522 |
//private bool IsUpperLevelApprover(DepositDetail depositDetail) |
|
2523 |
//{ |
|
2524 |
// if (depositDetail.DepositApprovals.Count == 0) |
|
2525 |
// return true; |
|
2526 |
// var lastApproverIndex = depositDetail.DepositApprovals.FindLastIndex(da => da.ApprovalDate != ""); |
|
2527 |
// var myIndex = depositDetail.DepositApprovals.FindLastIndex(da => da.ApprovalPerson == CommonMotions.LoginUserData.PersonCode); |
|
2528 |
// return myIndex > lastApproverIndex; |
|
2529 |
//} |
|
2530 |
#endregion |
|
2531 |
|
|
2532 | 2626 |
#region 入金請求先情報を取得する。 |
2533 | 2627 |
/// <summary> |
2534 | 2628 |
/// 入金請求先情報を取得する。 |
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs | ||
---|---|---|
490 | 490 |
#region 取引先入金入力 |
491 | 491 |
// 入金確認 |
492 | 492 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation); |
493 |
|
|
494 |
// 入金確認(出来高) |
|
495 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling); |
|
493 | 496 |
break; |
494 | 497 |
#endregion |
495 | 498 |
} |
... | ... | |
557 | 560 |
#region 取引先入金入力 |
558 | 561 |
// 入金確認 |
559 | 562 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation); |
563 |
|
|
564 |
// 入金確認(完了後) |
|
565 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling); |
|
560 | 566 |
break; |
561 | 567 |
#endregion |
562 | 568 |
} |
... | ... | |
1402 | 1408 |
#region 取引先入金入力 |
1403 | 1409 |
// 入金確認 |
1404 | 1410 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation); |
1411 |
|
|
1412 |
// 入金確認(出来高) |
|
1413 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling); |
|
1405 | 1414 |
break; |
1406 | 1415 |
#endregion |
1407 | 1416 |
} |
... | ... | |
1454 | 1463 |
#region 取引先入金入力 |
1455 | 1464 |
// 入金確認 |
1456 | 1465 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation); |
1466 |
|
|
1467 |
// 入金確認(完了後) |
|
1468 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling); |
|
1469 |
|
|
1457 | 1470 |
break; |
1458 | 1471 |
#endregion |
1459 | 1472 |
} |
他の形式にエクスポート: Unified diff