リビジョン 291
承認処理：承認順序規定処理追加
注文書印刷：工期開始日を注文書作成+1日に変更
工事日報入力：登録時画面終了をしないように修正
売上確認：タイトル変更
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 101;
|
|
| 17 |
public static int s_SystemVersion = 102;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
|---|---|---|
| 235 | 235 |
{ (int)MaintenanceExecuteNo.ConstrExpenses, "施工経費区分登録"}, // 126
|
| 236 | 236 |
{ (int)MaintenanceExecuteNo.MaterialKind, "資材種類登録"}, // 127
|
| 237 | 237 |
{ (int)MaintenanceExecuteNo.MaterialItem, "資材品目登録"}, // 128
|
| 238 |
{ (int)MaintenanceExecuteNo.SalesConfirm, "売上確認"}, // 129
|
|
| 238 |
{ (int)MaintenanceExecuteNo.SalesConfirm, "売上順一覧"}, // 129
|
|
| 239 | 239 |
}; |
| 240 | 240 |
#endregion |
| 241 | 241 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs | ||
|---|---|---|
| 441 | 441 |
{
|
| 442 | 442 |
try |
| 443 | 443 |
{
|
| 444 |
// ???F?????`?F?b?N |
|
| 445 |
if (!ChkApprovalOrder()) return; |
|
| 446 |
|
|
| 447 |
// ??????`?F?b?N |
|
| 444 | 448 |
if (!DispFeildCheck()) return; |
| 449 |
|
|
| 445 | 450 |
if (MessageBox.Show("?\???f?[?^?????F??????A???????????H?B", "???F?m?F"
|
| 446 | 451 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 447 | 452 |
|
| ... | ... | |
| 476 | 481 |
{
|
| 477 | 482 |
try |
| 478 | 483 |
{
|
| 484 |
// ???F?????`?F?b?N |
|
| 485 |
if (!ChkApprovalOrder()) return; |
|
| 486 |
|
|
| 487 |
// ??????`?F?b?N |
|
| 479 | 488 |
if (!DispFeildCheck()) return; |
| 489 |
|
|
| 480 | 490 |
if (MessageBox.Show("?\???f?[?^??s???F??????A???????????H?B", "?s???F?m?F"
|
| 481 | 491 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 482 | 492 |
|
| ... | ... | |
| 511 | 521 |
{
|
| 512 | 522 |
try |
| 513 | 523 |
{
|
| 524 |
// ???F?????`?F?b?N |
|
| 525 |
if (!ChkApprovalOrder()) return; |
|
| 526 |
|
|
| 527 |
// ??????`?F?b?N |
|
| 514 | 528 |
if (!DispFeildCheck()) return; |
| 529 |
|
|
| 515 | 530 |
if (MessageBox.Show("?\???f?[?^???????????A???????????H?B", "????m?F"
|
| 516 | 531 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 517 | 532 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs | ||
|---|---|---|
| 791 | 791 |
|
| 792 | 792 |
#endregion |
| 793 | 793 |
|
| 794 |
#region 承認順序チェック |
|
| 795 |
/// <summary> |
|
| 796 |
/// 承認順序チェック |
|
| 797 |
/// </summary> |
|
| 798 |
/// <returns></returns> |
|
| 799 |
private bool ChkApprovalOrder() |
|
| 800 |
{
|
|
| 801 |
string strErrMsg = string.Empty; |
|
| 802 |
try |
|
| 803 |
{
|
|
| 804 |
DataGridView dgv = dgvEntryData; |
|
| 805 |
DataGridViewRow Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.ApprovalCode].Value) |
|
| 806 |
== CommonMotions.LoginUserData.PersonCode) |
|
| 807 |
.FirstOrDefault(); |
|
| 808 |
if (Rows == null) |
|
| 809 |
{
|
|
| 810 |
strErrMsg = "承認者ではありません。"; |
|
| 811 |
return false; |
|
| 812 |
} |
|
| 813 |
|
|
| 814 |
int RowIndex = Rows.Index; |
|
| 815 |
|
|
| 816 |
// 範囲外はエラー |
|
| 817 |
if (dgv.RowCount <= RowIndex) return false; |
|
| 818 |
|
|
| 819 |
// 先頭の承認者はＯＫ |
|
| 820 |
if ((dgv.RowCount - 1) == RowIndex) return true; |
|
| 821 |
int workCode = CommonMotions.cnvInt(dgv.Rows[(RowIndex + 1)].Cells[(int)DispGridColumn.ApprovalCode].Value); |
|
| 822 |
if (workCode == 0) return true; |
|
| 823 |
|
|
| 824 |
// 承認文字取得 |
|
| 825 |
string strApp = CommonDefine.ApprovalStatusString[(int)CommonDefine.ApprovalStatus.Approval]; |
|
| 826 |
|
|
| 827 |
// 1行前の承認状態文字を取得する |
|
| 828 |
string strPrevRowStatus = CommonMotions.cnvString(dgv.Rows[(RowIndex + 1)].Cells[(int)DispGridColumn.ApprovalStatus].Value); |
|
| 829 |
|
|
| 830 |
// 1行前が承認されていればＯＫ |
|
| 831 |
if (!strPrevRowStatus.Equals(strApp)) |
|
| 832 |
{
|
|
| 833 |
strErrMsg = "１つ前の承認が確定していません。"; |
|
| 834 |
return false; |
|
| 835 |
} |
|
| 836 |
|
|
| 837 |
return true; |
|
| 838 |
} |
|
| 839 |
catch (Exception ex) |
|
| 840 |
{
|
|
| 841 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 842 |
return false; |
|
| 843 |
} |
|
| 844 |
finally |
|
| 845 |
{
|
|
| 846 |
if (strErrMsg.Length > 0) MessageBox.Show(strErrMsg, "承認順番エラー", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
| 847 |
} |
|
| 848 |
} |
|
| 849 |
#endregion |
|
| 850 |
|
|
| 794 | 851 |
#region ---------- >> 申請後処理 |
| 795 | 852 |
#region 申請元データに受付番号をセットする |
| 796 | 853 |
/// <summary> |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
|---|---|---|
| 426 | 426 |
{
|
| 427 | 427 |
try |
| 428 | 428 |
{
|
| 429 |
// ???F?????`?F?b?N |
|
| 430 |
if (!ChkApprovalOrder()) return; |
|
| 431 |
|
|
| 432 |
// ??????`?F?b?N |
|
| 429 | 433 |
if (!DispFeildCheck()) return; |
| 434 |
|
|
| 430 | 435 |
if (MessageBox.Show("????????F??????A???????????H?B", "???F?m?F"
|
| 431 | 436 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 432 | 437 |
|
| ... | ... | |
| 461 | 466 |
{
|
| 462 | 467 |
try |
| 463 | 468 |
{
|
| 469 |
// ???F?????`?F?b?N |
|
| 470 |
if (!ChkApprovalOrder()) return; |
|
| 471 |
|
|
| 472 |
// ??????`?F?b?N |
|
| 464 | 473 |
if (!DispFeildCheck()) return; |
| 474 |
|
|
| 465 | 475 |
if (MessageBox.Show("?????s???F??????A???????????H?B", "?s???F?m?F"
|
| 466 | 476 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 467 | 477 |
|
| ... | ... | |
| 496 | 506 |
{
|
| 497 | 507 |
try |
| 498 | 508 |
{
|
| 509 |
// ???F?????`?F?b?N |
|
| 510 |
if (!ChkApprovalOrder()) return; |
|
| 511 |
|
|
| 512 |
// ??????`?F?b?N |
|
| 499 | 513 |
if (!DispFeildCheck()) return; |
| 514 |
|
|
| 500 | 515 |
if (MessageBox.Show("??????????????A???????????H?B", "????m?F"
|
| 501 | 516 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 502 | 517 |
|
| ... | ... | |
| 719 | 734 |
} |
| 720 | 735 |
#endregion |
| 721 | 736 |
|
| 722 |
#region ???\?? |
|
| 723 |
/// <summary> |
|
| 724 |
/// ???\?????? |
|
| 725 |
/// </summary> |
|
| 726 |
private void AllDataDisplay() |
|
| 727 |
{
|
|
| 728 |
// ?\???N???A |
|
| 729 |
ClearDisplay(); |
|
| 730 |
|
|
| 731 |
// ?H?????? |
|
| 732 |
if (!SetBaseInfoData()) return; |
|
| 733 |
|
|
| 734 |
// ?w?b?_?[???\?? |
|
| 735 |
if (!SetHeader()) return; |
|
| 736 |
|
|
| 737 |
// ?f?[?^?\?? |
|
| 738 |
if (!SetApprovalData()) return; |
|
| 739 |
|
|
| 740 |
// ???F???\?? |
|
| 741 |
if (!SetCurrentApproval()) return; |
|
| 742 |
|
|
| 743 |
// ?R?????g?\?? |
|
| 744 |
DispTreeViewComment(); |
|
| 745 |
|
|
| 746 |
// ?\??????E?{?^???\??????
|
|
| 747 |
SetPetitionData(); |
|
| 748 |
|
|
| 749 |
// ???F???f?[?^??????{?^???\??????
|
|
| 750 |
DispbtnTargetData(); |
|
| 751 |
|
|
| 752 |
// ??X?t???OOff |
|
| 753 |
m_bChengeAns = false; |
|
| 754 |
} |
|
| 755 |
#endregion |
|
| 756 |
|
|
| 757 | 737 |
#region ?R?????g?V?K?{?^??????
|
| 758 | 738 |
/// <summary> |
| 759 | 739 |
/// ?R?????g?V?K?{?^??????
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
|---|---|---|
| 28 | 28 |
partial class FrmApprovalScreen |
| 29 | 29 |
{
|
| 30 | 30 |
|
| 31 |
#region 画面表示 |
|
| 32 |
/// <summary> |
|
| 33 |
/// 画面表示処理 |
|
| 34 |
/// </summary> |
|
| 35 |
private void AllDataDisplay() |
|
| 36 |
{
|
|
| 37 |
// 表示クリア |
|
| 38 |
ClearDisplay(); |
|
| 39 |
|
|
| 40 |
// 工事情報取得 |
|
| 41 |
if (!SetBaseInfoData()) return; |
|
| 42 |
|
|
| 43 |
// ヘッダー情報表示 |
|
| 44 |
if (!SetHeader()) return; |
|
| 45 |
|
|
| 46 |
// データ表示 |
|
| 47 |
if (!SetApprovalData()) return; |
|
| 48 |
|
|
| 49 |
// 承認情報表示 |
|
| 50 |
if (!SetCurrentApproval()) return; |
|
| 51 |
|
|
| 52 |
// コメント表示 |
|
| 53 |
DispTreeViewComment(); |
|
| 54 |
|
|
| 55 |
// 申請者情報・ボタン表示制御 |
|
| 56 |
SetPetitionData(); |
|
| 57 |
|
|
| 58 |
// 承認対象データを見るボタン表示制御 |
|
| 59 |
DispbtnTargetData(); |
|
| 60 |
|
|
| 61 |
// 変更フラグOff |
|
| 62 |
m_bChengeAns = false; |
|
| 63 |
} |
|
| 64 |
#endregion |
|
| 65 |
|
|
| 31 | 66 |
#region ひとつ前のプロセスを確認する |
| 32 | 67 |
/// <summary> |
| 33 | 68 |
/// ひとつ前のプロセスを確認する |
| ... | ... | |
| 1168 | 1203 |
} |
| 1169 | 1204 |
#endregion |
| 1170 | 1205 |
|
| 1206 |
#region 承認順序チェック |
|
| 1207 |
/// <summary> |
|
| 1208 |
/// 承認順序チェック |
|
| 1209 |
/// </summary> |
|
| 1210 |
/// <returns></returns> |
|
| 1211 |
private bool ChkApprovalOrder() |
|
| 1212 |
{
|
|
| 1213 |
string strErrMsg = string.Empty; |
|
| 1214 |
try |
|
| 1215 |
{
|
|
| 1216 |
DataGridView dgv = dgvEntryData; |
|
| 1217 |
DataGridViewRow Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.ApprovalCode].Value) |
|
| 1218 |
== CommonMotions.LoginUserData.PersonCode) |
|
| 1219 |
.FirstOrDefault(); |
|
| 1220 |
if (Rows == null) |
|
| 1221 |
{
|
|
| 1222 |
strErrMsg = "承認者ではありません。"; |
|
| 1223 |
return false; |
|
| 1224 |
} |
|
| 1225 |
|
|
| 1226 |
int RowIndex = Rows.Index; |
|
| 1227 |
|
|
| 1228 |
// 範囲外はエラー |
|
| 1229 |
if (dgv.RowCount <= RowIndex) return false; |
|
| 1230 |
|
|
| 1231 |
// 先頭の承認者はＯＫ |
|
| 1232 |
if ((dgv.RowCount - 1) == RowIndex) return true; |
|
| 1233 |
int workCode = CommonMotions.cnvInt(dgv.Rows[(RowIndex + 1)].Cells[(int)DispGridColumn.ApprovalCode].Value); |
|
| 1234 |
if (workCode == 0) return true; |
|
| 1235 |
|
|
| 1236 |
// 承認文字取得 |
|
| 1237 |
string strApp = CommonDefine.ApprovalStatusString[(int)CommonDefine.ApprovalStatus.Approval]; |
|
| 1238 |
|
|
| 1239 |
// 1行前の承認状態文字を取得する |
|
| 1240 |
string strPrevRowStatus = CommonMotions.cnvString(dgv.Rows[(RowIndex + 1)].Cells[(int)DispGridColumn.ApprovalStatus].Value); |
|
| 1241 |
|
|
| 1242 |
// 1行前が承認されていればＯＫ |
|
| 1243 |
if (!strPrevRowStatus.Equals(strApp)) |
|
| 1244 |
{
|
|
| 1245 |
strErrMsg = "１つ前の承認が確定していません。"; |
|
| 1246 |
return false; |
|
| 1247 |
} |
|
| 1248 |
|
|
| 1249 |
return true; |
|
| 1250 |
} |
|
| 1251 |
catch (Exception ex) |
|
| 1252 |
{
|
|
| 1253 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1254 |
return false; |
|
| 1255 |
} |
|
| 1256 |
finally |
|
| 1257 |
{
|
|
| 1258 |
if (strErrMsg.Length > 0) MessageBox.Show(strErrMsg, "承認順番エラー", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
| 1259 |
} |
|
| 1260 |
} |
|
| 1261 |
#endregion |
|
| 1262 |
|
|
| 1171 | 1263 |
#region ---------->> 指示連絡コメント処理 |
| 1172 | 1264 |
#region 指示連絡コメント表示処理 |
| 1173 | 1265 |
/// <summary> |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs | ||
|---|---|---|
| 906 | 906 |
|
| 907 | 907 |
m_CloseingProcessOn = true; |
| 908 | 908 |
|
| 909 |
CommonMotions.EntryEndMessage("?H??????f?[?^");
|
|
| 909 |
//?a???DataTime???????????? |
|
| 910 |
System.Globalization.CultureInfo ci = new System.Globalization.CultureInfo("ja-JP", false);
|
|
| 911 |
ci.DateTimeFormat.Calendar = new System.Globalization.JapaneseCalendar(); |
|
| 910 | 912 |
|
| 913 |
string strMsg = string.Format("{0}??\r\n?H??????f?[?^", GetTargetToday().ToString("gy?NMM??dd??", ci));
|
|
| 914 |
|
|
| 915 |
CommonMotions.EntryEndMessage(strMsg); |
|
| 916 |
|
|
| 911 | 917 |
// ?I?? |
| 912 |
this.Close(); |
|
| 918 |
//this.Close();
|
|
| 913 | 919 |
} |
| 914 | 920 |
#endregion |
| 915 | 921 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintFormat1.cs | ||
|---|---|---|
| 530 | 530 |
PersonInChargeMaster PersonRec = new PersonInChargeMaster(); |
| 531 | 531 |
PersonDB.SelectAction(strSQL, ref PersonRec); |
| 532 | 532 |
|
| 533 |
// 注文書作成日 |
|
| 534 |
string strCreateDate = OrderRec.CreateDate.ToShortDateString(); |
|
| 535 |
// 工期開始日 |
|
| 536 |
string strStartDate = string.Empty; |
|
| 537 |
if (m_ConstructionBaseInfo.ConstructionPeriodStart < OrderRec.CreateDate) |
|
| 538 |
strStartDate = OrderRec.CreateDate.AddDays(1).ToShortDateString(); |
|
| 533 | 539 |
|
| 540 |
if (!m_PrintDate) |
|
| 541 |
{
|
|
| 542 |
strCreateDate = string.Format("{0} 年 月 日", CommonMotions.GetNameOfAnEra(OrderRec.CreateDate));
|
|
| 543 |
strStartDate = string.Format("{0} 年 月 日", CommonMotions.GetNameOfAnEra(m_ConstructionBaseInfo.ConstructionPeriodStart));
|
|
| 544 |
} |
|
| 545 |
|
|
| 534 | 546 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (21 + startLine)), ConstractionName); // 工事名称
|
| 535 |
if (m_PrintDate) // 作成日付 |
|
| 536 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("N", (21 + startLine)), OrderRec.CreateDate.ToShortDateString());
|
|
| 537 |
else |
|
| 538 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("N", (21 + startLine)), CommonMotions.GetNameOfAnEra(DateTime.Now) + " 年 月 日");
|
|
| 547 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("N", (21 + startLine)), strCreateDate); // 作成日付
|
|
| 539 | 548 |
|
| 540 | 549 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (22 + startLine)), PlaceString); // 施工及び納入場所
|
| 541 | 550 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (23 + startLine)), m_ConstructionCode.ToString()); // 工事番号
|
| 542 | 551 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (23 + startLine)),
|
| 543 | 552 |
string.Format("{0}-{1}", m_ConstructionCode, OrderRec.SeqNo.ToString("000"))); // 発注番号
|
| 544 | 553 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", (23 + startLine)), PaymentTermsString); // 支払い条件
|
| 545 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (24 + startLine)),
|
|
| 546 |
m_ConstructionBaseInfo.ConstructionPeriodStart.ToShortDateString()); // 工期開始日 |
|
| 547 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (24 + startLine)),
|
|
| 548 |
m_ConstructionBaseInfo.ConstructionPeriodEnd.ToShortDateString()); // 工事終了日 |
|
| 554 |
|
|
| 555 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (24 + startLine)), strStartDate); // 工期開始日
|
|
| 556 |
|
|
| 557 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (24 + startLine))
|
|
| 558 |
, m_ConstructionBaseInfo.ConstructionPeriodEnd.ToShortDateString()); // 工期終了日 |
|
| 549 | 559 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (25 + startLine)),
|
| 550 | 560 |
string.Format("￥{0}", OrderRec.OrderPrice.ToString("#,0"))); // 発注金額（税別）
|
| 551 | 561 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (25 + startLine)), PersonRec.PersonName); // 現場担当者
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs | ||
|---|---|---|
| 88 | 88 |
this.label3.Name = "label3"; |
| 89 | 89 |
this.label3.Size = new System.Drawing.Size(500, 20); |
| 90 | 90 |
this.label3.TabIndex = 3; |
| 91 |
this.label3.Text = "売 上 確 認";
|
|
| 91 |
this.label3.Text = "売 上 順 一 覧";
|
|
| 92 | 92 |
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
| 93 | 93 |
// |
| 94 | 94 |
// dgvMaster |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.101")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.101")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.2")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.2")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff