リビジョン 440
工事台帳より交通費・購入品呼び出しで最新の状態へを呼ばずとも再描画をする
メニュー:完了工事で請求準備の金額が表示されないバグを修正
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsOtherProc.cs | ||
---|---|---|
452 | 452 |
ExecFormEntry(ProcessNo, CurProcNo, (Form)frm); |
453 | 453 |
|
454 | 454 |
// 交通費及び購入品等入力起動 |
455 |
frm.InitSetFlag = true; |
|
455 | 456 |
frm.ConstructionCode = ConstrCode; |
456 | 457 |
frm.DepartmentCode = DepCode; |
457 | 458 |
frm.PersonCode = PersonCode; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs | ||
---|---|---|
850 | 850 |
set { m_RollBackJoinLedger = value; } |
851 | 851 |
} |
852 | 852 |
|
853 |
/// <summary> |
|
854 |
/// ????E?w???i????????`??v?? |
|
855 |
/// </summary> |
|
856 |
public bool ReViewLedge |
|
857 |
{ |
|
858 |
get { return ReViewLedger4TAndPCost(); } |
|
859 |
} |
|
860 |
|
|
853 | 861 |
#region *-----* ????????????A?g *-----* ???? |
854 | 862 |
|
855 | 863 |
/// <summary> |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
---|---|---|
6543 | 6543 |
} |
6544 | 6544 |
#endregion |
6545 | 6545 |
|
6546 |
#region 交通費・購入品入力よりの再描画要請 |
|
6547 |
/// <summary> |
|
6548 |
/// 交通費・購入品入力よりの再描画要請 |
|
6549 |
/// </summary> |
|
6550 |
/// <returns></returns> |
|
6551 |
private bool ReViewLedger4TAndPCost() |
|
6552 |
{ |
|
6553 |
try |
|
6554 |
{ |
|
6555 |
// 再描画 |
|
6556 |
InitDataLoad(); |
|
6557 |
|
|
6558 |
// フラグON |
|
6559 |
m_bChengeAns = true; |
|
6560 |
|
|
6561 |
return true; |
|
6562 |
} |
|
6563 |
catch (Exception ex) |
|
6564 |
{ |
|
6565 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
6566 |
return false; |
|
6567 |
} |
|
6568 |
} |
|
6569 |
#endregion |
|
6570 |
|
|
6546 | 6571 |
#region 1.台帳データへ追加する↓↓ |
6547 | 6572 |
// ---------- 1.台帳データへ追加する↓↓ |
6548 | 6573 |
#region 増減データを台帳データへ追加する |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/ProcessControl.cs | ||
---|---|---|
987 | 987 |
{ |
988 | 988 |
GetExpensesList(); |
989 | 989 |
} |
990 |
InitDataLoad(); |
|
991 | 990 |
} |
992 | 991 |
} |
993 | 992 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs | ||
---|---|---|
1215 | 1215 |
// 工事施工台帳へデータを転送する |
1216 | 1216 |
ClsChangeLedgerData.MakeLedgerData(PersonCode, TargetMonth); |
1217 | 1217 |
|
1218 |
// 呼出元が工事台帳かの判定 |
|
1219 |
if (LedgerIsParent()) |
|
1220 |
{ |
|
1221 |
// 台帳からの呼び出し時、対象工事が画面にあるか |
|
1222 |
if (CheckTargetConstrction()) |
|
1223 |
{ |
|
1224 |
// 台帳からの呼び出し時再表示 |
|
1225 |
ReViewLedger(); |
|
1226 |
} |
|
1227 |
} |
|
1228 |
|
|
1218 | 1229 |
// データ変更フラグOFF |
1219 | 1230 |
m_bChengeAns = false; |
1220 | 1231 |
|
... | ... | |
1883 | 1894 |
} |
1884 | 1895 |
#endregion |
1885 | 1896 |
|
1897 |
#region 呼出元が工事台帳かの判定 |
|
1898 |
/// <summary> |
|
1899 |
/// 呼出元が工事台帳かの判定 |
|
1900 |
/// </summary> |
|
1901 |
/// <returns></returns> |
|
1902 |
private bool LedgerIsParent() |
|
1903 |
{ |
|
1904 |
try |
|
1905 |
{ |
|
1906 |
// サブフォーム以外は処理しない |
|
1907 |
if (!m_SubForm) return false; |
|
1908 |
// 台帳からの呼出以外は処理しない |
|
1909 |
int ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts; |
|
1910 |
int nParentProc = ClsExcute.SubFormHandleList[ProcessNo].ProcessNo; |
|
1911 |
if (nParentProc != (int)ClsExcute.ProcessExecuteNo.ConstructionLedger) return false; |
|
1912 |
|
|
1913 |
return true; |
|
1914 |
} |
|
1915 |
catch (Exception ex) |
|
1916 |
{ |
|
1917 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1918 |
return false; |
|
1919 |
} |
|
1920 |
} |
|
1921 |
#endregion |
|
1922 |
|
|
1923 |
#region 台帳からの呼び出し時、対象工事が画面にあるか |
|
1924 |
/// <summary> |
|
1925 |
/// 台帳からの呼び出し時、対象工事が画面にあるか |
|
1926 |
/// </summary> |
|
1927 |
/// <returns></returns> |
|
1928 |
private bool CheckTargetConstrction() |
|
1929 |
{ |
|
1930 |
try |
|
1931 |
{ |
|
1932 |
bool bDataExists = false; |
|
1933 |
// 全タブを対象に処理を行う |
|
1934 |
for (int i = (int)InputTabCount.Transport; i <= (int)InputTabCount.DisposalCost; i++) |
|
1935 |
{ |
|
1936 |
// グリッド取得 |
|
1937 |
DataGridViewEX dgv = m_dispGridControl[i]; |
|
1938 |
|
|
1939 |
// グリッドの行分処理を行う |
|
1940 |
foreach (DataGridViewRow wrkRow in dgv.Rows) |
|
1941 |
{ |
|
1942 |
// 金額が無い行は処理しない |
|
1943 |
if (CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.EntryPrice].Value) == 0) continue; |
|
1944 |
|
|
1945 |
// 工事コード |
|
1946 |
int nConstrCode = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.ConstractionCode].Value); |
|
1947 |
// 呼出工事比較 |
|
1948 |
if (m_ConstructionCode == nConstrCode) |
|
1949 |
{ |
|
1950 |
bDataExists = true; |
|
1951 |
break; |
|
1952 |
} |
|
1953 |
} |
|
1954 |
} |
|
1955 |
|
|
1956 |
return bDataExists; |
|
1957 |
} |
|
1958 |
catch (Exception ex) |
|
1959 |
{ |
|
1960 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1961 |
return false; |
|
1962 |
} |
|
1963 |
} |
|
1964 |
#endregion |
|
1965 |
|
|
1966 |
#region 台帳からの呼び出し時再表示 |
|
1967 |
/// <summary> |
|
1968 |
/// 台帳からの呼び出し時再表示 |
|
1969 |
/// </summary> |
|
1970 |
private void ReViewLedger() |
|
1971 |
{ |
|
1972 |
try |
|
1973 |
{ |
|
1974 |
// 呼出元が工事台帳かの判定 |
|
1975 |
if (!LedgerIsParent()) return; |
|
1976 |
|
|
1977 |
// 工事台帳のハンドルを取得する |
|
1978 |
int ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts; |
|
1979 |
int nParentProc = ClsExcute.SubFormHandleList[ProcessNo].ProcessNo; |
|
1980 |
FrmConstructionLedger frm = (FrmConstructionLedger)ClsExcute.SubFormHandleList[nParentProc].SubFormHandle; |
|
1981 |
// 再描画 |
|
1982 |
bool bRet = frm.ReViewLedge; |
|
1983 |
} |
|
1984 |
catch (Exception ex) |
|
1985 |
{ |
|
1986 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1987 |
} |
|
1988 |
} |
|
1989 |
#endregion |
|
1990 |
|
|
1886 | 1991 |
// ----- Debug Logic |
1887 | 1992 |
#region Debug Logic |
1888 | 1993 |
private void LedgerReCalc() |
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
5689 | 5689 |
if (Period < 16) |
5690 | 5690 |
lArrayRet[0] = work1; |
5691 | 5691 |
else |
5692 |
//lArrayRet[0] = work2;
|
|
5693 |
lArrayRet[0] = work3;
|
|
5692 |
lArrayRet[0] = work2; |
|
5693 |
//lArrayRet[0] = work3;
|
|
5694 | 5694 |
break; |
5695 | 5695 |
case (int)ProductDefine.ProductTypeDef.MassProductionType1: |
5696 | 5696 |
lArrayRet[0] = work3; |
他の形式にエクスポート: Unified diff