リビジョン 201
請求まとめ(支払金額超過チェック、工事詳細台帳一括登録実装)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
---|---|---|
164 | 164 |
Shonin10Order, |
165 | 165 |
Bikou, |
166 | 166 |
ShohiZeiRitu, |
167 |
ConstructionLedgerLineNo, |
|
168 |
ConstructionLedgerRowNo, |
|
167 | 169 |
} |
168 | 170 |
|
169 | 171 |
/// <summary> |
... | ... | |
205 | 207 |
PurchaseOrderMailingDate,/*???????X????*/ |
206 | 208 |
PurchaseOrderReturnDate, /*???????????*/ |
207 | 209 |
PaData, // ?\?Z?? |
210 |
ConstructionLedgerLineNo, // ?H???????s??? |
|
211 |
ConstructionLedgerRowNo, // ?H?????????? |
|
208 | 212 |
} |
209 | 213 |
|
210 | 214 |
/// <summary> |
... | ... | |
728 | 732 |
sql.Append(" end "); |
729 | 733 |
sql.Append(" else '??' "); |
730 | 734 |
sql.Append(" end as PaData "); |
731 |
sql.Append(" , CLD.GroupCount as GroupCount"); |
|
732 | 735 |
sql.Append(" , CLD.LineCount as LinePoint "); |
733 | 736 |
sql.AppendFormat(" , PERIOD_DIFF({0} ,DATE_FORMAT(CL.ConstructionStart, '%Y%m')) + {1} AS ColPoint ", m_Select_TargetDate, Enum.GetNames(typeof(FrmConstructionLedger.GridColumn)).Length - 1); |
734 | 737 |
sql.Append("from "); |
... | ... | |
840 | 843 |
sql.Append(" end "); |
841 | 844 |
sql.Append(" else '??' "); |
842 | 845 |
sql.Append(" end as PaData "); |
843 |
sql.Append(" , null as GroupCount "); |
|
844 | 846 |
sql.Append(" , null as LinePoint "); |
845 | 847 |
sql.Append(" , null as ColPoint "); |
846 | 848 |
sql.Append("from "); |
... | ... | |
916 | 918 |
sql.Append(" , PurchaseOrderMailingDate "); |
917 | 919 |
sql.Append(" , PurchaseOrderReturnDate "); |
918 | 920 |
sql.Append(" , PaData "); |
919 |
sql.Append(" , GroupCount "); |
|
920 | 921 |
sql.Append(" , LinePoint "); |
921 | 922 |
sql.Append(" , ColPoint "); |
922 | 923 |
|
... | ... | |
1086 | 1087 |
|
1087 | 1088 |
} |
1088 | 1089 |
|
1090 |
// ???l??? |
|
1089 | 1091 |
dgv.Rows[icnt].Cells[(int)DispColumn.Bikou].Value = CommonMotions.cnvString(work[(int)ClickGetData.Bikou]); |
1092 |
// ?H????????s????A???????? |
|
1093 |
dgv.Rows[icnt].Cells[(int)DispColumn.ConstructionLedgerLineNo].Value = CommonMotions.cnvString(work[(int)ClickGetData.ConstructionLedgerLineNo]); |
|
1094 |
dgv.Rows[icnt].Cells[(int)DispColumn.ConstructionLedgerRowNo].Value = CommonMotions.cnvString(work[(int)ClickGetData.ConstructionLedgerRowNo]); |
|
1090 | 1095 |
|
1091 | 1096 |
// ??????????\????\?? |
1092 | 1097 |
// ?????l???? |
... | ... | |
1805 | 1810 |
dgv.Rows[iIndex].Cells[(int)DispColumn.Shonin10].Value = ""; |
1806 | 1811 |
dgv.Rows[iIndex].Cells[(int)DispColumn.Bikou].Value = ""; |
1807 | 1812 |
//dgv.Rows[iIndex].Cells[(int)DispColumn.ShohiZeiRitu].Value = 0;// ????X?K?v |
1813 |
dgv.Rows[iIndex].Cells[(int)DispColumn.ConstructionLedgerLineNo].Value = ""; |
|
1814 |
dgv.Rows[iIndex].Cells[(int)DispColumn.ConstructionLedgerRowNo].Value = ""; |
|
1808 | 1815 |
|
1809 | 1816 |
MakeIndex = iIndex; |
1810 | 1817 |
|
... | ... | |
2481 | 2488 |
List<PaymentDataDetail> PdDList; |
2482 | 2489 |
List<PaymentApprovalInfo> PaIList; |
2483 | 2490 |
List<BillingPaymentSummary> BpsList = new List<BillingPaymentSummary>(); |
2491 |
List<ConstructionLedgerExcute> CleEntryList = new List<ConstructionLedgerExcute>(); |
|
2484 | 2492 |
|
2485 | 2493 |
BillingData BdWork = new BillingData(); |
2486 | 2494 |
BillingDataDetail BdDWork; |
... | ... | |
2804 | 2812 |
|
2805 | 2813 |
BdDWork = new BillingDataDetail(); |
2806 | 2814 |
|
2815 |
// ?x?????z????`?F?b?N |
|
2816 |
if (!ClsChangeLedgerData.OverExecAmount(CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value), |
|
2817 |
CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerLineNo].Value), |
|
2818 |
CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiSeikyu].Value), |
|
2819 |
CommonMotions.cnvDate(m_Select_TargetDate), |
|
2820 |
CommonMotions.cnvInt(r.Cells[m_Company_Column].Value))) |
|
2821 |
{ |
|
2822 |
r.Cells[(int)DispColumn.Bikou].Value = "?y?x?????z????z" + CommonMotions.cnvString(r.Cells[(int)DispColumn.Bikou].Value); |
|
2823 |
} |
|
2824 |
|
|
2807 | 2825 |
// ?V?K?i???????????f?[?^?j |
2808 | 2826 |
if (BdDList.Count == 0) |
2809 | 2827 |
{ |
... | ... | |
2982 | 3000 |
} |
2983 | 3001 |
|
2984 | 3002 |
} |
2985 |
|
|
3003 |
// ?H????????x?????z????o?^???X?g?????i?s?P??????j |
|
3004 |
ConstructionLedgerExcute CleEntry = new ConstructionLedgerExcute(); |
|
3005 |
CleEntry.ConstructionCode = CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value); |
|
3006 |
CleEntry.GroupCount = 2; |
|
3007 |
CleEntry.LineCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerLineNo].Value); |
|
3008 |
CleEntry.ColumnCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerRowNo].Value); |
|
3009 |
CleEntry.PaymentAmount = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSeikyu].Value); |
|
3010 |
CleEntry.TargetMonth = CommonMotions.cnvDate(m_Select_TargetDate); |
|
3011 |
CleEntry.EntryDate = DateTime.Now; |
|
3012 |
CleEntry.UpdateDate = DateTime.Now; |
|
3013 |
CleEntryList.Add(CleEntry); |
|
2986 | 3014 |
} |
2987 | 3015 |
|
2988 | 3016 |
// ?x?????F???f?[?^----------------------------------------------------------------- |
... | ... | |
3138 | 3166 |
BillingPaymentSummary_DataEntry(dgv, iCompanyCode, bDeleteBpsData, iTantoShoninCount, IoBps, BpsList, BpsWork, strBpsWhere); |
3139 | 3167 |
} |
3140 | 3168 |
|
3169 |
// ?H???????x?????f?[?^???o?^ |
|
3170 |
if (CleEntryList.Count > 0) |
|
3171 |
{ |
|
3172 |
if (!ClsChangeLedgerData.EntryExecuteData(CleEntryList)) |
|
3173 |
{ |
|
3174 |
IoBd.rollback(); |
|
3175 |
IoBdD.rollback(); |
|
3176 |
IoPdD.rollback(); |
|
3177 |
IoPaI.rollback(); |
|
3178 |
IoBps.rollback(); |
|
3179 |
MessageBox.Show("?H???????x?????f?[?^???o?^", "?o?^?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
3180 |
return false; |
|
3181 |
} |
|
3182 |
} |
|
3141 | 3183 |
} |
3142 | 3184 |
catch (Exception ex) |
3143 | 3185 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs | ||
---|---|---|
197 | 197 |
this.Column132 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
198 | 198 |
this.Column21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
199 | 199 |
this.Column77 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
200 |
this.Column141 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
201 |
this.Column142 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
200 | 202 |
this.dgvCompany = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
201 | 203 |
this.Column135 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
202 | 204 |
this.Column133 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
285 | 287 |
this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
286 | 288 |
this.Column20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
287 | 289 |
this.Column64 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
290 |
this.Column139 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
291 |
this.Column140 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
288 | 292 |
this.panel1.SuspendLayout(); |
289 | 293 |
this.groupBoxEx1.SuspendLayout(); |
290 | 294 |
((System.ComponentModel.ISupportInitialize)(this.dgvProject)).BeginInit(); |
... | ... | |
719 | 723 |
this.Column131, |
720 | 724 |
this.Column132, |
721 | 725 |
this.Column21, |
722 |
this.Column77}); |
|
726 |
this.Column77, |
|
727 |
this.Column141, |
|
728 |
this.Column142}); |
|
723 | 729 |
dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
724 | 730 |
dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window; |
725 | 731 |
dataGridViewCellStyle31.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
... | ... | |
1453 | 1459 |
this.Column77.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
1454 | 1460 |
this.Column77.Visible = false; |
1455 | 1461 |
// |
1462 |
// Column141 |
|
1463 |
// |
|
1464 |
this.Column141.HeaderText = "台帳行番号"; |
|
1465 |
this.Column141.Name = "Column141"; |
|
1466 |
this.Column141.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
1467 |
this.Column141.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
1468 |
this.Column141.Visible = false; |
|
1469 |
// |
|
1470 |
// Column142 |
|
1471 |
// |
|
1472 |
this.Column142.HeaderText = "台帳列番号"; |
|
1473 |
this.Column142.Name = "Column142"; |
|
1474 |
this.Column142.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
1475 |
this.Column142.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
1476 |
this.Column142.Visible = false; |
|
1477 |
// |
|
1456 | 1478 |
// dgvCompany |
1457 | 1479 |
// |
1458 | 1480 |
this.dgvCompany.AllowUserToAddRows = false; |
... | ... | |
1557 | 1579 |
this.Column111, |
1558 | 1580 |
this.Column112, |
1559 | 1581 |
this.Column20, |
1560 |
this.Column64}); |
|
1582 |
this.Column64, |
|
1583 |
this.Column139, |
|
1584 |
this.Column140}); |
|
1561 | 1585 |
dataGridViewCellStyle58.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
1562 | 1586 |
dataGridViewCellStyle58.BackColor = System.Drawing.SystemColors.Window; |
1563 | 1587 |
dataGridViewCellStyle58.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
... | ... | |
2286 | 2310 |
this.Column64.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2287 | 2311 |
this.Column64.Visible = false; |
2288 | 2312 |
// |
2313 |
// Column139 |
|
2314 |
// |
|
2315 |
this.Column139.HeaderText = "台帳行番号"; |
|
2316 |
this.Column139.Name = "Column139"; |
|
2317 |
this.Column139.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
2318 |
this.Column139.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
2319 |
this.Column139.Visible = false; |
|
2320 |
// |
|
2321 |
// Column140 |
|
2322 |
// |
|
2323 |
this.Column140.HeaderText = "台帳列番号"; |
|
2324 |
this.Column140.Name = "Column140"; |
|
2325 |
this.Column140.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
2326 |
this.Column140.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
2327 |
this.Column140.Visible = false; |
|
2328 |
// |
|
2289 | 2329 |
// FrmRequestSummaryList |
2290 | 2330 |
// |
2291 | 2331 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; |
... | ... | |
2437 | 2477 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column112; |
2438 | 2478 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column20; |
2439 | 2479 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column64; |
2480 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column139; |
|
2481 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column140; |
|
2440 | 2482 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column136; |
2441 | 2483 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column134; |
2442 | 2484 |
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; |
... | ... | |
2524 | 2566 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column132; |
2525 | 2567 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column21; |
2526 | 2568 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column77; |
2569 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column141; |
|
2570 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column142; |
|
2527 | 2571 |
} |
2528 | 2572 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.resx | ||
---|---|---|
270 | 270 |
<metadata name="Column77.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
271 | 271 |
<value>True</value> |
272 | 272 |
</metadata> |
273 |
<metadata name="Column141.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
274 |
<value>True</value> |
|
275 |
</metadata> |
|
276 |
<metadata name="Column142.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
277 |
<value>True</value> |
|
278 |
</metadata> |
|
273 | 279 |
<metadata name="Column135.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
274 | 280 |
<value>True</value> |
275 | 281 |
</metadata> |
... | ... | |
423 | 429 |
<metadata name="Column64.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
424 | 430 |
<value>True</value> |
425 | 431 |
</metadata> |
432 |
<metadata name="Column139.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
433 |
<value>True</value> |
|
434 |
</metadata> |
|
435 |
<metadata name="Column140.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
436 |
<value>True</value> |
|
437 |
</metadata> |
|
426 | 438 |
</root> |
他の形式にエクスポート: Unified diff