リビジョン 251
請求まとめ・担当者承認実装
請求まとめ・請求データ作成固定行色変更
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs | ||
|---|---|---|
| 282 | 282 |
|
| 283 | 283 |
for (int i = 0; i < rowsNum; i++) |
| 284 | 284 |
{
|
| 285 |
dgv.Rows[i].DefaultCellStyle.BackColor = Color.Yellow; |
|
| 285 |
//dgv.Rows[i].DefaultCellStyle.BackColor = Color.Yellow; |
|
| 286 |
dgv.Rows[i].DefaultCellStyle.BackColor = Color.LightGray; |
|
| 286 | 287 |
dgv.Rows[i].Frozen = true; |
| 287 | 288 |
|
| 288 | 289 |
dgv[(int)ColumnName.No, i].Value = i.ToString(); |
| ... | ... | |
| 352 | 353 |
|
| 353 | 354 |
for (int i = 0; i < rowsNum; i++) |
| 354 | 355 |
{
|
| 355 |
dgv.Rows[cnt].DefaultCellStyle.BackColor = Color.Yellow; |
|
| 356 |
//dgv.Rows[cnt].DefaultCellStyle.BackColor = Color.Yellow; |
|
| 357 |
dgv.Rows[cnt].DefaultCellStyle.BackColor = Color.LightGray; |
|
| 356 | 358 |
|
| 357 | 359 |
dgv[(int)ColumnName.No, cnt].Value = cnt.ToString(); |
| 358 | 360 |
dgv[(int)ColumnName.DgvKind, cnt].Value = ((int)dgvKind.Footer).ToString(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
|---|---|---|
| 328 | 328 |
PaymentApprovalInfo m_PaInfo = null; |
| 329 | 329 |
#endregion |
| 330 | 330 |
|
| 331 |
|
|
| 332 | 331 |
#region ???\?????t???O |
| 333 | 332 |
/// <summary> |
| 334 | 333 |
/// ?\?????t???O |
| ... | ... | |
| 336 | 335 |
private int m_viewTarget = 0; |
| 337 | 336 |
#endregion |
| 338 | 337 |
|
| 339 |
|
|
| 340 | 338 |
#region ?v???p?e?B |
| 341 | 339 |
#region ?????? |
| 342 | 340 |
/// <summary> |
| ... | ... | |
| 1055 | 1053 |
switch (i) |
| 1056 | 1054 |
{
|
| 1057 | 1055 |
case GoukeiRows.???v: |
| 1058 |
row.DefaultCellStyle.BackColor = Color.Khaki; |
|
| 1056 |
//row.DefaultCellStyle.BackColor = Color.Khaki; |
|
| 1057 |
row.DefaultCellStyle.BackColor = Color.LightGoldenrodYellow; |
|
| 1059 | 1058 |
break; |
| 1060 | 1059 |
case GoukeiRows.???v: |
| 1061 |
row.DefaultCellStyle.BackColor = Color.Yellow; |
|
| 1060 |
//row.DefaultCellStyle.BackColor = Color.Yellow; |
|
| 1061 |
row.DefaultCellStyle.BackColor = Color.DarkGray; |
|
| 1062 | 1062 |
break; |
| 1063 | 1063 |
default: |
| 1064 |
row.DefaultCellStyle.BackColor = Color.Aqua; |
|
| 1064 |
//row.DefaultCellStyle.BackColor = Color.Aqua; |
|
| 1065 |
row.DefaultCellStyle.BackColor = Color.LightGray; |
|
| 1065 | 1066 |
break; |
| 1066 | 1067 |
} |
| 1067 | 1068 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
|---|---|---|
| 1283 | 1283 |
/// </summary> |
| 1284 | 1284 |
/// <param name="dgv"></param> |
| 1285 | 1285 |
/// <param name="NowPoint"></param> |
| 1286 |
private void SetApprovalInfoData(DataGridView dgv, ref ArrayList DataList) |
|
| 1286 |
private void SetApprovalInfoData(DataGridView dgv, ref ArrayList DataList, bool bPettion = false)
|
|
| 1287 | 1287 |
{
|
| 1288 | 1288 |
try |
| 1289 | 1289 |
{
|
| ... | ... | |
| 1317 | 1317 |
dtApproval = CommonMotions.cnvDate(CurRow.Cells[i + s_ShoninDateCnt].Value); |
| 1318 | 1318 |
if (ApprovalPerson == 0) continue; |
| 1319 | 1319 |
|
| 1320 |
// ?\??????O??????Z?b?g???? |
|
| 1321 |
if (!bPettion && ApprovalPerson != CommonMotions.LoginUserData.PersonCode) continue; |
|
| 1322 |
|
|
| 1320 | 1323 |
PaymentApprovalInfo DataRec = new PaymentApprovalInfo(); |
| 1321 | 1324 |
DataRec.CompanyCode = CompanyCode; // ??????R?[?h |
| 1322 | 1325 |
DataRec.TargetDate = m_Select_TargetDate; // ???N?? |
| ... | ... | |
| 1367 | 1370 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
| 1368 | 1371 |
ArrayList DataList = new ArrayList(); |
| 1369 | 1372 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
| 1370 |
SetApprovalInfoData(dgv, ref DataList); |
|
| 1373 |
SetApprovalInfoData(dgv, ref DataList, true);
|
|
| 1371 | 1374 |
if (DataList.Count > 0) ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Add(DataList); |
| 1372 | 1375 |
|
| 1373 | 1376 |
// ???t?H?[???I?? |
| 1374 | 1377 |
this.Close(); |
| 1378 |
// ??C????j???[?? |
|
| 1379 |
ClsExcute.ClearProcess(); |
|
| 1375 | 1380 |
} |
| 1376 | 1381 |
catch (Exception ex) |
| 1377 | 1382 |
{
|
| ... | ... | |
| 1380 | 1385 |
} |
| 1381 | 1386 |
#endregion |
| 1382 | 1387 |
|
| 1388 |
#region ?\???O???b?h???S??????????? |
|
| 1389 |
/// <summary> |
|
| 1390 |
/// ?\???O???b?h???S??????????? |
|
| 1391 |
/// </summary> |
|
| 1392 |
/// <returns></returns> |
|
| 1393 |
private int GetDataPersonCode() |
|
| 1394 |
{
|
|
| 1395 |
try |
|
| 1396 |
{
|
|
| 1397 |
DataGridView dgv = dgvCompany.Visible == true ? dgvCompany : dgvProject; |
|
| 1398 |
int nPersonCode = 0; |
|
| 1399 |
|
|
| 1400 |
foreach (DataGridViewRow CurRow in dgv.Rows) |
|
| 1401 |
{
|
|
| 1402 |
// ?\???s????O |
|
| 1403 |
if (!CurRow.Visible) continue; |
|
| 1404 |
|
|
| 1405 |
nPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.TantoShoninCode].Value); |
|
| 1406 |
// ???????????O |
|
| 1407 |
if (nPersonCode == 0) continue; |
|
| 1408 |
break; |
|
| 1409 |
} |
|
| 1410 |
|
|
| 1411 |
return nPersonCode; |
|
| 1412 |
} |
|
| 1413 |
catch (Exception ex) |
|
| 1414 |
{
|
|
| 1415 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1416 |
return CommonMotions.LoginUserData.PersonCode; |
|
| 1417 |
} |
|
| 1418 |
} |
|
| 1419 |
#endregion |
|
| 1420 |
|
|
| 1383 | 1421 |
#region ???F?{?^??????????
|
| 1384 | 1422 |
/// <summary> |
| 1385 | 1423 |
/// ???F?{?^??????????
|
| ... | ... | |
| 1397 | 1435 |
int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalPerson); |
| 1398 | 1436 |
|
| 1399 | 1437 |
// ?S????R?[?h |
| 1400 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.LoginUserData.PersonCode);
|
|
| 1438 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(GetDataPersonCode());
|
|
| 1401 | 1439 |
|
| 1402 | 1440 |
// ???F?@?\??? |
| 1403 | 1441 |
int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
| ... | ... | |
| 1418 | 1456 |
|
| 1419 | 1457 |
// ???t?H?[???I?? |
| 1420 | 1458 |
this.Close(); |
| 1459 |
// ??C????j???[?? |
|
| 1460 |
ClsExcute.ClearProcess(); |
|
| 1421 | 1461 |
} |
| 1422 | 1462 |
catch (Exception ex) |
| 1423 | 1463 |
{
|
| ... | ... | |
| 1442 | 1482 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 1443 | 1483 |
|
| 1444 | 1484 |
// ?S????R?[?h |
| 1445 |
frm.PersonCode = CommonMotions.LoginUserData.PersonCode;
|
|
| 1485 |
frm.PersonCode = GetDataPersonCode();
|
|
| 1446 | 1486 |
// ???F?@?\????Z?b?g |
| 1447 | 1487 |
frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
| 1448 | 1488 |
// ??t?? |
| ... | ... | |
| 1466 | 1506 |
|
| 1467 | 1507 |
// ???N???[?Y |
| 1468 | 1508 |
this.Close(); |
| 1509 |
// ??C????j???[?? |
|
| 1510 |
ClsExcute.ClearProcess(); |
|
| 1469 | 1511 |
} |
| 1470 | 1512 |
catch (System.Exception ex) |
| 1471 | 1513 |
{
|
| ... | ... | |
| 1494 | 1536 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 1495 | 1537 |
|
| 1496 | 1538 |
// ?S????R?[?h |
| 1497 |
frm.PersonCode = CommonMotions.LoginUserData.PersonCode;
|
|
| 1539 |
frm.PersonCode = GetDataPersonCode();
|
|
| 1498 | 1540 |
// ???F?@?\????Z?b?g |
| 1499 | 1541 |
frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
| 1500 | 1542 |
// ??t?? |
| ... | ... | |
| 1518 | 1560 |
|
| 1519 | 1561 |
// ???N???[?Y |
| 1520 | 1562 |
this.Close(); |
| 1563 |
// ??C????j???[?? |
|
| 1564 |
ClsExcute.ClearProcess(); |
|
| 1521 | 1565 |
} |
| 1522 | 1566 |
catch (System.Exception ex) |
| 1523 | 1567 |
{
|
| ... | ... | |
| 1546 | 1590 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 1547 | 1591 |
|
| 1548 | 1592 |
// ?S????R?[?h |
| 1549 |
frm.PersonCode = CommonMotions.LoginUserData.PersonCode;
|
|
| 1593 |
frm.PersonCode = GetDataPersonCode();
|
|
| 1550 | 1594 |
// ???F?@?\????Z?b?g |
| 1551 | 1595 |
frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName)).Key; |
| 1552 | 1596 |
// ??t?? |
| ... | ... | |
| 1570 | 1614 |
|
| 1571 | 1615 |
// ???N???[?Y |
| 1572 | 1616 |
this.Close(); |
| 1617 |
// ??C????j???[?? |
|
| 1618 |
ClsExcute.ClearProcess(); |
|
| 1573 | 1619 |
} |
| 1574 | 1620 |
catch (System.Exception ex) |
| 1575 | 1621 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
|---|---|---|
| 1801 | 1801 |
bool bDataExist = false; |
| 1802 | 1802 |
try |
| 1803 | 1803 |
{
|
| 1804 |
string strSQL = "SELECT count(*) FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B, APPROVALMASTER C"; |
|
| 1805 |
strSQL += string.Format(" WHERE (A.SEQNO = 1 AND A.APPROVALSTATUS <> {0})", (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1806 |
strSQL += " AND NOT EXISTS (SELECT * FROM PROCESSAPPROVAL D"; |
|
| 1807 |
strSQL += " WHERE D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND D.APPROVALCODE = A.APPROVALCODE AND D.ORDERNO = A.ORDERNO AND D.SEQNO <> 1"; |
|
| 1808 |
strSQL += string.Format(" AND D.PERSONCODE = {0} AND D.APPROVALSTATUS = {1})", CommonMotions.LoginUserData.PersonCode, (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1809 |
strSQL += " AND B.PERSONCODE = A.PERSONCODE"; |
|
| 1810 |
strSQL += " AND (C.APPROVALCODE = A.APPROVALCODE AND C.DEPARTMENTCODE = B.DEPARTMENTCODE)"; |
|
| 1811 |
strSQL += string.Format(" AND C.APPROVALPERSON = {0}", CommonMotions.LoginUserData.PersonCode);
|
|
| 1804 |
// 工事承認をチェックする |
|
| 1805 |
StringBuilder strSQL = new StringBuilder(); |
|
| 1806 |
strSQL.Append("SELECT count(*) FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B, APPROVALMASTER C");
|
|
| 1807 |
strSQL.AppendFormat(" WHERE (A.SEQNO = 1 AND A.APPROVALSTATUS <> {0})", (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1808 |
strSQL.Append(" AND NOT EXISTS (SELECT * FROM PROCESSAPPROVAL D");
|
|
| 1809 |
strSQL.Append(" WHERE D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND D.APPROVALCODE = A.APPROVALCODE AND D.ORDERNO = A.ORDERNO AND D.SEQNO <> 1");
|
|
| 1810 |
strSQL.AppendFormat(" AND D.PERSONCODE = {0} AND D.APPROVALSTATUS = {1})", CommonMotions.LoginUserData.PersonCode, (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1811 |
strSQL.Append(" AND B.PERSONCODE = A.PERSONCODE");
|
|
| 1812 |
strSQL.Append(" AND (C.APPROVALCODE = A.APPROVALCODE AND C.DEPARTMENTCODE = B.DEPARTMENTCODE)");
|
|
| 1813 |
strSQL.AppendFormat(" AND C.APPROVALPERSON = {0}", CommonMotions.LoginUserData.PersonCode);
|
|
| 1812 | 1814 |
ArrayList arList = new ArrayList(); |
| 1813 |
if (!AppDB.ExecuteReader(strSQL, ref arList)) return; |
|
| 1815 |
if (!AppDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
|
|
| 1814 | 1816 |
|
| 1815 | 1817 |
object[] objRec = (object[])arList[0]; |
| 1816 | 1818 |
if (CommonMotions.cnvInt(objRec[0]) != 0) |
| ... | ... | |
| 1821 | 1823 |
return; |
| 1822 | 1824 |
} |
| 1823 | 1825 |
|
| 1824 |
strSQL = "SELECT count(*) FROM PERSONAPPROVAL A, PERSONINCHARGEMASTER B, APPROVALMASTER C"; |
|
| 1825 |
strSQL += string.Format(" WHERE (A.SEQNO = 1 AND A.APPROVALSTATUS <> {0})", (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1826 |
strSQL += " AND NOT EXISTS (SELECT * FROM PERSONAPPROVAL D"; |
|
| 1827 |
strSQL += " WHERE D.PERSONCODE = A.PERSONCODE AND D.APPROVALCODE = A.APPROVALCODE AND D.ORDERNO = A.ORDERNO AND D.SEQNO <> 1"; |
|
| 1828 |
strSQL += string.Format(" AND D.PERSONCODE = {0} AND D.APPROVALSTATUS = {1})", CommonMotions.LoginUserData.PersonCode, (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1829 |
strSQL += " AND B.PERSONCODE = A.PERSONCODE"; |
|
| 1830 |
strSQL += " AND (C.APPROVALCODE = A.APPROVALCODE AND C.DEPARTMENTCODE = B.DEPARTMENTCODE)"; |
|
| 1831 |
strSQL += string.Format(" AND C.APPROVALPERSON = {0}", CommonMotions.LoginUserData.PersonCode);
|
|
| 1826 |
// 担当者承認をチェックする |
|
| 1827 |
strSQL.Clear(); |
|
| 1828 |
strSQL.Append("Select");
|
|
| 1829 |
strSQL.Append(" A.ApprovalCode,");
|
|
| 1830 |
strSQL.Append(" A.PersonCode,");
|
|
| 1831 |
strSQL.Append(" A.SeqNo,");
|
|
| 1832 |
|
|
| 1833 |
strSQL.Append(" C.DepartmentCode,");
|
|
| 1834 |
strSQL.Append(" C.DisplayOrder,");
|
|
| 1835 |
strSQL.Append(" C.ApprovalPerson,");
|
|
| 1836 |
strSQL.Append(" C.ApprovalAuthority,");
|
|
| 1837 |
|
|
| 1838 |
strSQL.Append(" D.PersonCode,");
|
|
| 1839 |
strSQL.Append(" D.ApprovalCode,");
|
|
| 1840 |
strSQL.Append(" D.OrderDate,");
|
|
| 1841 |
strSQL.Append(" D.OrderNo,");
|
|
| 1842 |
strSQL.Append(" D.SeqNo,");
|
|
| 1843 |
strSQL.Append(" D.ApprovalStatus");
|
|
| 1844 |
strSQL.Append(" From");
|
|
| 1845 |
strSQL.Append(" PERSONAPPROVAL A ");
|
|
| 1846 |
strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER B ON B.PersonCode = A.PersonCode");
|
|
| 1847 |
strSQL.Append(" LEFT JOIN APPROVALMASTER C ON C.ApprovalCode = A.ApprovalCode AND C.DepartmentCode = B.DepartmentCode");
|
|
| 1848 |
strSQL.Append(" LEFT JOIN PERSONAPPROVAL D");
|
|
| 1849 |
strSQL.Append(" ON D.PersonCode = A.PersonCode");
|
|
| 1850 |
strSQL.Append(" And D.ApprovalCode = A.ApprovalCode");
|
|
| 1851 |
strSQL.Append(" And D.OrderDate = A.OrderDate");
|
|
| 1852 |
strSQL.Append(" And D.OrderNo = A.OrderNo");
|
|
| 1853 |
strSQL.Append(" And D.SeqNo != 1");
|
|
| 1854 |
strSQL.Append(" And D.PersonCodeApproval = C.ApprovalPerson");
|
|
| 1855 |
|
|
| 1856 |
strSQL.Append(" Where");
|
|
| 1857 |
strSQL.AppendFormat(" (A.SEQNO = 1 AND A.ApprovalStatus != {0})", (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 1858 |
strSQL.AppendFormat(" And C.ApprovalPerson = {0}", CommonMotions.LoginUserData.PersonCode);
|
|
| 1859 |
|
|
| 1832 | 1860 |
ArrayList arListP = new ArrayList(); |
| 1833 |
if (!AppDB.ExecuteReader(strSQL, ref arListP)) return; |
|
| 1861 |
if (!AppDB.ExecuteReader(strSQL.ToString(), ref arListP)) return;
|
|
| 1834 | 1862 |
|
| 1835 |
object[] objRecP = (object[])arListP[0];
|
|
| 1836 |
if (CommonMotions.cnvInt(objRecP[0]) != 0)
|
|
| 1863 |
bool bAppcnt = false;
|
|
| 1864 |
foreach (object[] objRecP in arListP)
|
|
| 1837 | 1865 |
{
|
| 1866 |
if (CommonMotions.cnvInt(objRecP[12]) != (int)CommonDefine.ApprovalStatus.Approval) |
|
| 1867 |
bAppcnt = true; |
|
| 1868 |
} |
|
| 1869 |
|
|
| 1870 |
if (bAppcnt) |
|
| 1871 |
{
|
|
| 1838 | 1872 |
// 承認タブへ移動する |
| 1839 | 1873 |
tabMenu.SelectedIndex = (int)MenuTabAssign.PersonApproval; |
| 1840 | 1874 |
bDataExist = true; |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.62")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.62")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.63")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.63")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff