リビジョン 259
車両マスタ、新規時履歴登録のエラーを回避
工事詳細台帳一覧コンボボックスイベントTextChangeからSelectedIndexへ変更
見積書・請求書コメント行削除
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 68;
|
|
| 17 |
public static int s_SystemVersion = 70;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs | ||
|---|---|---|
| 574 | 574 |
/// </summary> |
| 575 | 575 |
/// <param name="sender"></param> |
| 576 | 576 |
/// <param name="e"></param> |
| 577 |
private void cmbDepartment_TextChanged(object sender, EventArgs e)
|
|
| 577 |
private void cmbDepartment_SelectedIndexChanged(object sender, EventArgs e)
|
|
| 578 | 578 |
{
|
| 579 | 579 |
if (m_initDataLoad) return; |
| 580 | 580 |
|
| ... | ... | |
| 592 | 592 |
/// </summary> |
| 593 | 593 |
/// <param name="sender"></param> |
| 594 | 594 |
/// <param name="e"></param> |
| 595 |
private void cmbConstructionPerson_TextChanged(object sender, EventArgs e)
|
|
| 595 |
private void cmbConstructionPerson_SelectedIndexChanged(object sender, EventArgs e)
|
|
| 596 | 596 |
{
|
| 597 | 597 |
if (m_initDataLoad) return; |
| 598 | 598 |
|
| ... | ... | |
| 737 | 737 |
lblCellTotal.Text = string.Empty; |
| 738 | 738 |
} |
| 739 | 739 |
#endregion |
| 740 |
|
|
| 740 | 741 |
} |
| 741 | 742 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs | ||
|---|---|---|
| 573 | 573 |
this.cmbDepartment.Name = "cmbDepartment"; |
| 574 | 574 |
this.cmbDepartment.Size = new System.Drawing.Size(200, 23); |
| 575 | 575 |
this.cmbDepartment.TabIndex = 1; |
| 576 |
this.cmbDepartment.TextChanged += new System.EventHandler(this.cmbDepartment_TextChanged);
|
|
| 576 |
this.cmbDepartment.SelectedIndexChanged += new System.EventHandler(this.cmbDepartment_SelectedIndexChanged);
|
|
| 577 | 577 |
// |
| 578 | 578 |
// label2 |
| 579 | 579 |
// |
| ... | ... | |
| 624 | 624 |
this.cmbConstructionPerson.Name = "cmbConstructionPerson"; |
| 625 | 625 |
this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 23); |
| 626 | 626 |
this.cmbConstructionPerson.TabIndex = 2; |
| 627 |
this.cmbConstructionPerson.TextChanged += new System.EventHandler(this.cmbConstructionPerson_TextChanged);
|
|
| 627 |
this.cmbConstructionPerson.SelectedIndexChanged += new System.EventHandler(this.cmbConstructionPerson_SelectedIndexChanged);
|
|
| 628 | 628 |
// |
| 629 | 629 |
// label3 |
| 630 | 630 |
// |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs | ||
|---|---|---|
| 598 | 598 |
string strAlpha = CommonMotions.cnvNumberToAlphaCharacter(orgNumber); |
| 599 | 599 |
m_UsedExcel.ExcelCellSet(string.Format("{0}24", strAlpha), OrderOfPrecedenceTable[i]);
|
| 600 | 600 |
} |
| 601 |
|
|
| 602 |
//// 所属長の役職を印字する |
|
| 603 |
//m_UsedExcel.ExcelCellSet("M24", OrderOfPrecedenceTable);
|
|
| 604 | 601 |
} |
| 605 | 602 |
catch (Exception ex) |
| 606 | 603 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
|---|---|---|
| 1119 | 1119 |
if (dgv.CurrentRow == null) return; |
| 1120 | 1120 |
|
| 1121 | 1121 |
if (dgv.Rows.Count == 0 // ?I??????????? |
| 1122 |
|| CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispColumn.RowType].Value) != 0) //
|
|
| 1122 |
|| CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispColumn.RowType].Value) != 0) // |
|
| 1123 | 1123 |
// TODO ?i?s?v?H?j |
| 1124 |
//|| CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispColumn.SomuSeikyu].Value) == 0) // ???????z???????????? |
|
| 1124 |
//|| CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispColumn.SomuSeikyu].Value) == 0) // ???????z????????????
|
|
| 1125 | 1125 |
{
|
| 1126 | 1126 |
return; |
| 1127 | 1127 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/Master/Vehicle/FrmVehicle.cs | ||
|---|---|---|
| 1089 | 1089 |
vData.RegistrationNumber = m_dispControl[(int)DispCtrl.RegistrationNumber].Text; |
| 1090 | 1090 |
vData.IdentificationNumber = m_dispControl[(int)DispCtrl.IdentificationNumber].Text; |
| 1091 | 1091 |
vData.ModelCode = m_dispControl[(int)DispCtrl.ModelCode].Text; |
| 1092 |
|
|
| 1092 |
|
|
| 1093 | 1093 |
if (cmbVehicleAdministrator.Text.Length != 0) |
| 1094 | 1094 |
vData.DepartmentCode = CommonMotions.cnvInt(cmbVehicleAdministrator.SelectedValue.ToString()); |
| 1095 | 1095 |
vData.VehicleScheduleFlg = CommonMotions.cnvInt(cmbVehicleScheduleDsp.SelectedValue.ToString()); |
| ... | ... | |
| 1146 | 1146 |
return false; |
| 1147 | 1147 |
} |
| 1148 | 1148 |
} |
| 1149 |
|
|
| 1149 |
|
|
| 1150 | 1150 |
// データを画面より取得 |
| 1151 | 1151 |
List<VehicleRecordData> vrdList = new List<VehicleRecordData>(); |
| 1152 | 1152 |
if (!SetGridRowToRecordData(ref vrdList)) |
| ... | ... | |
| 1160 | 1160 |
strSQL = vrdDB.CreatePrimarykeyString(vData.VehicleCode); |
| 1161 | 1161 |
// 記録データ削除 |
| 1162 | 1162 |
vrdDB.DeleteAction(strSQL, false); |
| 1163 |
// データ登録
|
|
| 1164 |
if (!vrdDB.InsertAction(vrdList, false))
|
|
| 1163 |
// データ登録 |
|
| 1164 |
if (vrdList.Count > 0)
|
|
| 1165 | 1165 |
{
|
| 1166 |
vDB.rollback(); |
|
| 1167 |
vrdDB.rollback(); |
|
| 1168 |
MessageBox.Show("記録データ登録に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
| 1169 |
return false; |
|
| 1166 |
if (!vrdDB.InsertAction(vrdList, false)) |
|
| 1167 |
{
|
|
| 1168 |
vDB.rollback(); |
|
| 1169 |
vrdDB.rollback(); |
|
| 1170 |
MessageBox.Show("記録データ登録に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
| 1171 |
return false; |
|
| 1172 |
} |
|
| 1170 | 1173 |
} |
| 1171 | 1174 |
|
| 1172 | 1175 |
// 成功したらcommit |
| branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmRequestPrint.cs | ||
|---|---|---|
| 1428 | 1428 |
{
|
| 1429 | 1429 |
StringBuilder strcmd = new StringBuilder(); |
| 1430 | 1430 |
|
| 1431 |
strcmd.AppendFormat(" {0}PersonCode", Alias);
|
|
| 1432 |
strcmd.AppendFormat(" ,{0}DisplayOrder", Alias);
|
|
| 1433 |
strcmd.AppendFormat(" ,{0}PersonName", Alias);
|
|
| 1431 |
bool bColFirst = true; |
|
| 1432 |
string strWork = string.Empty; |
|
| 1433 |
foreach (var gender in Enum.GetValues(typeof(IOMPersonInCharge.ColumnCnt))) |
|
| 1434 |
{
|
|
| 1435 |
strWork = gender.ToString(); |
|
| 1436 |
if (!bColFirst) strcmd.Append(", ");
|
|
| 1437 |
if (strWork.Equals("StartDate") || strWork.Equals("EndDate"))
|
|
| 1438 |
{
|
|
| 1439 |
strcmd.AppendFormat(" DATE_FORMAT({0}{1}, '%Y/%m/%d')", Alias, strWork);
|
|
| 1440 |
} |
|
| 1441 |
else if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
|
|
| 1442 |
{
|
|
| 1443 |
strcmd.AppendFormat(" DATE_FORMAT({0}{1}, '%Y/%m/%d %H:%i:%s')", Alias, strWork);
|
|
| 1444 |
} |
|
| 1445 |
else |
|
| 1446 |
{
|
|
| 1447 |
strcmd.AppendFormat(" {0}{1}", Alias, strWork);
|
|
| 1448 |
} |
|
| 1449 |
bColFirst = false; |
|
| 1450 |
} |
|
| 1434 | 1451 |
|
| 1435 |
strcmd.AppendFormat(" ,DATE_FORMAT({0}StartDate, '%Y/%m/%d')", Alias);
|
|
| 1436 |
strcmd.AppendFormat(" ,DATE_FORMAT({0}EndDate, '%Y/%m/%d')", Alias);
|
|
| 1437 |
strcmd.AppendFormat(" ,{0}PassWord", Alias);
|
|
| 1438 |
strcmd.AppendFormat(" ,{0}SecurityManagement", Alias);
|
|
| 1439 |
strcmd.AppendFormat(" ,{0}SecCode", Alias);
|
|
| 1440 |
strcmd.AppendFormat(" ,{0}MsgBackColor", Alias);
|
|
| 1441 |
strcmd.AppendFormat(" ,{0}DisplayString", Alias);
|
|
| 1442 |
strcmd.AppendFormat(" ,{0}DepartmentCode", Alias);
|
|
| 1443 |
strcmd.AppendFormat(" ,{0}MonthlySalary", Alias);
|
|
| 1444 |
strcmd.AppendFormat(" ,{0}YearSalary", Alias);
|
|
| 1445 |
strcmd.AppendFormat(" ,{0}Qualification", Alias);
|
|
| 1446 |
strcmd.AppendFormat(" ,{0}SealPrintName", Alias);
|
|
| 1447 |
strcmd.AppendFormat(" ,{0}EmployeeClassFlg", Alias);
|
|
| 1448 |
strcmd.AppendFormat(" ,{0}LedgerFlg", Alias);
|
|
| 1449 |
|
|
| 1450 |
strcmd.AppendFormat(" ,{0}DeleteFlg", Alias);
|
|
| 1451 |
strcmd.AppendFormat(", DATE_FORMAT({0}EntryDate, '%Y/%m/%d %H:%i:%s')", Alias);
|
|
| 1452 |
strcmd.AppendFormat(", DATE_FORMAT({0}UpdateDate, '%Y/%m/%d %H:%i:%s')", Alias);
|
|
| 1453 |
|
|
| 1454 | 1452 |
return strcmd.ToString(); |
| 1455 | 1453 |
} |
| 1456 | 1454 |
catch (Exception ex) |
| ... | ... | |
| 1474 | 1472 |
ArrayList arlist = new ArrayList(); |
| 1475 | 1473 |
|
| 1476 | 1474 |
// 承認データ読込 |
| 1477 |
string strSQLSeal = "SELECT"; |
|
| 1478 |
strSQLSeal += CreatePersonSQL("B.");
|
|
| 1479 |
// 新セキュリティデータ対応済みかを確認する |
|
| 1480 |
if (CommonMotions.LoginUserData.SecCode == 0) |
|
| 1481 |
{
|
|
| 1475 |
StringBuilder strSQLSeal = new StringBuilder(); |
|
| 1476 |
strSQLSeal.Append("SELECT");
|
|
| 1477 |
strSQLSeal.Append(CreatePersonSQL("B."));
|
|
| 1478 |
strSQLSeal.Append(", C.SECRANK FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B, SECURITYMASTER C");
|
|
| 1479 |
strSQLSeal.Append(paDB.CreatePrimarykeyString(m_lstReqHead[0].ReqConstructionCode, (int)ClsExcute.ApprovalListNo.OrderBillingApproval, m_lstReqHead[0].OrderNo)); |
|
| 1480 |
strSQLSeal.Append(" AND A.PERSONCODE = B.PERSONCODE");
|
|
| 1481 |
if (CommonMotions.LoginUserData.SecCode != 0) strSQLSeal.Append(" AND C.SECCODE = B.SECCODE");
|
|
| 1482 |
strSQLSeal.Append(" Order By B.SECURITYMANAGEMENT ASC");
|
|
| 1483 |
if (!paDB.ExecuteReader(strSQLSeal.ToString(), ref arlist)) return; |
|
| 1482 | 1484 |
|
| 1483 |
strSQLSeal += " FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B"; |
|
| 1484 |
} |
|
| 1485 |
else |
|
| 1486 |
{
|
|
| 1487 |
strSQLSeal += ", C.SECRANK FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B, SECURITYMASTER C"; |
|
| 1488 |
} |
|
| 1489 |
strSQLSeal += paDB.CreatePrimarykeyString(m_lstReqHead[0].ReqConstructionCode, (int)ClsExcute.ApprovalListNo.OrderBillingApproval, m_lstReqHead[0].OrderNo); |
|
| 1490 |
strSQLSeal += " AND A.PERSONCODE = B.PERSONCODE"; |
|
| 1491 |
if (CommonMotions.LoginUserData.SecCode != 0) strSQLSeal += " AND C.SECCODE = B.SECCODE"; |
|
| 1492 |
strSQLSeal += " Order By B.SECURITYMANAGEMENT ASC"; |
|
| 1493 |
if (!paDB.ExecuteReader(strSQLSeal, ref arlist)) return; |
|
| 1494 |
|
|
| 1495 | 1485 |
// 印刷テーブル作成 |
| 1496 | 1486 |
int[] PorsonCode = new int[4] { 0, 0, 0, 0 };
|
| 1497 | 1487 |
List<string> NameTable = new List<string>(); |
| ... | ... | |
| 1510 | 1500 |
picDB.Reader2Struct(readObj, ref PersonRec); |
| 1511 | 1501 |
|
| 1512 | 1502 |
bool SelData = false; |
| 1513 |
// 新セキュリティデータ対応済みかを確認する |
|
| 1514 |
if (CommonMotions.LoginUserData.SecCode == 0) |
|
| 1503 |
int SecRank = CommonMotions.cnvInt(readObj[PersonDataCnt]); |
|
| 1504 |
int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority; // 特別権限 |
|
| 1505 |
int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority; // 統括者権限 |
|
| 1506 |
int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority; // 所属長権限 |
|
| 1507 |
|
|
| 1508 |
// 最高責任者・統括責任者・所属長かどうかを調べる |
|
| 1509 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode |
|
| 1510 |
|| SecRank == CommonDefine.SecurityRankList[SRank].Key |
|
| 1511 |
|| SecRank == CommonDefine.SecurityRankList[FRank].Key |
|
| 1512 |
|| SecRank == CommonDefine.SecurityRankList[LRank].Key) |
|
| 1515 | 1513 |
{
|
| 1516 |
// 最高責任者・統括責任者・所属長かどうかを調べる |
|
| 1517 |
if (PersonRec.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key || |
|
| 1518 |
PersonRec.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key || |
|
| 1519 |
PersonRec.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key) |
|
| 1520 |
{
|
|
| 1521 |
SelData = true; |
|
| 1522 |
} |
|
| 1514 |
SelData = true; |
|
| 1523 | 1515 |
} |
| 1524 |
else |
|
| 1525 |
{
|
|
| 1526 |
int SecRank = CommonMotions.cnvInt(readObj[PersonDataCnt]); |
|
| 1527 |
int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority; // 特別権限 |
|
| 1528 |
int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority; // 統括者権限 |
|
| 1529 |
int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority; // 所属長権限 |
|
| 1530 | 1516 |
|
| 1531 |
// 最高責任者・統括責任者・所属長かどうかを調べる |
|
| 1532 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode |
|
| 1533 |
|| SecRank == CommonDefine.SecurityRankList[SRank].Key |
|
| 1534 |
|| SecRank == CommonDefine.SecurityRankList[FRank].Key |
|
| 1535 |
|| SecRank == CommonDefine.SecurityRankList[LRank].Key) |
|
| 1536 |
{
|
|
| 1537 |
SelData = true; |
|
| 1538 |
} |
|
| 1539 |
} |
|
| 1540 | 1517 |
if (SelData) |
| 1541 | 1518 |
{
|
| 1542 | 1519 |
// コードと名前と役職を取得する |
| ... | ... | |
| 1596 | 1573 |
string strAlpha = CommonMotions.cnvNumberToAlphaCharacter(orgNumber); |
| 1597 | 1574 |
m_UsedExcel.ExcelCellSet(string.Format("{0}24", strAlpha), OrderOfPrecedenceTable[i]);
|
| 1598 | 1575 |
} |
| 1599 |
|
|
| 1600 |
//// 所属長の役職を印字する |
|
| 1601 |
//m_UsedExcel.ExcelCellSet("M24", OrderOfPrecedenceTable);
|
|
| 1602 | 1576 |
} |
| 1603 | 1577 |
catch (Exception ex) |
| 1604 | 1578 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.68")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.68")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.70")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.70")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff