リビジョン 303
注文書入力バグ修正
請求まとめ実装中
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 116;
|
|
| 17 |
public static int s_SystemVersion = 118;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
|---|---|---|
| 4528 | 4528 |
// 支払金額が無い場合は処理しない |
| 4529 | 4529 |
if (CommonMotions.cnvInt(wrkRow.Cells[i].Value) == 0) continue; |
| 4530 | 4530 |
|
| 4531 |
SetRowToSQL(wrkRow, RowLineCnt, i, ref NewList);
|
|
| 4531 |
SetRowToSQL(wrkRow, (RowLineCnt * 10), i, ref NewList);
|
|
| 4532 | 4532 |
} |
| 4533 | 4533 |
} // iRows |
| 4534 | 4534 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs | ||
|---|---|---|
| 1188 | 1188 |
NewPage.EntryTab.ResumeLayout(false); |
| 1189 | 1189 |
NewPage.EntryTab.PerformLayout(); |
| 1190 | 1190 |
NewPage.BasePanel.ResumeLayout(false); |
| 1191 |
NewPage.BasePanel.PerformLayout(); |
|
| 1191 | 1192 |
this.TabCollections.ResumeLayout(false); |
| 1193 |
this.TabCollections.PerformLayout(); |
|
| 1192 | 1194 |
NewPage.EntryGroupBox[0].ResumeLayout(false); |
| 1193 | 1195 |
NewPage.EntryGroupBox[0].PerformLayout(); |
| 1194 | 1196 |
NewPage.EntryGroupBox[1].ResumeLayout(false); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs | ||
|---|---|---|
| 114 | 114 |
PurOrderDDB.connect(); PurOrderDDB.beginTran(); |
| 115 | 115 |
ExecDB.connect(); ExecDB.beginTran(); |
| 116 | 116 |
|
| 117 |
if (!ConvertProc1(LedgerDDB, PurOrderDDB)) |
|
| 118 |
{
|
|
| 119 |
LedgerDDB.rollback(); |
|
| 120 |
PurOrderDDB.rollback(); |
|
| 121 |
ExecDB.rollback(); |
|
| 122 |
return; |
|
| 123 |
} |
|
| 117 |
//if (!ConvertProc1(LedgerDDB, PurOrderDDB))
|
|
| 118 |
//{
|
|
| 119 |
// LedgerDDB.rollback();
|
|
| 120 |
// PurOrderDDB.rollback();
|
|
| 121 |
// ExecDB.rollback();
|
|
| 122 |
// return;
|
|
| 123 |
//}
|
|
| 124 | 124 |
|
| 125 |
if (!ConvertProc2(ExecDB, LedgerDDB)) |
|
| 126 |
{
|
|
| 127 |
LedgerDDB.rollback(); |
|
| 128 |
PurOrderDDB.rollback(); |
|
| 129 |
ExecDB.rollback(); |
|
| 130 |
return; |
|
| 131 |
} |
|
| 125 |
//if (!ConvertProc2(ExecDB, LedgerDDB))
|
|
| 126 |
//{
|
|
| 127 |
// LedgerDDB.rollback();
|
|
| 128 |
// PurOrderDDB.rollback();
|
|
| 129 |
// ExecDB.rollback();
|
|
| 130 |
// return;
|
|
| 131 |
//}
|
|
| 132 | 132 |
|
| 133 |
//if (!ConvertProc3(ExecDB, LedgerDDB)) |
|
| 134 |
//{
|
|
| 135 |
// LedgerDDB.rollback(); |
|
| 136 |
// PurOrderDDB.rollback(); |
|
| 137 |
// ExecDB.rollback(); |
|
| 138 |
// return; |
|
| 139 |
//} |
|
| 133 | 140 |
} |
| 134 | 141 |
catch (Exception ex) |
| 135 | 142 |
{
|
| ... | ... | |
| 331 | 338 |
} |
| 332 | 339 |
} |
| 333 | 340 |
#endregion |
| 341 |
|
|
| 342 |
#region 変換処理3 |
|
| 343 |
/// <summary> |
|
| 344 |
/// 変換処理2 |
|
| 345 |
/// </summary> |
|
| 346 |
private bool ConvertProc3(IOConstructionLedgerExcute ExecDB, IOConstructionLedgerDetail LedgerDDB) |
|
| 347 |
{
|
|
| 348 |
try |
|
| 349 |
{
|
|
| 350 |
StringBuilder strSQL = new StringBuilder(); |
|
| 351 |
strSQL.Append(" Where LineCount < 100");
|
|
| 352 |
strSQL.Append(" Order By ConstructionCode ASC, LineCount DESC");
|
|
| 353 |
List<ConstructionLedgerDetail> DList = new List<ConstructionLedgerDetail>(); |
|
| 354 |
LedgerDDB.SelectAction(strSQL.ToString(), ref DList, false); |
|
| 355 |
if (DList.Count < 1) return false; |
|
| 356 |
|
|
| 357 |
int nCnt = 1; |
|
| 358 |
foreach (ConstructionLedgerDetail CurRec in DList) |
|
| 359 |
{
|
|
| 360 |
if (CurRec.ConstructionCode == 2016038501 |
|
| 361 |
|| CurRec.ConstructionCode == 2016005901 |
|
| 362 |
|| CurRec.ConstructionCode == 2016000801 |
|
| 363 |
|| CurRec.ConstructionCode == 2016017501 |
|
| 364 |
|| CurRec.ConstructionCode == 2015042601 |
|
| 365 |
|| CurRec.ConstructionCode == 2016054501 |
|
| 366 |
|| CurRec.ConstructionCode == 2016010901 |
|
| 367 |
|| CurRec.ConstructionCode == 2016061101 |
|
| 368 |
|| CurRec.ConstructionCode == 2016000501 |
|
| 369 |
|| CurRec.ConstructionCode == 2016057001 |
|
| 370 |
|| CurRec.ConstructionCode == 2016000401 |
|
| 371 |
|| CurRec.ConstructionCode == 2017000101 |
|
| 372 |
|| CurRec.ConstructionCode == 2016012701 |
|
| 373 |
|| CurRec.ConstructionCode == 2015035601 |
|
| 374 |
|| CurRec.ConstructionCode == 2016007201 |
|
| 375 |
) |
|
| 376 |
{
|
|
| 377 |
} |
|
| 378 |
else |
|
| 379 |
{
|
|
| 380 |
continue; |
|
| 381 |
} |
|
| 382 |
|
|
| 383 |
strSQL.Clear(); |
|
| 384 |
strSQL.Append(LedgerDDB.CreatePrimarykeyString(CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount)); |
|
| 385 |
if (!LedgerDDB.UpdateFeild(strSQL.ToString() |
|
| 386 |
, (int)IOConstructionLedgerDetail.TableColumn.LineCount |
|
| 387 |
, (CurRec.LineCount * 10) |
|
| 388 |
, false)) |
|
| 389 |
{
|
|
| 390 |
MessageBox.Show("注文書明細データ：行番号更新エラー");
|
|
| 391 |
return false; |
|
| 392 |
} |
|
| 393 |
nCnt++; |
|
| 394 |
} |
|
| 395 |
lblCount04.Text = nCnt.ToString("0,0");
|
|
| 396 |
this.Refresh(); |
|
| 397 |
|
|
| 398 |
strSQL.Clear(); |
|
| 399 |
strSQL.Append(" Where LineCount < 100");
|
|
| 400 |
strSQL.Append(" Order by ConstructionCode ASC, LineCount DESC");
|
|
| 401 |
List<ConstructionLedgerExcute> DataList = new List<ConstructionLedgerExcute>(); |
|
| 402 |
ExecDB.SelectAction(strSQL.ToString(), ref DataList, false); |
|
| 403 |
if (DataList.Count < 1) return false; |
|
| 404 |
|
|
| 405 |
nCnt = 1; |
|
| 406 |
foreach (ConstructionLedgerExcute CurRec in DataList) |
|
| 407 |
{
|
|
| 408 |
if (CurRec.ConstructionCode == 2016038501 |
|
| 409 |
|| CurRec.ConstructionCode == 2016005901 |
|
| 410 |
|| CurRec.ConstructionCode == 2016000801 |
|
| 411 |
|| CurRec.ConstructionCode == 2016017501 |
|
| 412 |
|| CurRec.ConstructionCode == 2015042601 |
|
| 413 |
|| CurRec.ConstructionCode == 2016054501 |
|
| 414 |
|| CurRec.ConstructionCode == 2016010901 |
|
| 415 |
|| CurRec.ConstructionCode == 2016061101 |
|
| 416 |
|| CurRec.ConstructionCode == 2016000501 |
|
| 417 |
|| CurRec.ConstructionCode == 2016057001 |
|
| 418 |
|| CurRec.ConstructionCode == 2016000401 |
|
| 419 |
|| CurRec.ConstructionCode == 2017000101 |
|
| 420 |
|| CurRec.ConstructionCode == 2016012701 |
|
| 421 |
|| CurRec.ConstructionCode == 2015035601 |
|
| 422 |
|| CurRec.ConstructionCode == 2016007201 |
|
| 423 |
) |
|
| 424 |
{
|
|
| 425 |
} |
|
| 426 |
else |
|
| 427 |
{
|
|
| 428 |
continue; |
|
| 429 |
} |
|
| 430 |
|
|
| 431 |
strSQL.Clear(); |
|
| 432 |
strSQL.Append(ExecDB.CreatePrimarykeyString(CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount, CurRec.ColumnCount)); |
|
| 433 |
if (!ExecDB.UpdateFeild(strSQL.ToString() |
|
| 434 |
, (int)IOConstructionLedgerExcute.TableColumn.LineCount |
|
| 435 |
, (CurRec.LineCount * 10) |
|
| 436 |
, false)) |
|
| 437 |
{
|
|
| 438 |
MessageBox.Show("注文書実行データ：列位置更新エラー");
|
|
| 439 |
return false; |
|
| 440 |
} |
|
| 441 |
nCnt++; |
|
| 442 |
} |
|
| 443 |
|
|
| 444 |
|
|
| 445 |
lblCount05.Text = nCnt.ToString("0,0");
|
|
| 446 |
this.Refresh(); |
|
| 447 |
|
|
| 448 |
return true; |
|
| 449 |
} |
|
| 450 |
catch (Exception ex) |
|
| 451 |
{
|
|
| 452 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 453 |
return false; |
|
| 454 |
} |
|
| 455 |
} |
|
| 456 |
#endregion |
|
| 334 | 457 |
} |
| 335 | 458 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs | ||
|---|---|---|
| 840 | 840 |
strSQL.Append(" And B.DetailCount = A.SourceDetailCnt");
|
| 841 | 841 |
|
| 842 | 842 |
strSQL.Append(DetailDB.CreatePrimarykeyString(OrderRec.ConstructionCode, OrderRec.SeqNo, -1, 0, "A.")); |
| 843 |
strSQL.AppendFormat(" And A.GroupCount in ({0}, {1})", (int)PurchaseOrderDetail.GroupCountDef.Detail
|
|
| 844 |
, (int)PurchaseOrderDetail.GroupCountDef.StatutoryWelfare); |
|
| 843 |
//strSQL.AppendFormat(" And A.GroupCount in ({0}, {1})", (int)PurchaseOrderDetail.GroupCountDef.Detail
|
|
| 844 |
// , (int)PurchaseOrderDetail.GroupCountDef.StatutoryWelfare);
|
|
| 845 | 845 |
|
| 846 | 846 |
strSQL.Append(" ORDER BY A.GroupCount ASC, A.LineCount ASC");
|
| 847 | 847 |
DetailData.Clear(); |
| ... | ... | |
| 2154 | 2154 |
// 残った明細行を確認する |
| 2155 | 2155 |
int nDataCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispDetailGridColumn.DataType].Value) |
| 2156 | 2156 |
== (int)PurchaseOrderDetail.DataTypeFlagDef.CommonData |
| 2157 |
&& CommonMotions.cnvInt(x.Cells[(int)DispDetailGridColumn.PriceValue].Value) != 0)
|
|
| 2157 |
&& CommonMotions.cnvInt(x.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value) > 0)
|
|
| 2158 | 2158 |
.Count(); |
| 2159 | 2159 |
if (nDataCnt < 1) |
| 2160 | 2160 |
{
|
| ... | ... | |
| 2339 | 2339 |
|
| 2340 | 2340 |
// データ編集に関するボタンを非表示にする |
| 2341 | 2341 |
panel2.Enabled = false; |
| 2342 |
btnLineDelete.Visible = false; // 行削除ボタン |
|
| 2342 | 2343 |
btnDataEntry.Visible = false; // 登録ボタン |
| 2343 | 2344 |
btnDataDelete.Visible = false; // 削除ボタン |
| 2344 | 2345 |
btnDispUp.Visible = false; // 行アップボタン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
|---|---|---|
| 648 | 648 |
|
| 649 | 649 |
// ???F?{?^????\??????
|
| 650 | 650 |
ApprovalDispControl(); |
| 651 |
//// ?\???E???F?\?????? |
|
| 652 |
//InitApprovalDisplay(); |
|
| 653 | 651 |
|
| 654 |
//// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
|
| 655 |
//bool bApproval = ClsApprovalPermission.ExceApprovalScreen((int)ClsExcute.SubFormExecuteNo.ApprovalPerson); |
|
| 656 |
//if (bApproval) |
|
| 657 |
//{
|
|
| 658 |
// // ???F???R?[?h???????? |
|
| 659 |
// int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
|
| 660 |
// // ?H????????????????????? |
|
| 661 |
// //int DepartmentCode = ClsApprovalPermission.GetFromPersonAndApprovalTheDepartment(m_PersonCode, ApprovalCode, m_CreateDate, m_SeqNo); |
|
| 662 |
// int DepartmentCode = CommonMotions.LoginUserData.DepartmentCode; |
|
| 663 |
// // ?????????\???????????????m?F???? |
|
| 664 |
// bool Pettition = false; |
|
| 665 |
// if (!m_FirstFlg) |
|
| 666 |
// {
|
|
| 667 |
// //Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo); |
|
| 668 |
// Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaymentPersonCode, ApprovalCode, m_OrderDate, (int)CommonDefine.s_Default_OrderNo); |
|
| 669 |
// } |
|
| 670 |
// // ???O?C????????F??????m?F???? |
|
| 671 |
// bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode); |
|
| 672 |
// // ?\????????O?C????????F????????F?{?^????\??????
|
|
| 673 |
// if (Pettition && Approvaler) |
|
| 674 |
// {
|
|
| 675 |
// pnlApprovalButton.Visible = true; |
|
| 676 |
// } |
|
| 677 |
//} |
|
| 678 |
|
|
| 679 | 652 |
m_initDataLoad = false; |
| 680 | 653 |
} |
| 681 | 654 |
catch (Exception ex) |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
|---|---|---|
| 2756 | 2756 |
|
| 2757 | 2757 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 2758 | 2758 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen((int)ClsExcute.SubFormExecuteNo.ApprovalPerson); |
| 2759 |
if (bApproval) |
|
| 2759 |
if (!bApproval) return; |
|
| 2760 |
|
|
| 2761 |
// ???F???R?[?h???????? |
|
| 2762 |
int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
|
| 2763 |
// ?H????????????????????? |
|
| 2764 |
int DepartmentCode = CommonMotions.LoginUserData.DepartmentCode; |
|
| 2765 |
// ?????????\???????????????m?F???? |
|
| 2766 |
bool Pettition = false; |
|
| 2767 |
if (!m_FirstFlg) |
|
| 2760 | 2768 |
{
|
| 2761 |
// ???F???R?[?h???????? |
|
| 2762 |
int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
|
| 2763 |
// ?H????????????????????? |
|
| 2764 |
//int DepartmentCode = ClsApprovalPermission.GetFromPersonAndApprovalTheDepartment(m_PersonCode, ApprovalCode, m_CreateDate, m_SeqNo); |
|
| 2765 |
int DepartmentCode = CommonMotions.LoginUserData.DepartmentCode; |
|
| 2766 |
// ?????????\???????????????m?F???? |
|
| 2767 |
bool Pettition = false; |
|
| 2768 |
if (!m_FirstFlg) |
|
| 2769 |
{
|
|
| 2770 |
//Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo); |
|
| 2771 |
Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaymentPersonCode, ApprovalCode, m_OrderDate, (int)CommonDefine.s_Default_OrderNo); |
|
| 2772 |
} |
|
| 2773 |
// ???O?C????????F??????m?F???? |
|
| 2774 |
bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode); |
|
| 2775 |
// ?\????????O?C????????F????????F?{?^????\??????
|
|
| 2776 |
if (Pettition && Approvaler) |
|
| 2777 |
{
|
|
| 2778 |
pnlApprovalButton.Visible = true; |
|
| 2779 |
} |
|
| 2769 |
Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaymentPersonCode, ApprovalCode, m_OrderDate, (int)CommonDefine.s_Default_OrderNo); |
|
| 2780 | 2770 |
} |
| 2771 |
// ???O?C????????F??????m?F???? |
|
| 2772 |
bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode); |
|
| 2773 |
// ?\????????O?C????????F????????F?{?^????\??????
|
|
| 2774 |
if (Pettition && Approvaler) |
|
| 2775 |
{
|
|
| 2776 |
pnlApprovalButton.Visible = true; |
|
| 2777 |
} |
|
| 2781 | 2778 |
} |
| 2782 | 2779 |
catch (Exception ex) |
| 2783 | 2780 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.1.16")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.16")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.18")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.18")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff