リビジョン 270
出勤日報データ開始・終了時間項目追加
業者請求データ行・列項目追加
工事予算書データ受注金額項目追加
業者支払データ明細協力金有無、初期値-1に変更
工事情報データコピー時、クリア忘れ項目修正
担当者変更時、金額にバグありを修正
工事情報・台帳一覧コンボボックスイベント修正
注文書発行、対象外設定不具合修正
業者請求まとめ修正中
出勤日報入力修正中
交通費・購入品入力台帳入力・一覧よりの呼び出しに対応した修正
メニューにシステムバージョンアップ時メッセージ追加
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 80;
|
|
| 17 |
public static int s_SystemVersion = 81;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs | ||
|---|---|---|
| 1009 | 1009 |
} |
| 1010 | 1010 |
#endregion |
| 1011 | 1011 |
|
| 1012 |
#region 工事詳細台帳支払いデータ一括登録 |
|
| 1012 |
#region 工事詳細台帳支払いデータ一括登録（手間・業者支払用）
|
|
| 1013 | 1013 |
/// <summary> |
| 1014 |
/// 工事詳細台帳支払いデータ一括登録 |
|
| 1014 |
/// 工事詳細台帳支払いデータ一括登録（手間・業者支払用）
|
|
| 1015 | 1015 |
/// </summary> |
| 1016 | 1016 |
/// <param name="EntryList"></param> |
| 1017 | 1017 |
/// <returns></returns> |
| ... | ... | |
| 1026 | 1026 |
bool bExists = true; |
| 1027 | 1027 |
bool bRet = true; |
| 1028 | 1028 |
List<int> ConstrCodeList = new List<int>(); |
| 1029 |
List<ConstructionLedgerExcute> ExecList = new List<ConstructionLedgerExcute>(); |
|
| 1030 |
int nLineCount = 0; |
|
| 1029 | 1031 |
|
| 1030 | 1032 |
foreach (ConstructionLedgerExcute CurRec in EntryList) |
| 1031 | 1033 |
{
|
| 1032 | 1034 |
strSQL.Clear(); |
| 1035 |
|
|
| 1036 |
// 工事番号が0の場合は処理しない |
|
| 1037 |
if (CurRec.ConstructionCode == 0) continue; |
|
| 1038 |
// グループ番号が0の場合は処理しない |
|
| 1039 |
if (CurRec.GroupCount == 0) continue; |
|
| 1040 |
// 行・列番号が0の場合は処理しない |
|
| 1041 |
if (CurRec.LineCount == 0 && CurRec.ColumnCount == 0) continue; |
|
| 1042 |
|
|
| 1033 | 1043 |
// キー作成 |
| 1034 | 1044 |
strSQL.AppendFormat(ExecDB.CreatePrimarykeyString(CurRec.ConstructionCode, |
| 1035 | 1045 |
CurRec.GroupCount, |
| 1036 | 1046 |
CurRec.LineCount, |
| 1037 | 1047 |
CurRec.ColumnCount)); |
| 1038 |
|
|
| 1039 |
List<ConstructionLedgerExcute> ExecList = new List<ConstructionLedgerExcute>(); |
|
| 1048 |
ExecList.Clear(); |
|
| 1040 | 1049 |
if (!ExecDB.SelectAction(strSQL.ToString(), ref ExecList, false)) continue; |
| 1041 |
if (ExecList.Count == 0) bExists = false; |
|
| 1050 |
if (ExecList.Count > 0) |
|
| 1051 |
bExists = true; |
|
| 1052 |
else |
|
| 1053 |
bExists = false; |
|
| 1042 | 1054 |
|
| 1043 | 1055 |
if (bExists) |
| 1044 | 1056 |
{ // データ存在時は支払金額更新
|
| ... | ... | |
| 1051 | 1063 |
false)) |
| 1052 | 1064 |
{
|
| 1053 | 1065 |
bRet = false; |
| 1054 |
ExecDB.rollback(); |
|
| 1055 | 1066 |
break; |
| 1056 | 1067 |
} |
| 1057 | 1068 |
} |
| 1058 | 1069 |
else |
| 1059 |
{ // データ未作成の場合は施工費の最大行番号で新規データ作成
|
|
| 1060 |
strSQL.Clear(); |
|
| 1061 |
strSQL.Append("SELECT MAX(LINECOUNT) FROM CONSTRUCTIONLEDGEREXCUTE");
|
|
| 1062 |
strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", CurRec.ConstructionCode);
|
|
| 1063 |
strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
|
|
| 1064 |
|
|
| 1065 |
ArrayList CountData = new ArrayList(); |
|
| 1066 |
ExecDB.ExecuteReader(strSQL.ToString(), ref CountData, false); |
|
| 1067 |
|
|
| 1068 |
object[] objRec = (object[])CountData[0]; |
|
| 1069 |
CurRec.LineCount = CommonMotions.cnvInt(objRec[0]) + 1; |
|
| 1070 |
{
|
|
| 1071 |
// 行番号が設定されていない場合は新規に取得する |
|
| 1072 |
if (CurRec.LineCount == 0) |
|
| 1073 |
{
|
|
| 1074 |
nLineCount = 0; |
|
| 1075 |
if (GetNewLineNo(ExecDB, CurRec, ref nLineCount)) |
|
| 1076 |
{
|
|
| 1077 |
bRet = false; |
|
| 1078 |
break; |
|
| 1079 |
} |
|
| 1080 |
CurRec.LineCount = nLineCount; |
|
| 1081 |
} |
|
| 1082 |
// 新規作成 |
|
| 1070 | 1083 |
if (!ExecDB.InsertAction(CurRec, false)) |
| 1071 | 1084 |
{
|
| 1072 | 1085 |
bRet = false; |
| 1073 |
ExecDB.rollback(); |
|
| 1074 | 1086 |
break; |
| 1075 | 1087 |
} |
| 1076 | 1088 |
} |
| ... | ... | |
| 1091 | 1103 |
ConstrCodeList.Add(CurRec.ConstructionCode); |
| 1092 | 1104 |
} |
| 1093 | 1105 |
} |
| 1106 |
// ループ後エラーがあれば処理終了 |
|
| 1107 |
if (!bRet) |
|
| 1108 |
{
|
|
| 1109 |
ExecDB.rollback(); |
|
| 1110 |
return bRet; |
|
| 1111 |
} |
|
| 1094 | 1112 |
|
| 1095 | 1113 |
// 台帳再計算 |
| 1096 | 1114 |
if (!LedgerRecalculate(ExecDB, ConstrCodeList)) |
| ... | ... | |
| 1104 | 1122 |
catch (System.Exception ex) |
| 1105 | 1123 |
{
|
| 1106 | 1124 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 1125 |
ExecDB.rollback(); |
|
| 1107 | 1126 |
return false; |
| 1108 | 1127 |
} |
| 1109 | 1128 |
finally |
| ... | ... | |
| 1113 | 1132 |
} |
| 1114 | 1133 |
} |
| 1115 | 1134 |
#endregion |
| 1135 |
|
|
| 1136 |
#region 工事台帳より新規の行番号を取得する |
|
| 1137 |
/// <summary> |
|
| 1138 |
/// 工事台帳より新規の行番号を取得する |
|
| 1139 |
/// </summary> |
|
| 1140 |
private static bool GetNewLineNo(IOConstructionLedgerExcute ExecDB, ConstructionLedgerExcute CurRec, ref int nLineCount) |
|
| 1141 |
{
|
|
| 1142 |
try |
|
| 1143 |
{
|
|
| 1144 |
StringBuilder strSQL = new StringBuilder(); |
|
| 1145 |
ArrayList CountData = new ArrayList(); |
|
| 1146 |
|
|
| 1147 |
// 行番号が0の場合は施工費の最大行番号で新規データ作成 |
|
| 1148 |
strSQL.Clear(); |
|
| 1149 |
strSQL.Append("SELECT MAX(LINECOUNT) FROM CONSTRUCTIONLEDGERDETAIL");
|
|
| 1150 |
strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", CurRec.ConstructionCode);
|
|
| 1151 |
strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
|
|
| 1152 |
strSQL.AppendFormat(" AND FLUCTUATIONFLG = {0}", (int)ConstructionLedgerDetail.FlucFlgDef.Normal);
|
|
| 1153 |
|
|
| 1154 |
CountData.Clear(); |
|
| 1155 |
if (!ExecDB.ExecuteReader(strSQL.ToString(), ref CountData, false)) return false; |
|
| 1156 |
|
|
| 1157 |
object[] objRec = (object[])CountData[0]; |
|
| 1158 |
nLineCount = CommonMotions.cnvInt(objRec[0]) + 1; |
|
| 1159 |
|
|
| 1160 |
// ----- 取得行以下を1行下げる |
|
| 1161 |
// 工事詳細台帳明細データ |
|
| 1162 |
strSQL.Clear(); |
|
| 1163 |
strSQL.Append("UPDATE CONSTRUCTIONLEDGERDETAIL SET LineCount = (LineCount + 1)");
|
|
| 1164 |
strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", CurRec.ConstructionCode);
|
|
| 1165 |
strSQL.AppendFormat(" AND LineCount >= {0}", nLineCount);
|
|
| 1166 |
if (!ExecDB.ExecuteNonQuery(strSQL.ToString(), false)) return false; |
|
| 1167 |
|
|
| 1168 |
// 工事詳細台帳実行データ |
|
| 1169 |
strSQL.Clear(); |
|
| 1170 |
strSQL.Append("UPDATE CONSTRUCTIONLEDGEREXCUTE SET LineCount = (LineCount + 1)");
|
|
| 1171 |
strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", CurRec.ConstructionCode);
|
|
| 1172 |
strSQL.AppendFormat(" AND LineCount >= {0}", nLineCount);
|
|
| 1173 |
if (!ExecDB.ExecuteNonQuery(strSQL.ToString(), false)) return false; |
|
| 1174 |
|
|
| 1175 |
return true; |
|
| 1176 |
} |
|
| 1177 |
catch (System.Exception ex) |
|
| 1178 |
{
|
|
| 1179 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1180 |
return false; |
|
| 1181 |
} |
|
| 1182 |
} |
|
| 1183 |
#endregion |
|
| 1116 | 1184 |
// ↑↑ ** ----- インターフェース ----- ** |
| 1117 | 1185 |
} |
| 1118 | 1186 |
} |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs | ||
|---|---|---|
| 61 | 61 |
public SecRangeType m_SecRange { get; set; } // 保護区分
|
| 62 | 62 |
public bool CanEditDeposit |
| 63 | 63 |
{
|
| 64 |
get { return m_GeneralAffairsFlg == 1; }
|
|
| 64 |
get { return m_GeneralAffairsFlg == (int)SecurityMaster.GeneAffDef.GeneralDep; }
|
|
| 65 | 65 |
} |
| 66 | 66 |
public bool CanEditDepositDetail |
| 67 | 67 |
{
|
| 68 |
get { return m_GeneralAffairsFlg == 0; }
|
|
| 68 |
get { return m_GeneralAffairsFlg == (int)SecurityMaster.GeneAffDef.OtherDep; }
|
|
| 69 | 69 |
} |
| 70 | 70 |
} |
| 71 | 71 |
#endregion |
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceDailyData.cs | ||
|---|---|---|
| 50 | 50 |
/// </summary> |
| 51 | 51 |
ActionResult, |
| 52 | 52 |
/// <summary> |
| 53 |
/// 残業時間
|
|
| 53 |
/// 開始時間
|
|
| 54 | 54 |
/// </summary> |
| 55 |
OvertimeHours,
|
|
| 55 |
StartTime,
|
|
| 56 | 56 |
/// <summary> |
| 57 |
/// 終了時間 |
|
| 58 |
/// </summary> |
|
| 59 |
CompTime, |
|
| 60 |
/// <summary> |
|
| 61 |
/// 日稼働合計時間 |
|
| 62 |
/// </summary> |
|
| 63 |
DayTimes, |
|
| 64 |
/// <summary> |
|
| 57 | 65 |
/// コメント |
| 58 | 66 |
/// </summary> |
| 59 | 67 |
WorkingComment, |
| 60 | 68 |
/// <summary> |
| 69 |
/// 夜間作業フラグ |
|
| 70 |
/// </summary> |
|
| 71 |
NightFlg, |
|
| 72 |
/// <summary> |
|
| 61 | 73 |
/// 登録年月日 |
| 62 | 74 |
/// </summary> |
| 63 | 75 |
EntryDate, |
| ... | ... | |
| 93 | 105 |
strcmd.Append(" ,DATE_FORMAT(AttendanceDate, '%Y/%m/%d')"); // 日報作成日
|
| 94 | 106 |
strcmd.Append(" ,SeqNo"); // 明細行番号
|
| 95 | 107 |
strcmd.Append(" ,ActionResult"); // 行動実績
|
| 96 |
strcmd.Append(" ,OvertimeHours"); // 残業時間
|
|
| 108 |
strcmd.Append(" ,DATE_FORMAT(StartTime, '%Y/%m/%d %H:%i:%s')"); // 開始時間
|
|
| 109 |
strcmd.Append(" ,DATE_FORMAT(CompTime, '%Y/%m/%d %H:%i:%s')"); // 終了時間
|
|
| 110 |
strcmd.Append(" ,DayTimes"); // 日稼働合計時間
|
|
| 97 | 111 |
strcmd.Append(" ,WorkingComment"); // コメント
|
| 112 |
strcmd.Append(" ,NightFlg"); // 夜間作業フラグ
|
|
| 98 | 113 |
strcmd.Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')"); // 登録年月日
|
| 99 | 114 |
strcmd.Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')"); // 更新年月日
|
| 100 | 115 |
strcmd.Append(" FROM AttendanceDailyData");
|
| ... | ... | |
| 192 | 207 |
} |
| 193 | 208 |
strcmd.Append(") VALUES (");
|
| 194 | 209 |
|
| 195 |
strcmd.AppendFormat(" {0}", work.PersonCode); // 担当者コード
|
|
| 210 |
strcmd.AppendFormat(" {0}", work.PersonCode); // 担当者コード
|
|
| 196 | 211 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')"
|
| 197 | 212 |
, work.AttendanceDate.ToShortDateString()); // 日報作成日 |
| 198 |
strcmd.AppendFormat(", {0}", work.SeqNo); // 明細行番号
|
|
| 199 |
strcmd.AppendFormat(",'{0}'", work.ActionResult); // 行動実績
|
|
| 200 |
strcmd.AppendFormat(", {0}", work.OvertimeHours); // 残業時間
|
|
| 201 |
strcmd.AppendFormat(",'{0}'", work.WorkingComment); // コメント
|
|
| 213 |
strcmd.AppendFormat(", {0}", work.SeqNo); // 明細行番号
|
|
| 214 |
strcmd.AppendFormat(",'{0}'", work.ActionResult); // 行動実績
|
|
| 215 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.StartTime); // 開始時間
|
|
| 216 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.CompTime); // 終了時間
|
|
| 217 |
strcmd.AppendFormat(", {0}", work.DayTimes); // 日稼働合計時間
|
|
| 218 |
strcmd.AppendFormat(",'{0}'", work.WorkingComment); // コメント
|
|
| 219 |
strcmd.AppendFormat(", {0}", work.NightFlg); // 夜間作業フラグ
|
|
| 202 | 220 |
|
| 203 | 221 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
|
| 204 | 222 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
|
| ... | ... | |
| 239 | 257 |
if (bDataFirst) strcmd.Append(" (");
|
| 240 | 258 |
else strcmd.Append(", (");
|
| 241 | 259 |
|
| 242 |
strcmd.AppendFormat(" {0}", work.PersonCode); // 担当者コード
|
|
| 260 |
strcmd.AppendFormat(" {0}", work.PersonCode); // 担当者コード
|
|
| 243 | 261 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')"
|
| 244 |
, work.AttendanceDate.ToShortDateString()); // 日報作成日 |
|
| 245 |
strcmd.AppendFormat(", {0}", work.SeqNo); // 明細行番号
|
|
| 246 |
strcmd.AppendFormat(",'{0}'", work.ActionResult); // 行動実績
|
|
| 247 |
strcmd.AppendFormat(", {0}", work.OvertimeHours); // 残業時間
|
|
| 248 |
strcmd.AppendFormat(",'{0}'", work.WorkingComment); // コメント
|
|
| 262 |
, work.AttendanceDate.ToShortDateString()); // 日報作成日 |
|
| 263 |
strcmd.AppendFormat(", {0}", work.SeqNo); // 明細行番号
|
|
| 264 |
strcmd.AppendFormat(",'{0}'", work.ActionResult); // 行動実績
|
|
| 265 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.StartTime); // 開始時間
|
|
| 266 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.CompTime); // 終了時間
|
|
| 267 |
strcmd.AppendFormat(", {0}", work.DayTimes); // 日稼働合計時間
|
|
| 268 |
strcmd.AppendFormat(",'{0}'", work.WorkingComment); // コメント
|
|
| 269 |
strcmd.AppendFormat(", {0}", work.NightFlg); // 夜間作業フラグ
|
|
| 249 | 270 |
|
| 250 | 271 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
|
| 251 | 272 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
|
| ... | ... | |
| 285 | 306 |
|
| 286 | 307 |
strcmd.AppendFormat(" PersonCode = {0}", data.PersonCode); // 担当者コード
|
| 287 | 308 |
strcmd.AppendFormat(",AttendanceDate = STR_TO_DATE('{0}','%Y/%m/%d')"
|
| 288 |
, data.AttendanceDate.ToShortDateString()); // 日報作成日
|
|
| 309 |
, data.AttendanceDate.ToShortDateString()); // 日報作成日 |
|
| 289 | 310 |
strcmd.AppendFormat(",SeqNo = {0} ", data.SeqNo); // 明細行番号
|
| 290 | 311 |
strcmd.AppendFormat(",ActionResult = '{0}'", data.ActionResult); // 行動実績
|
| 291 |
strcmd.AppendFormat(",OvertimeHours = {0}", data.OvertimeHours); // 残業時間
|
|
| 312 |
strcmd.AppendFormat(",StartTime = STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')"
|
|
| 313 |
, data.StartTime); // 開始時間 |
|
| 314 |
strcmd.AppendFormat(",CompTime = STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')"
|
|
| 315 |
, data.CompTime); // 終了時間 |
|
| 316 |
strcmd.AppendFormat(",DayTimes = {0}", data.DayTimes); // 日稼働合計時間
|
|
| 292 | 317 |
strcmd.AppendFormat(",WorkingComment = '{0}'", data.WorkingComment); // コメント
|
| 318 |
strcmd.AppendFormat(",NightFlg = {0}", data.NightFlg); // 夜間作業フラグ
|
|
| 293 | 319 |
|
| 294 | 320 |
strcmd.Append(", UpdateDate = NOW()");
|
| 295 | 321 |
strcmd.Append(AddSQLString); |
| ... | ... | |
| 364 | 390 |
case (int)TableColumn.ActionResult: |
| 365 | 391 |
strcmd.AppendFormat(" ActionResult = '{0}'", value.ToString());
|
| 366 | 392 |
break; |
| 367 |
case (int)TableColumn.OvertimeHours:
|
|
| 368 |
strcmd.AppendFormat(" OvertimeHours = {0}", (double)value);
|
|
| 393 |
case (int)TableColumn.StartTime:
|
|
| 394 |
strcmd.AppendFormat(" StartTime = STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", ((DateTime)value).ToString());
|
|
| 369 | 395 |
break; |
| 396 |
case (int)TableColumn.CompTime: |
|
| 397 |
strcmd.AppendFormat(" CompTime = STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", ((DateTime)value).ToString());
|
|
| 398 |
break; |
|
| 399 |
case (int)TableColumn.DayTimes: |
|
| 400 |
strcmd.AppendFormat(" DayTimes = {0}", (double)value);
|
|
| 401 |
break; |
|
| 370 | 402 |
case (int)TableColumn.WorkingComment: |
| 371 | 403 |
strcmd.AppendFormat(" WorkingComment = '{0}'", CommonMotions.cnvString(value));
|
| 372 | 404 |
break; |
| 405 |
case (int)TableColumn.NightFlg: |
|
| 406 |
strcmd.AppendFormat(" NightFlg = {0}", (int)value);
|
|
| 407 |
break; |
|
| 373 | 408 |
} |
| 374 | 409 |
|
| 375 | 410 |
strcmd.Append(", UpdateDate = NOW()");
|
| ... | ... | |
| 402 | 437 |
wrk.AttendanceDate = DateTime.Parse(objwrk[(int)TableColumn.AttendanceDate].ToString()); // 日報作成日 |
| 403 | 438 |
wrk.SeqNo = int.Parse(objwrk[(int)TableColumn.SeqNo].ToString()); // 明細行番号 |
| 404 | 439 |
wrk.ActionResult = objwrk[(int)TableColumn.ActionResult].ToString(); // 行動実績 |
| 405 |
wrk.OvertimeHours = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OvertimeHours]); // 残業時間 |
|
| 440 |
wrk.StartTime = DateTime.Parse(objwrk[(int)TableColumn.StartTime].ToString()); |
|
| 441 |
wrk.CompTime = DateTime.Parse(objwrk[(int)TableColumn.CompTime].ToString()); |
|
| 442 |
wrk.DayTimes = CommonMotions.cnvDouble(objwrk[(int)TableColumn.DayTimes]); |
|
| 406 | 443 |
wrk.WorkingComment = objwrk[(int)TableColumn.WorkingComment].ToString(); // 当日作業内容 |
| 444 |
wrk.NightFlg = int.Parse(objwrk[(int)TableColumn.NightFlg].ToString()); |
|
| 407 | 445 |
|
| 408 | 446 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
| 409 | 447 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs | ||
|---|---|---|
| 38 | 38 |
SeqNo, |
| 39 | 39 |
LineCount, |
| 40 | 40 |
ConstructionCode, |
| 41 |
ConstructionRowCnt, |
|
| 42 |
ConstructionColCnt, |
|
| 41 | 43 |
FieldName, |
| 42 | 44 |
BillPrice, |
| 43 | 45 |
HighwPrice, |
| ... | ... | |
| 61 | 63 |
|
| 62 | 64 |
#endregion |
| 63 | 65 |
|
| 64 |
#region パブリックメソッド
|
|
| 66 |
#region 検索
|
|
| 65 | 67 |
/// <summary> |
| 66 | 68 |
/// 検索 |
| 67 | 69 |
/// </summary> |
| ... | ... | |
| 79 | 81 |
{
|
| 80 | 82 |
// SQL作成（DateTime型が変換できないのでCharに変換しておく） |
| 81 | 83 |
strcmd.Append("SELECT");
|
| 82 |
strcmd.Append(" CompanyCode,TargetDate,SeqNo,LineCount,ConstructionCode,FieldName,BillPrice,HighwPrice,HardwPrice,IndsWasteTax,Note");
|
|
| 84 |
strcmd.Append(" CompanyCode");
|
|
| 85 |
strcmd.Append(", TargetDate");
|
|
| 86 |
strcmd.Append(", SeqNo");
|
|
| 87 |
strcmd.Append(", LineCount");
|
|
| 88 |
strcmd.Append(", ConstructionCode");
|
|
| 89 |
strcmd.Append(", ConstructionRowCnt");
|
|
| 90 |
strcmd.Append(", ConstructionColCnt");
|
|
| 91 |
strcmd.Append(", FieldName");
|
|
| 92 |
strcmd.Append(", BillPrice");
|
|
| 93 |
strcmd.Append(", HighwPrice");
|
|
| 94 |
strcmd.Append(", HardwPrice");
|
|
| 95 |
strcmd.Append(", IndsWasteTax");
|
|
| 96 |
strcmd.Append(", Note");
|
|
| 97 |
|
|
| 83 | 98 |
strcmd.Append(" ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
|
| 84 | 99 |
strcmd.Append(" ,DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
|
| 85 | 100 |
strcmd.Append(" FROM BillingDataDetail");
|
| ... | ... | |
| 105 | 120 |
} |
| 106 | 121 |
|
| 107 | 122 |
} |
| 123 |
#endregion |
|
| 108 | 124 |
|
| 125 |
#region 新規登録 |
|
| 109 | 126 |
/// <summary> |
| 110 | 127 |
/// 新規登録 |
| 111 | 128 |
/// </summary> |
| ... | ... | |
| 122 | 139 |
{
|
| 123 | 140 |
strcmd.Append("INSERT INTO BillingDataDetail");
|
| 124 | 141 |
|
| 125 |
strcmd.Append(" VALUES (");
|
|
| 142 |
strcmd.Append("(");
|
|
| 143 |
bool bFirst = true; |
|
| 144 |
foreach (var gender in Enum.GetValues(typeof(NameColumn))) |
|
| 145 |
{
|
|
| 146 |
if (!bFirst) strcmd.Append(" ,");
|
|
| 147 |
strcmd.Append(gender.ToString()); |
|
| 148 |
bFirst = false; |
|
| 149 |
} |
|
| 150 |
strcmd.Append(") VALUES (");
|
|
| 126 | 151 |
|
| 127 | 152 |
strcmd.AppendFormat(" {0}", work.CompanyCode.ToString());
|
| 128 | 153 |
strcmd.AppendFormat(", {0}", work.TargetDate.ToString());
|
| 129 | 154 |
strcmd.AppendFormat(", {0}", work.SeqNo.ToString());
|
| 130 | 155 |
strcmd.AppendFormat(", {0}", work.LineCount.ToString());
|
| 131 | 156 |
strcmd.AppendFormat(", {0}", work.ConstructionCode.ToString());
|
| 157 |
strcmd.AppendFormat(", {0}", work.ConstructionRowCnt.ToString());
|
|
| 158 |
strcmd.AppendFormat(", {0}", work.ConstructionColCnt.ToString());
|
|
| 132 | 159 |
strcmd.AppendFormat(", '{0}'", work.FieldName.ToString());
|
| 133 | 160 |
strcmd.AppendFormat(", {0}", work.BillPrice.ToString());
|
| 134 | 161 |
strcmd.AppendFormat(", {0}", work.HighwPrice.ToString());
|
| ... | ... | |
| 150 | 177 |
return false; |
| 151 | 178 |
} |
| 152 | 179 |
} |
| 180 |
#endregion |
|
| 153 | 181 |
|
| 182 |
#region 更新登録 |
|
| 154 | 183 |
/// <summary> |
| 155 | 184 |
/// 更新登録 |
| 156 | 185 |
/// </summary> |
| ... | ... | |
| 168 | 197 |
|
| 169 | 198 |
strcmd.Append(" SET");
|
| 170 | 199 |
|
| 171 |
strcmd.AppendFormat(" ConstructionCode = {0}", data.ConstructionCode.ToString());
|
|
| 172 |
strcmd.AppendFormat(",FieldName = '{0}'", data.FieldName);
|
|
| 173 |
strcmd.AppendFormat(",BillPrice = {0}", data.BillPrice.ToString());
|
|
| 174 |
strcmd.AppendFormat(",HighwPrice = {0}", data.HighwPrice.ToString());
|
|
| 175 |
strcmd.AppendFormat(",HardwPrice = {0}", data.HardwPrice.ToString());
|
|
| 176 |
strcmd.AppendFormat(",IndsWasteTax = {0}", data.IndsWasteTax.ToString());
|
|
| 177 |
strcmd.AppendFormat(",Note = '{0}'", data.Note);
|
|
| 200 |
strcmd.AppendFormat(" ConstructionCode = {0}", data.ConstructionCode.ToString());
|
|
| 201 |
strcmd.AppendFormat(", ConstructionRowCnt = {0}", data.ConstructionRowCnt.ToString());
|
|
| 202 |
strcmd.AppendFormat(", ConstructionColCnt = {0}", data.ConstructionColCnt.ToString());
|
|
| 203 |
strcmd.AppendFormat(", FieldName = '{0}'", data.FieldName);
|
|
| 204 |
strcmd.AppendFormat(", BillPrice = {0}", data.BillPrice.ToString());
|
|
| 205 |
strcmd.AppendFormat(", HighwPrice = {0}", data.HighwPrice.ToString());
|
|
| 206 |
strcmd.AppendFormat(", HardwPrice = {0}", data.HardwPrice.ToString());
|
|
| 207 |
strcmd.AppendFormat(", IndsWasteTax = {0}", data.IndsWasteTax.ToString());
|
|
| 208 |
strcmd.AppendFormat(", Note = '{0}'", data.Note);
|
|
| 178 | 209 |
|
| 179 | 210 |
strcmd.Append(", UpdateDate = NOW()");
|
| 180 | 211 |
strcmd.Append(AddSQLString); |
| ... | ... | |
| 189 | 220 |
return false; |
| 190 | 221 |
} |
| 191 | 222 |
} |
| 223 |
#endregion |
|
| 192 | 224 |
|
| 225 |
#region 削除 |
|
| 193 | 226 |
/// <summary> |
| 194 | 227 |
/// 削除 |
| 195 | 228 |
/// </summary> |
| ... | ... | |
| 214 | 247 |
return false; |
| 215 | 248 |
} |
| 216 | 249 |
} |
| 250 |
#endregion |
|
| 217 | 251 |
|
| 252 |
#region 構造体設定 |
|
| 218 | 253 |
/// <summary> |
| 219 | 254 |
/// 構造体設定 |
| 220 | 255 |
/// </summary> |
| ... | ... | |
| 230 | 265 |
wrk.SeqNo = int.Parse(objwrk[(int)NameColumn.SeqNo].ToString()); |
| 231 | 266 |
wrk.LineCount= int.Parse(objwrk[(int)NameColumn.LineCount].ToString()); |
| 232 | 267 |
wrk.ConstructionCode = long.Parse(objwrk[(int)NameColumn.ConstructionCode].ToString()); |
| 268 |
wrk.ConstructionRowCnt = int.Parse(objwrk[(int)NameColumn.ConstructionRowCnt].ToString()); |
|
| 269 |
wrk.ConstructionColCnt = int.Parse(objwrk[(int)NameColumn.ConstructionColCnt].ToString()); |
|
| 233 | 270 |
wrk.FieldName = objwrk[(int)NameColumn.FieldName].ToString(); |
| 234 | 271 |
wrk.BillPrice=long.Parse(objwrk[(int)NameColumn.BillPrice].ToString()); |
| 235 | 272 |
wrk.HighwPrice=long.Parse(objwrk[(int)NameColumn.HighwPrice].ToString()); |
| ... | ... | |
| 249 | 286 |
logger.ErrorFormat("システムエラー：：{0}：{1}：{2}", CommonMotions.GetMethodName(), ex.Message);
|
| 250 | 287 |
} |
| 251 | 288 |
} |
| 252 |
|
|
| 253 |
|
|
| 254 | 289 |
#endregion |
| 255 | 290 |
|
| 256 |
#region パブリックメソッド（特殊処理） |
|
| 257 |
|
|
| 291 |
#region プライマリキー文字列作成 |
|
| 292 |
/// <summary> |
|
| 293 |
/// プライマリキー文字列作成 |
|
| 294 |
/// </summary> |
|
| 295 |
/// <param name="CompanyCode"></param> |
|
| 296 |
/// <param name="TargetDate"></param> |
|
| 297 |
/// <param name="SeqNo"></param> |
|
| 298 |
/// <param name="LineCount"></param> |
|
| 299 |
/// <returns></returns> |
|
| 258 | 300 |
public string CreatePrimarykeyString(int CompanyCode, int TargetDate,int SeqNo, int LineCount) |
| 259 | 301 |
{
|
| 260 | 302 |
StringBuilder strWork = new StringBuilder(); |
| 261 | 303 |
try |
| 262 | 304 |
{
|
| 263 |
strWork.AppendFormat(" Where CompanyCode = {0} and TargetDate = {1} and SeqNo = {2} and LineCount = {3}", CompanyCode, TargetDate, SeqNo, LineCount);
|
|
| 305 |
strWork.AppendFormat(" Where CompanyCode = {0}", CompanyCode);
|
|
| 306 |
strWork.AppendFormat(" And TargetDate = {0}", TargetDate);
|
|
| 307 |
strWork.AppendFormat(" And SeqNo = {0}", SeqNo);
|
|
| 308 |
strWork.AppendFormat(" And LineCount = {0}", LineCount);
|
|
| 264 | 309 |
|
| 265 | 310 |
} |
| 266 | 311 |
catch (Exception ex) |
| ... | ... | |
| 270 | 315 |
|
| 271 | 316 |
return strWork.ToString(); |
| 272 | 317 |
} |
| 318 |
#endregion |
|
| 273 | 319 |
|
| 274 |
|
|
| 320 |
#region 行ロック |
|
| 275 | 321 |
/// <summary> |
| 276 | 322 |
/// 行ロック |
| 277 | 323 |
/// </summary> |
| ... | ... | |
| 287 | 333 |
|
| 288 | 334 |
try |
| 289 | 335 |
{
|
| 290 |
strcmd.AppendFormat("select * from BillingDataDetail where CompanyCode = {0} and TargetDate = {1} and SeqNo = {2} and LineCount = {3} for update;",
|
|
| 291 |
CompanyCode, TargetDate, SeqNo, LineCount); |
|
| 336 |
strcmd.Append("Select * From BillingDataDetail");
|
|
| 337 |
strcmd.AppendFormat(" Where CompanyCode = {0}", CompanyCode);
|
|
| 338 |
strcmd.AppendFormat(" And TargetDate = {0}", TargetDate);
|
|
| 339 |
strcmd.AppendFormat(" And SeqNo = {0}", SeqNo);
|
|
| 340 |
strcmd.AppendFormat(" And LineCount = {0}", LineCount);
|
|
| 341 |
strcmd.Append(" For update;");
|
|
| 292 | 342 |
|
| 293 | 343 |
// SQL実行 |
| 294 | 344 |
if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false; |
| ... | ... | |
| 303 | 353 |
|
| 304 | 354 |
|
| 305 | 355 |
} |
| 306 |
|
|
| 307 | 356 |
#endregion |
| 308 | 357 |
|
| 309 | 358 |
} |
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs | ||
|---|---|---|
| 899 | 899 |
// SQL実行 |
| 900 | 900 |
if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false; |
| 901 | 901 |
|
| 902 |
//strcmd.Append("UPDATE ConstructionBaseInfo SET EntryDate = TO_DATE(TO_CHAR(sysdate,'%Y/%m/%d %H:%i:%s'),'%Y/%m/%d %H:%i:%s')");
|
|
| 903 |
//strcmd.Append(", UpdateDate = TO_DATE(TO_CHAR(sysdate,'%Y/%m/%d %H:%i:%s'),'%Y/%m/%d %H:%i:%s')");
|
|
| 904 |
//strcmd.Append( CreatePrimarykeyString(FromCode); |
|
| 902 |
strcmd.Clear(); |
|
| 903 |
strcmd.Append("UPDATE ConstructionBaseInfo");
|
|
| 904 |
strcmd.Append(" SET");
|
|
| 905 |
strcmd.AppendFormat(" TyingFlg = {0}", (int)ConstructionBaseInfo.TyingFlgDef.Standard);
|
|
| 906 |
strcmd.AppendFormat(", JoinFlg = {0}", (int)ConstructionBaseInfo.JoinFlgDef.Standard);
|
|
| 907 |
strcmd.AppendFormat(", ConstructionPeriodStart2 = STR_TO_DATE('{0}', '%Y/%m/%d %H:%i:%s')", DateTime.MinValue.ToString());
|
|
| 908 |
strcmd.AppendFormat(", ConstructionPeriodEnd2 = STR_TO_DATE('{0}', '%Y/%m/%d %H:%i:%s')", DateTime.MinValue.ToString());
|
|
| 909 |
strcmd.Append(CreatePrimarykeyString(ToCode)); |
|
| 905 | 910 |
|
| 906 |
//// SQL実行
|
|
| 907 |
//if (!ExecuteNonQuery(strcmd, bConnect)) return false;
|
|
| 911 |
// SQL実行 |
|
| 912 |
if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
|
|
| 908 | 913 |
|
| 909 | 914 |
return true; |
| 910 | 915 |
} |
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBudget.cs | ||
|---|---|---|
| 61 | 61 |
I_SalaryFlg, // 指導員給与振分区分 |
| 62 | 62 |
I_SalaryDays, // 指導員振分日数 |
| 63 | 63 |
|
| 64 |
OrdersDecisionPrice, // 税抜受注決定金額 |
|
| 64 | 65 |
EntryDate, |
| 65 | 66 |
UpdateDate, |
| 66 | 67 |
} |
| ... | ... | |
| 112 | 113 |
strcmd.Append(" ,A_SalaryDays"); // 副担当者振分日数
|
| 113 | 114 |
strcmd.Append(" ,I_SalaryFlg"); // 指導員給与振分区分
|
| 114 | 115 |
strcmd.Append(" ,I_SalaryDays"); // 指導員振分日数
|
| 116 |
strcmd.Append(" ,OrdersDecisionPrice"); // 税抜受注決定金額
|
|
| 115 | 117 |
|
| 116 | 118 |
strcmd.Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
|
| 117 | 119 |
strcmd.Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
|
| ... | ... | |
| 241 | 243 |
strcmd.AppendFormat(", {0}", work.InstructorCosts); // 工事指導員給与
|
| 242 | 244 |
|
| 243 | 245 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')",
|
| 244 |
work.CreateDate.ToShortDateString()); // 作成日
|
|
| 246 |
work.CreateDate.ToShortDateString()); // 作成日 |
|
| 245 | 247 |
strcmd.AppendFormat(", {0}", work.ConstructionTimes); // 工期（単位・月）
|
| 246 | 248 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')",
|
| 247 | 249 |
work.ConstructionStart.ToShortDateString()); // 契約工期開始 |
| ... | ... | |
| 255 | 257 |
strcmd.AppendFormat(", {0}", work.A_SalaryDays); // 副担当者振分日数
|
| 256 | 258 |
strcmd.AppendFormat(", {0}", work.I_SalaryFlg); // 指導員給与振分区分
|
| 257 | 259 |
strcmd.AppendFormat(", {0}", work.I_SalaryDays); // 指導員振分日数
|
| 260 |
strcmd.AppendFormat(", {0}", work.OrdersDecisionPrice); // 税抜受注決定金額
|
|
| 258 | 261 |
|
| 259 | 262 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
|
| 260 | 263 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
|
| ... | ... | |
| 329 | 332 |
strcmd.AppendFormat(", {0}", work.A_SalaryDays); // 副担当者振分日数
|
| 330 | 333 |
strcmd.AppendFormat(", {0}", work.I_SalaryFlg); // 指導員給与振分区分
|
| 331 | 334 |
strcmd.AppendFormat(", {0}", work.I_SalaryDays); // 指導員振分日数
|
| 335 |
strcmd.AppendFormat(", {0}", work.OrdersDecisionPrice); // 税抜受注決定金額
|
|
| 332 | 336 |
|
| 333 | 337 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
|
| 334 | 338 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
|
| ... | ... | |
| 380 | 384 |
strcmd.AppendFormat(", InstructorName = '{0}'", data.InstructorName); // 工事指導員名
|
| 381 | 385 |
strcmd.AppendFormat(", InstructorCosts = {0}", data.InstructorCosts); // 工事指導員給与
|
| 382 | 386 |
strcmd.AppendFormat(", CreateDate = STR_TO_DATE('{0}','%Y/%m/%d')",
|
| 383 |
data.CreateDate.ToShortDateString()); // 作成日
|
|
| 387 |
data.CreateDate.ToShortDateString()); // 作成日 |
|
| 384 | 388 |
strcmd.AppendFormat(", ConstructionTimes = {0}", data.ConstructionTimes); // 工期（単位・月）
|
| 385 | 389 |
strcmd.AppendFormat(", ConstructionStart = STR_TO_DATE('{0}','%Y/%m/%d')",
|
| 386 | 390 |
data.ConstructionStart.ToShortDateString()); // 契約工期開始 |
| ... | ... | |
| 395 | 399 |
strcmd.AppendFormat(", A_SalaryDays = {0}", data.A_SalaryDays); // 副担当者振分日数
|
| 396 | 400 |
strcmd.AppendFormat(", I_SalaryFlg = {0}", data.I_SalaryFlg); // 指導員給与振分区分
|
| 397 | 401 |
strcmd.AppendFormat(", I_SalaryDays = {0}", data.I_SalaryDays); // 指導員振分日数
|
| 402 |
strcmd.AppendFormat(", OrdersDecisionPrice = {0}", data.OrdersDecisionPrice); // 税抜受注決定金額
|
|
| 398 | 403 |
|
| 399 | 404 |
strcmd.Append(", UpdateDate = NOW()");
|
| 400 | 405 |
strcmd.Append(AddSQLString); |
| ... | ... | |
| 516 | 521 |
case (int)TableColumn.I_SalaryDays: // 指導員振分日数 |
| 517 | 522 |
strcmd.AppendFormat(" I_SalaryDays = {0}", ((int)value).ToString());
|
| 518 | 523 |
break; |
| 524 |
case (int)TableColumn.OrdersDecisionPrice: // 税抜受注決定金額 |
|
| 525 |
strcmd.AppendFormat(", OrdersDecisionPrice = {0}", ((double)value).ToString());
|
|
| 526 |
break; |
|
| 527 |
|
|
| 519 | 528 |
} |
| 520 | 529 |
|
| 521 | 530 |
strcmd.Append(", UpdateDate = NOW()");
|
| ... | ... | |
| 570 | 579 |
wrk.I_SalaryFlg = int.Parse(objwrk[(int)TableColumn.I_SalaryFlg].ToString()); // 指導員給与振分区分 |
| 571 | 580 |
wrk.I_SalaryDays = int.Parse(objwrk[(int)TableColumn.I_SalaryDays].ToString()); // 指導員振分日数 |
| 572 | 581 |
|
| 582 |
wrk.OrdersDecisionPrice = double.Parse(objwrk[(int)TableColumn.OrdersDecisionPrice].ToString()); // 税抜受注決定金額 |
|
| 583 |
|
|
| 573 | 584 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
| 574 | 585 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
| 575 | 586 |
} |
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentDataDetail.cs | ||
|---|---|---|
| 160 | 160 |
strcmd.AppendFormat(", {0}", work.HardwPrice.ToString());
|
| 161 | 161 |
strcmd.AppendFormat(", {0}", work.IndsWasteTax.ToString());
|
| 162 | 162 |
strcmd.AppendFormat(", {0}", work.CnstrPrice.ToString());
|
| 163 |
if ((work.CnstrPriceExist == -1) || (work.ApprovalPersonCode == 0)) |
|
| 164 |
{
|
|
| 165 |
strcmd.Append(", null");
|
|
| 166 |
} |
|
| 167 |
else |
|
| 168 |
{
|
|
| 169 |
strcmd.AppendFormat(", {0}", work.CnstrPriceExist.ToString());
|
|
| 170 |
} |
|
| 163 |
strcmd.AppendFormat(", {0}", work.CnstrPriceExist.ToString());
|
|
| 171 | 164 |
strcmd.AppendFormat(", {0}", work.ApprovalPersonCode.ToString());
|
| 172 | 165 |
strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.ApprovalDate.ToShortDateString());
|
| 173 | 166 |
strcmd.AppendFormat(", {0}", work.ApprovalEndFlg.ToString());
|
| ... | ... | |
| 214 | 207 |
strcmd.AppendFormat(",HardwPrice = {0}", data.HardwPrice.ToString());
|
| 215 | 208 |
strcmd.AppendFormat(",IndsWasteTax = {0}", data.IndsWasteTax.ToString());
|
| 216 | 209 |
strcmd.AppendFormat(",CnstrPrice = {0}", data.CnstrPrice.ToString());
|
| 217 |
if ((data.CnstrPriceExist == -1) || (data.ApprovalPersonCode == 0)) |
|
| 218 |
{
|
|
| 219 |
strcmd.Append(",CnstrPriceExist = null");
|
|
| 220 |
} |
|
| 221 |
else |
|
| 222 |
{
|
|
| 223 |
strcmd.AppendFormat(",CnstrPriceExist = {0}", data.CnstrPriceExist.ToString());
|
|
| 224 |
} |
|
| 210 |
strcmd.AppendFormat(",CnstrPriceExist = {0}", data.CnstrPriceExist.ToString());
|
|
| 225 | 211 |
strcmd.AppendFormat(",ApprovalPersonCode = {0}", data.ApprovalPersonCode.ToString());
|
| 226 | 212 |
strcmd.AppendFormat(",ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
|
| 227 | 213 |
strcmd.AppendFormat(",ApprovalEndFlg = {0}", data.ApprovalEndFlg.ToString());
|
| branches/src/ProcessManagement/ProcessManagement/DataModel/AttendanceDailyData.cs | ||
|---|---|---|
| 28 | 28 |
/// </summary> |
| 29 | 29 |
private string m_ActionResult = string.Empty; |
| 30 | 30 |
/// <summary> |
| 31 |
/// 残業時間
|
|
| 31 |
/// 開始時間
|
|
| 32 | 32 |
/// </summary> |
| 33 |
private double m_OvertimeHours = 0;
|
|
| 33 |
private DateTime m_StartTime = DateTime.Now;
|
|
| 34 | 34 |
/// <summary> |
| 35 |
/// 終了時間 |
|
| 36 |
/// </summary> |
|
| 37 |
private DateTime m_CompTime = DateTime.Now; |
|
| 38 |
/// <summary> |
|
| 39 |
/// 日稼働合計時間 |
|
| 40 |
/// </summary> |
|
| 41 |
private double m_DayTimes = 0; |
|
| 42 |
/// <summary> |
|
| 35 | 43 |
/// コメント |
| 36 | 44 |
/// </summary> |
| 37 | 45 |
private string m_WorkingComment = string.Empty; |
| 38 | 46 |
/// <summary> |
| 47 |
/// 夜間作業フラグ |
|
| 48 |
/// </summary> |
|
| 49 |
private int m_NightFlg = 0; |
|
| 50 |
/// <summary> |
|
| 39 | 51 |
/// 登録年月日 |
| 40 | 52 |
/// </summary> |
| 41 | 53 |
private DateTime m_EntryDate = DateTime.Now; |
| ... | ... | |
| 79 | 91 |
set { m_ActionResult = value; }
|
| 80 | 92 |
} |
| 81 | 93 |
/// <summary> |
| 82 |
/// 残業時間
|
|
| 94 |
/// 開始時間
|
|
| 83 | 95 |
/// </summary> |
| 84 |
public double OvertimeHours
|
|
| 96 |
public DateTime StartTime
|
|
| 85 | 97 |
{
|
| 86 |
get { return m_OvertimeHours; }
|
|
| 87 |
set { m_OvertimeHours = value; }
|
|
| 98 |
get { return m_StartTime; }
|
|
| 99 |
set { m_StartTime = value; }
|
|
| 88 | 100 |
} |
| 89 | 101 |
/// <summary> |
| 102 |
/// 終了時間 |
|
| 103 |
/// </summary> |
|
| 104 |
public DateTime CompTime |
|
| 105 |
{
|
|
| 106 |
get { return m_CompTime; }
|
|
| 107 |
set { m_CompTime = value; }
|
|
| 108 |
} |
|
| 109 |
/// <summary> |
|
| 110 |
/// 日稼働合計時間 |
|
| 111 |
/// </summary> |
|
| 112 |
public double DayTimes |
|
| 113 |
{
|
|
| 114 |
get { return m_DayTimes; }
|
|
| 115 |
set { m_DayTimes = value; }
|
|
| 116 |
} |
|
| 117 |
/// <summary> |
|
| 90 | 118 |
/// 作業コメント |
| 91 | 119 |
/// </summary> |
| 92 | 120 |
public string WorkingComment |
| ... | ... | |
| 95 | 123 |
set { m_WorkingComment = value; }
|
| 96 | 124 |
} |
| 97 | 125 |
/// <summary> |
| 126 |
/// 夜間作業フラグ |
|
| 127 |
/// </summary> |
|
| 128 |
public int NightFlg |
|
| 129 |
{
|
|
| 130 |
get { return m_NightFlg; }
|
|
| 131 |
set { m_NightFlg = value; }
|
|
| 132 |
} |
|
| 133 |
/// <summary> |
|
| 98 | 134 |
/// 登録年月日 |
| 99 | 135 |
/// </summary> |
| 100 | 136 |
public DateTime EntryDate |
| branches/src/ProcessManagement/ProcessManagement/DataModel/BillingDataDetail.cs | ||
|---|---|---|
| 9 | 9 |
public class BillingDataDetail |
| 10 | 10 |
{
|
| 11 | 11 |
#region メンバ変数 |
| 12 |
private int m_CompanyCode = 0; // 協力会社コード |
|
| 13 |
private int m_TargetDate = 0; // 対象年月 |
|
| 14 |
private int m_SeqNo = 0; // 連番 |
|
| 15 |
private int m_LineCount = 0; // 行番号 |
|
| 16 |
private long m_ConstructionCode = 0; // 工事番号 |
|
| 17 |
private string m_FieldName = ""; // 現場名 |
|
| 18 |
private long m_BillPrice = 0; // 請求金額 |
|
| 19 |
private long m_HighwPrice = 0; // 高速代 |
|
| 20 |
private long m_HardwPrice = 0; // 金物代 |
|
| 21 |
private long m_IndsWasteTax = 0; // 産廃税 |
|
| 22 |
private string m_Note = ""; // 備考 |
|
| 23 |
private DateTime m_EntryDate = DateTime.Now; // 登録日付 |
|
| 24 |
private DateTime m_UpdateDate = DateTime.Now; // 更新日付 |
|
| 12 |
/// <summary> |
|
| 13 |
/// 協力会社コード |
|
| 14 |
/// </summary> |
|
| 15 |
private int m_CompanyCode = 0; |
|
| 16 |
/// <summary> |
|
| 17 |
/// 対象年月 |
|
| 18 |
/// </summary> |
|
| 19 |
private int m_TargetDate = 0; |
|
| 20 |
/// <summary> |
|
| 21 |
/// 連番 |
|
| 22 |
/// </summary> |
|
| 23 |
private int m_SeqNo = 0; |
|
| 24 |
/// <summary> |
|
| 25 |
/// 行番号 |
|
| 26 |
/// </summary> |
|
| 27 |
private int m_LineCount = 0; |
|
| 28 |
/// <summary> |
|
| 29 |
/// 工事番号 |
|
| 30 |
/// </summary> |
|
| 31 |
private long m_ConstructionCode = 0; |
|
| 32 |
/// <summary> |
|
| 33 |
/// 行番号 |
|
| 34 |
/// </summary> |
|
| 35 |
private int m_ConstructionRowCnt = 0; |
|
| 36 |
/// <summary> |
|
| 37 |
/// 列番号 |
|
| 38 |
/// </summary> |
|
| 39 |
private int m_ConstructionColCnt = 0; |
|
| 40 |
/// <summary> |
|
| 41 |
/// 現場名 |
|
| 42 |
/// </summary> |
|
| 43 |
private string m_FieldName = ""; |
|
| 44 |
/// <summary> |
|
| 45 |
/// 請求金額 |
|
| 46 |
/// </summary> |
|
| 47 |
private long m_BillPrice = 0; |
|
| 48 |
/// <summary> |
|
| 49 |
// 高速代 |
|
| 50 |
/// </summary> |
|
| 51 |
private long m_HighwPrice = 0; |
|
| 52 |
/// <summary> |
|
| 53 |
/// 金物代 |
|
| 54 |
/// </summary> |
|
| 55 |
private long m_HardwPrice = 0; |
|
| 56 |
/// <summary> |
|
| 57 |
/// 産廃税 |
|
| 58 |
/// </summary> |
|
| 59 |
private long m_IndsWasteTax = 0; |
|
| 60 |
/// <summary> |
|
| 61 |
/// 備考 |
|
| 62 |
/// </summary> |
|
| 63 |
private string m_Note = ""; |
|
| 64 |
/// <summary> |
|
| 65 |
/// 登録日付 |
|
| 66 |
/// </summary> |
|
| 67 |
private DateTime m_EntryDate = DateTime.Now; |
|
| 68 |
/// <summary> |
|
| 69 |
/// 更新日付 |
|
| 70 |
/// </summary> |
|
| 71 |
private DateTime m_UpdateDate = DateTime.Now; |
|
| 25 | 72 |
#endregion |
| 26 | 73 |
|
| 27 | 74 |
#region コンストラクタ |
| ... | ... | |
| 72 | 119 |
set { m_ConstructionCode = value; }
|
| 73 | 120 |
} |
| 74 | 121 |
/// <summary> |
| 122 |
/// 行番号 |
|
| 123 |
/// </summary> |
|
| 124 |
public int ConstructionRowCnt |
|
| 125 |
{
|
|
| 126 |
get { return m_ConstructionRowCnt; }
|
|
| 127 |
set { m_ConstructionRowCnt = value; }
|
|
| 128 |
} |
|
| 129 |
/// <summary> |
|
| 130 |
/// 列番号 |
|
| 131 |
/// </summary> |
|
| 132 |
public int ConstructionColCnt |
|
| 133 |
{
|
|
| 134 |
get { return m_ConstructionColCnt; }
|
|
| 135 |
set { m_ConstructionColCnt = value; }
|
|
| 136 |
} |
|
| 137 |
/// <summary> |
|
| 75 | 138 |
/// 現場名 |
| 76 | 139 |
/// </summary> |
| 77 | 140 |
public string FieldName |
| branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBudget.cs | ||
|---|---|---|
| 10 | 10 |
/// </summary> |
| 11 | 11 |
public class ConstructionBudget |
| 12 | 12 |
{
|
| 13 |
|
|
| 13 | 14 |
#region メンバ変数 |
| 14 | 15 |
|
| 15 | 16 |
private int m_ConstructionCode = 0; // 工事コード |
| ... | ... | |
| 41 | 42 |
private int m_I_SalaryFlg = 0; // 指導員給与振分区分 |
| 42 | 43 |
private int m_I_SalaryDays = 0; // 指導員振分日数 |
| 43 | 44 |
|
| 45 |
private double m_OrdersDecisionPrice = 0; // 税抜受注決定金額 |
|
| 46 |
|
|
| 44 | 47 |
private DateTime m_EntryDate = DateTime.Now; // 登録日付 |
| 45 | 48 |
private DateTime m_UpdateDate = DateTime.Now; // 更新日付 |
| 46 | 49 |
#endregion |
| ... | ... | |
| 220 | 223 |
get { return m_I_SalaryDays; }
|
| 221 | 224 |
set { m_I_SalaryDays = value; }
|
| 222 | 225 |
} |
| 223 |
|
|
| 224 | 226 |
/// <summary> |
| 227 |
/// 税抜受注決定金額 |
|
| 228 |
/// </summary> |
|
| 229 |
public double OrdersDecisionPrice |
|
| 230 |
{
|
|
| 231 |
get { return m_OrdersDecisionPrice; }
|
|
| 232 |
set { m_OrdersDecisionPrice = value; }
|
|
| 233 |
} |
|
| 234 |
/// <summary> |
|
| 225 | 235 |
/// 登録日付 |
| 226 | 236 |
/// </summary> |
| 227 | 237 |
public DateTime EntryDate |
| branches/src/ProcessManagement/ProcessManagement/DataModel/PaymentDataDetail.cs | ||
|---|---|---|
| 21 | 21 |
private long m_HardwPrice = 0; // 金物代 |
| 22 | 22 |
private long m_IndsWasteTax = 0; // 産廃税 |
| 23 | 23 |
private long m_CnstrPrice = 0; // 協力金 |
| 24 |
private int m_CnstrPriceExist =0; // 協力金有無
|
|
| 24 |
private int m_CnstrPriceExist = -1; // 協力金有無
|
|
| 25 | 25 |
private int m_ApprovalPersonCode = 0; // 承認担当者コード |
| 26 | 26 |
private DateTime m_ApprovalDate = DateTime.Now; // 担当者承認日付 |
| 27 | 27 |
private int m_ApprovalEndFlg = 0; // 承認完了フラグ |
| branches/src/ProcessManagement/ProcessManagement/DataModel/SecurityMaster.cs | ||
|---|---|---|
| 20 | 20 |
public enum GeneAffDef |
| 21 | 21 |
{
|
| 22 | 22 |
/// <summary> |
| 23 |
/// 総務以外 |
|
| 23 |
/// 総務以外:0
|
|
| 24 | 24 |
/// </summary> |
| 25 | 25 |
OtherDep = 0, |
| 26 | 26 |
/// <summary> |
| 27 |
/// 総務業務対象 |
|
| 27 |
/// 総務業務対象:1
|
|
| 28 | 28 |
/// </summary> |
| 29 | 29 |
GeneralDep, |
| 30 | 30 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs | ||
|---|---|---|
| 935 | 935 |
} |
| 936 | 936 |
else |
| 937 | 937 |
{
|
| 938 |
if (PaIWork.CompanyCode == 0 |
|
| 939 |
|| PaIWork.TargetDate == 0 |
|
| 940 |
|| PaIWork.SeqNo == 0 |
|
| 941 |
|| PaIWork.LineCount == 0) continue; |
|
| 942 |
|
|
| 938 | 943 |
// 業者請求明細データ更新 |
| 939 | 944 |
if (!PaymentDataDetailUpdate(PayDetailDB, PaIWork)) |
| 940 | 945 |
{
|
| ... | ... | |
| 947 | 952 |
nBSeqNo = PaIWork.SeqNo; |
| 948 | 953 |
nBLineCount = PaIWork.LineCount; |
| 949 | 954 |
} |
| 950 |
|
|
| 951 |
// 支払承認情報データ作成 |
|
| 952 |
if (!PaymentApprovalInfoCreate(PayAppDB, PaIWork)) |
|
| 953 |
{
|
|
| 954 |
bSuccess = false; |
|
| 955 |
break; |
|
| 956 |
} |
|
| 957 | 955 |
} |
| 958 | 956 |
if (!bSuccess) |
| 959 | 957 |
{
|
| ... | ... | |
| 1007 | 1005 |
} |
| 1008 | 1006 |
#endregion |
| 1009 | 1007 |
|
| 1010 |
#region 申請時：支払承認情報データ作成 |
|
| 1011 |
/// <summary> |
|
| 1012 |
/// 申請時：支払承認情報データ作成 |
|
| 1013 |
/// </summary> |
|
| 1014 |
/// <returns></returns> |
|
| 1015 |
private bool PaymentApprovalInfoCreate(IOPaymentApprovalInfo PayAppDB, |
|
| 1016 |
PaymentApprovalInfo PaIWork) |
|
| 1017 |
{
|
|
| 1018 |
try |
|
| 1019 |
{
|
|
| 1020 |
// 日付を初期値にする |
|
| 1021 |
PaIWork.ApprovalDate = new DateTime(2001, 1, 1); |
|
| 1022 |
if (!PayAppDB.InsertAction(PaIWork, false)) return false; |
|
| 1023 |
|
|
| 1024 |
return true; |
|
| 1025 |
} |
|
| 1026 |
catch (System.Exception ex) |
|
| 1027 |
{
|
|
| 1028 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1029 |
return false; |
|
| 1030 |
} |
|
| 1031 |
} |
|
| 1032 |
#endregion |
|
| 1033 |
|
|
| 1034 | 1008 |
#region 支払承認情報データ更新処理 |
| 1035 | 1009 |
/// <summary> |
| 1036 | 1010 |
/// 支払承認情報データ更新処理 |
| ... | ... | |
| 1151 | 1125 |
{
|
| 1152 | 1126 |
StringBuilder strSQL = new StringBuilder(); |
| 1153 | 1127 |
strSQL.Append("Select");
|
| 1154 |
strSQL.Append(" B.COMPANYCODE");
|
|
| 1155 |
strSQL.Append(", B.TARGETDATE");
|
|
| 1156 |
strSQL.Append(", B.SEQNO");
|
|
| 1157 |
strSQL.Append(", B.LINECOUNT");
|
|
| 1158 |
strSQL.Append(", B.APPROVALNO");
|
|
| 1159 |
strSQL.Append(", B.APPROVALPERSON");
|
|
| 1160 |
strSQL.Append(", B.APPROVALPERSONNAME");
|
|
| 1161 |
strSQL.Append(", B.APPROVALAUTHORITY");
|
|
| 1162 |
strSQL.Append(", DATE_FORMAT(B.APPROVALDATE, '%Y/%m/%d')");
|
|
| 1128 |
strSQL.Append(" A.COMPANYCODE");
|
|
| 1129 |
strSQL.Append(", A.TARGETDATE");
|
|
| 1130 |
strSQL.Append(", A.SEQNO");
|
|
| 1131 |
strSQL.Append(", A.LINECOUNT");
|
|
| 1132 |
strSQL.Append(", D.DisplayOrder");
|
|
| 1133 |
strSQL.Append(", D.ApprovalPerson");
|
|
| 1134 |
strSQL.Append(", E.PersonName");
|
|
| 1135 |
strSQL.Append(", ifnull(B.ApprovalAuthority, D.ApprovalAuthority)");
|
|
| 1136 |
strSQL.Append(", ifnull(DATE_FORMAT(B.APPROVALDATE, '%Y/%m/%d'), DATE(NOW()))");
|
|
| 1163 | 1137 |
strSQL.Append(" From personapproval As C");
|
| 1138 |
strSQL.Append(" LEFT JOIN personinchargemaster As F ON F.PersonCode = C.PersonCode");
|
|
| 1164 | 1139 |
strSQL.Append(", paymentdatadetail As A");
|
| 1165 | 1140 |
strSQL.Append(" LEFT JOIN paymentapprovalinfo As B");
|
| 1166 | 1141 |
strSQL.Append(" ON B.COMPANYCODE = A.COMPANYCODE");
|
| ... | ... | |
| 1168 | 1143 |
strSQL.Append(" And B.SEQNO = A.SEQNO");
|
| 1169 | 1144 |
strSQL.Append(" And B.LINECOUNT = A.LINECOUNT");
|
| 1170 | 1145 |
strSQL.AppendFormat(" And B.APPROVALPERSON = {0}", CommonMotions.LoginUserData.PersonCode);
|
| 1146 |
strSQL.Append(", approvalmaster As D");
|
|
| 1147 |
strSQL.Append(" LEFT JOIN personinchargemaster As E ON E.PersonCode = D.ApprovalPerson");
|
|
| 1148 |
|
|
| 1171 | 1149 |
strSQL.Append(" Where");
|
| 1172 | 1150 |
strSQL.AppendFormat(" C.PersonCode = {0}", m_PersonCode);
|
| 1173 | 1151 |
strSQL.AppendFormat(" And C.ApprovalCode = {0}", m_ApprovalCode);
|
| ... | ... | |
| 1177 | 1155 |
strSQL.Append(" And A.APPROVALPERSONCODE = C.PersonCode");
|
| 1178 | 1156 |
strSQL.Append(" And DATE(A.APPROVALDATE) = DATE(C.EntryDate)");
|
| 1179 | 1157 |
strSQL.Append(" And A.APPROVALENDFLG = 1");
|
| 1158 |
strSQL.AppendFormat(" And D.ApprovalCode = {0}", m_ApprovalCode);
|
|
| 1159 |
strSQL.Append(" And D.DepartmentCode = F.DepartmentCode");
|
|
| 1160 |
strSQL.AppendFormat(" And D.ApprovalPerson = {0}", CommonMotions.LoginUserData.PersonCode);
|
|
| 1161 |
|
|
| 1180 | 1162 |
ArrayList DataList = new ArrayList(); |
| 1181 | 1163 |
if (!InfoDB.ExecuteReader(strSQL.ToString(), ref DataList)) return; |
| 1182 | 1164 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
|---|---|---|
| 842 | 842 |
/// </summary> |
| 843 | 843 |
/// <param name="AllCount"></param> |
| 844 | 844 |
/// <param name="PrintCount"></param> |
| 845 |
private void GetPrintCount(IOPurchaseOrder OrderDB, int ParentCode, int SourceCode, ref int AllCount, ref int PrintCount)
|
|
| 845 |
private bool GetPrintCount(IOPurchaseOrder OrderDB, int ParentCode, int SourceCode)
|
|
| 846 | 846 |
{
|
| 847 | 847 |
try |
| 848 | 848 |
{
|
| 849 |
PrintCount = 0; |
|
| 850 | 849 |
StringBuilder strSQL = new StringBuilder(); |
| 851 |
strSQL.Append("SELECT * FROM");
|
|
| 852 |
strSQL.Append(" (SELECT COUNT(*) FROM");
|
|
| 853 |
strSQL.Append(" (SELECT * FROM CONSTRUCTIONLEDGERDETAIL A2");
|
|
| 854 |
strSQL.AppendFormat(" WHERE A2.CONSTRUCTIONCODE = {0}) A1", ParentCode);
|
|
| 855 |
strSQL.AppendFormat(" WHERE A1.SOURCECODE = {0}", SourceCode);
|
|
| 850 |
|
|
| 851 |
strSQL.Append("SELECT");
|
|
| 852 |
strSQL.Append(" A1.PURCHASEORDERFLG,");
|
|
| 853 |
strSQL.Append(" A1.CONSTRUCTIONCODE,");
|
|
| 854 |
strSQL.Append(" A1.SOURCECODE,");
|
|
| 855 |
strSQL.Append(" A1.GROUPCOUNT,");
|
|
| 856 |
strSQL.Append(" A1.COMPANYCODE,");
|
|
| 857 |
strSQL.Append(" A1.EXECUTIONAMOUNT");
|
|
| 858 |
|
|
| 859 |
strSQL.Append(" FROM");
|
|
| 860 |
strSQL.Append(" CONSTRUCTIONLEDGERDETAIL AS A1");
|
|
| 861 |
strSQL.Append(" WHERE");
|
|
| 862 |
strSQL.AppendFormat(" A1.CONSTRUCTIONCODE = {0}", ParentCode);
|
|
| 863 |
strSQL.AppendFormat(" And A1.SOURCECODE = {0}", SourceCode);
|
|
| 856 | 864 |
strSQL.AppendFormat(" AND A1.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
|
| 857 |
strSQL.AppendFormat(" AND A1.PURCHASEORDERFLG <> {0} AND A1.COMPANYCODE > 0", (int)ConstructionLedgerDetail.PurOrderFlgDef.NotMakingData);
|
|
| 858 |
|
|
| 865 |
strSQL.Append(" AND A1.COMPANYCODE > 0");
|
|
| 859 | 866 |
strSQL.Append(" GROUP BY A1.COMPANYCODE");
|
| 860 |
strSQL.AppendFormat(" HAVING SUM(A1.EXECUTIONAMOUNT) >= {0}) A,", CommonDefine.s_PrintOutPrice);
|
|
| 867 |
strSQL.AppendFormat(" HAVING SUM(A1.EXECUTIONAMOUNT) >= {0}", CommonDefine.s_PrintOutPrice);
|
|
| 861 | 868 |
|
| 862 |
strSQL.Append(" (SELECT COUNT(*) FROM PURCHASEORDER B1");
|
|
| 863 |
if (ParentCode == SourceCode) |
|
| 869 |
ArrayList arList = new ArrayList(); |
|
| 870 |
if (!OrderDB.ExecuteReader(strSQL.ToString(), ref arList)) return false; |
|
| 871 |
if (arList.Count == 0) return false; |
|
| 872 |
|
|
| 873 |
bool bRet = true; |
|
| 874 |
foreach (object[] objRec in arList) |
|
| 864 | 875 |
{
|
| 865 |
strSQL.AppendFormat(" WHERE B1.CONSTRUCTIONCODE = {0}", ParentCode);
|
|
| 876 |
// ???????????I?? |
|
| 877 |
if (CommonMotions.cnvInt(objRec[0]) |
|
| 878 |
== (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate) |
|
| 879 |
{
|
|
| 880 |
bRet = false; |
|
| 881 |
break; |
|
| 882 |
} |
|
| 866 | 883 |
} |
| 867 |
else |
|
| 868 |
{
|
|
| 869 |
strSQL.AppendFormat(" WHERE B1.CONSTRUCTIONCODE = {0}", SourceCode);
|
|
| 870 |
} |
|
| 871 |
strSQL.AppendFormat(" AND DATE(B1.PRINTOUTDATE) != STR_TO_DATE('{0}', '%Y/%m/%d')) B", DateTime.MinValue.ToShortDateString());
|
|
| 872 |
|
|
| 873 |
ArrayList arList = new ArrayList(); |
|
| 874 |
if (!OrderDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 875 |
if (arList.Count == 0) return; |
|
| 876 |
|
|
| 877 |
//if (SourceCode == 2016027801) Debug.WriteLine("");
|
|
| 878 |
|
|
| 879 |
object[] objRec = (object[])arList[0]; |
|
| 880 |
AllCount = arList.Count; |
|
| 881 |
PrintCount = CommonMotions.cnvInt(objRec[1]); |
|
| 884 |
return bRet; |
|
| 882 | 885 |
} |
| 883 | 886 |
catch (Exception ex) |
| 884 | 887 |
{
|
| 885 | 888 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 889 |
return false; |
|
| 886 | 890 |
} |
| 887 | 891 |
} |
| 888 | 892 |
#endregion |
| ... | ... | |
| 927 | 931 |
case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint: |
| 928 | 932 |
// ??????????E???????????t???O???g?? |
| 929 | 933 |
ParentCode = ClsProcessExist.GetParentConstrCode(ConstrCode); |
| 930 |
int AllCount = 0; |
|
| 931 |
int PrintCount = 0; |
|
| 932 |
GetPrintCount(OrderDB, ParentCode, ConstrCode, ref AllCount, ref PrintCount); |
|
| 933 |
if ((AllCount == 0) || (AllCount != 0 && AllCount <= PrintCount)) FlgString = "??"; |
|
| 934 |
if(GetPrintCount(OrderDB, ParentCode, ConstrCode)) FlgString = "??"; |
|
| 934 | 935 |
|
| 935 | 936 |
if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint) |
| 936 | 937 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs | ||
|---|---|---|
| 177 | 177 |
// ?H?????? |
| 178 | 178 |
if (!frm.RecordCopyTypeA(m_ConstructionCode, NewCode, BaseDB, DetailDB)) |
| 179 | 179 |
{
|
| 180 |
MessageBox.Show("?H????????{??f?[?^????????????B", "?f?[?^???G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
| 180 |
MessageBox.Show("?H????????{???f?[?^????????????B", "?f?[?^???G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
| 181 | 181 |
LinkDB.rollback(); |
| 182 | 182 |
BaseDB.rollback(); |
| 183 | 183 |
DetailDB.rollback(); |
| ... | ... | |
| 382 | 382 |
int ConstrPeriod = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text); |
| 383 | 383 |
|
| 384 | 384 |
strSQL = "SELECT A.CONSTRUCTIONCODE,"; |
| 385 |
//strSQL += " CASE A.ConstructionPeriodStart2 WHEN TO_DATE('0001/01/01') THEN A.ConstructionPeriodStart ELSE A.ConstructionPeriodStart2 END StDate,";
|
|
| 386 |
strSQL += " CASE A.ConstructionPeriodStart2 WHEN STR_TO_DATE('0001/01/01','%Y/%m/%d') THEN A.ConstructionPeriodStart ELSE A.ConstructionPeriodStart2 END StDate,";
|
|
| 387 |
//strSQL += " CASE A.ConstructionPeriodEnd2 WHEN TO_DATE('0001/01/01') THEN A.ConstructionPeriodEnd ELSE A.ConstructionPeriodEnd2 END EdDate,";
|
|
| 388 |
strSQL += " CASE A.ConstructionPeriodEnd2 WHEN STR_TO_DATE('0001/01/01','%Y/%m/%d') THEN A.ConstructionPeriodEnd ELSE A.ConstructionPeriodEnd2 END EdDate,";
|
|
| 385 |
strSQL += " CASE DATE(A.ConstructionPeriodStart2) WHEN DATE('0001/01/01') THEN A.ConstructionPeriodStart ELSE A.ConstructionPeriodStart2 END StDate,";
|
|
| 386 |
strSQL += " CASE DATE(A.ConstructionPeriodEnd2) WHEN DATE('0001/01/01') THEN A.ConstructionPeriodEnd ELSE A.ConstructionPeriodEnd2 END EdDate,";
|
|
| 389 | 387 |
strSQL += " B.PERSONCODE B1, B.SEALPRINTNAME B2, B.MONTHLYSALARY B3,"; |
| 390 | 388 |
strSQL += " C.PERSONCODE C1, C.SEALPRINTNAME C2, C.MONTHLYSALARY C3,"; |
| 391 | 389 |
strSQL += " D.PERSONCODE D1, D.SEALPRINTNAME D2, D.MONTHLYSALARY D3,"; |
| ... | ... | |
| 1186 | 1184 |
// ????????? |
| 1187 | 1185 |
int workingCount = ClsCalendar.CalcPassedDaysCount(StartDate, EndDate); |
| 1188 | 1186 |
// ?x???????^?v?Z |
| 1189 |
CommonMotions.CalcPayValueData(MonthryCost, TotalOrdersPrice, workingCount, ref ExecutionAmount, ref AmountConfigRate, bSalaryCorrection); |
|
| 1187 |
CommonMotions.CalcPayValueData(MonthryCost, |
|
| 1188 |
TotalOrdersPrice, |
|
| 1189 |
workingCount, |
|
| 1190 |
ref ExecutionAmount, |
|
| 1191 |
ref AmountConfigRate, |
|
| 1192 |
bSalaryCorrection); |
|
| 1190 | 1193 |
|
| 1191 | 1194 |
// ----- ?V?S?????H???\?Z??????f?[?^?? |
| 1192 |
//ClearConstructionLedgerDetailRec(ref DetailRec);
|
|
| 1195 |
ClearConstructionLedgerDetailRec(ref DetailRec); |
|
| 1193 | 1196 |
DetailRec.ConstructionCode = ProcConstrCode; // ?H????? |
| 1194 | 1197 |
DetailRec.GroupCount = GroupCode; // ?O???[?v??? |
| 1195 | 1198 |
DetailRec.LineCount = 0; // ?s??? |
| ... | ... | |
| 1200 | 1203 |
DetailRec.SecondString = string.Empty; // ?H?????e |
| 1201 | 1204 |
DetailRec.CompanyType = (int)CommonDefine.CodeDataType.Person; // ??????R?[?h?^?C?v |
| 1202 | 1205 |
DetailRec.CompanyCode = ConstructorCode; // ??????R?[?h |
| 1203 |
//DetailRec.ExecutionAmount = ExecutionAmount; // ???s???z |
|
| 1204 |
//DetailRec.AmountConfigRate = AmountConfigRate; // ???z?\???? |
|
| 1206 |
//DetailRec.ExecutionAmount = ExecutionAmount; // ???s???z |
|
| 1207 |
//DetailRec.AmountConfigRate = AmountConfigRate; // ???z?\???? |
|
| 1208 |
DetailRec.ExecutionAmount = 0; // ???s???z |
|
| 1209 |
DetailRec.AmountConfigRate = 0; // ???z?\???? |
|
| 1205 | 1210 |
|
| 1206 | 1211 |
DetailRec.SalaryFlg = (int)CommonDefine.SalaryDevision.All; // ???^?U???? |
| 1207 | 1212 |
DetailRec.SalaryDays = workingCount; // ???^?U?????? |
| 1208 | 1213 |
DetailRec.OperatingFlg = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing; // ?S?????t???O |
| 1209 | 1214 |
|
| 1215 |
DetailRec.SalaryOnRegist = MonthryCost; // ?o?^?????z???^ |
|
| 1216 |
|
|
| 1210 | 1217 |
// ?f?[?^??? |
| 1211 | 1218 |
if (!LedgerDDB.InsertAction(DetailRec, false)) return false; |
| 1212 | 1219 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs | ||
|---|---|---|
| 985 | 985 |
} |
| 986 | 986 |
#endregion |
| 987 | 987 |
|
| 988 |
#region ?f?[?^?o?^?{?^??????
|
|
| 988 |
#region ?o?^?{?^???N???b?N
|
|
| 989 | 989 |
/// <summary> |
| 990 |
/// ?f?[?^?o?^?{?^??????
|
|
| 990 |
/// ?o?^?{?^???N???b?N
|
|
| 991 | 991 |
/// </summary> |
| 992 | 992 |
/// <param name="sender"></param> |
| 993 | 993 |
/// <param name="e"></param> |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs | ||
|---|---|---|
| 490 | 490 |
|
| 491 | 491 |
// 受注金額 |
| 492 | 492 |
int OrdersPrice = (int)m_ConstructionBaseInfo.OrdersDecisionPrice; |
| 493 |
// 承認済みは工事予算データから表示する |
|
| 494 |
if (ClsApprovalPermission.CheckProcessApproval(m_ConstructionCode, |
|
| 495 |
(int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval, |
|
| 496 |
1)) |
|
| 497 |
{
|
|
| 498 |
if (cbRec.OrdersDecisionPrice != 0) OrdersPrice = (int)cbRec.OrdersDecisionPrice; |
|
| 499 |
} |
|
| 493 | 500 |
m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text = @"\" + OrdersPrice.ToString("#,0");
|
| 494 | 501 |
|
| 495 | 502 |
// ----- 工事種別マスタ取得 |
| ... | ... | |
| 3881 | 3888 |
return false; |
| 3882 | 3889 |
} |
| 3883 | 3890 |
|
| 3891 |
// 税抜受注決定金額 |
|
| 3892 |
work.OrdersDecisionPrice = CommonMotions.cnvDouble(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text); |
|
| 3893 |
|
|
| 3884 | 3894 |
// 積算予算書データデータ登録 |
| 3885 | 3895 |
if (workList.Count == 0) |
| 3886 | 3896 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs | ||
|---|---|---|
| 556 | 556 |
private ConstructionBaseInfo m_ConstructionBaseInfo = new ConstructionBaseInfo(); |
| 557 | 557 |
|
| 558 | 558 |
/// <summary> |
| 559 |
/// ?Y???H???S???? |
|
| 560 |
/// </summary> |
|
| 561 |
private PersonInChargeMaster m_PersonInChargeMaster = new PersonInChargeMaster(); |
|
| 562 |
|
|
| 563 |
/// <summary> |
|
| 559 | 564 |
/// ???F????X?g?n???h?? |
| 560 | 565 |
/// </summary> |
| 561 | 566 |
private FrmApprovalAuthorizerList m_frmAuthorizerList = null; |
| ... | ... | |
| 1227 | 1232 |
// ?????????A?g |
| 1228 | 1233 |
if (m_BillingProc) BillingLinkOutPut(); |
| 1229 | 1234 |
|
| 1230 |
switch (e.ColumnIndex)
|
|
| 1235 |
switch (e.ColumnIndex) |
|
| 1231 | 1236 |
{
|
| 1232 | 1237 |
// ----- ????????Z?? |
| 1233 | 1238 |
case (int)GridColumn.CompanyName: |
| ... | ... | |
| 1242 | 1247 |
// ??????I?? |
| 1243 | 1248 |
ShowSubConstructorDiag(); |
| 1244 | 1249 |
break; |
| 1245 |
case (int)DataGroup.PurchaseCosts: |
|
| 1246 |
// ----- ?w???i |
|
| 1247 |
// ?d????I?? |
|
| 1248 |
ShowSuppliersDiag(); |
|
| 1250 |
|
|
| 1251 |
case (int)DataGroup.TransportationCosts: // ----- 3:????i??s???E?d???j |
|
| 1252 |
case (int)DataGroup.PurchaseCosts: // ----- 4:?w???i |
|
| 1253 |
case (int)DataGroup.VehicleLeaseFee: // ----- 5:??????[?X?? |
|
| 1254 |
case (int)DataGroup.ParkingCosts: // ----- 6:?????E????u???? |
|
| 1255 |
case (int)DataGroup.RoomChargeCosts: // ----- 7:?h???? |
|
| 1256 |
case (int)DataGroup.DisposeCosts: // ----- 8:?????? |
|
| 1257 |
EventArgs eWork = new EventArgs(); |
|
| 1258 |
ProcessExecute_TAndPCosts(sender, eWork); |
|
| 1249 | 1259 |
break; |
| 1250 | 1260 |
default: |
| 1251 | 1261 |
break; |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
|---|---|---|
| 58 | 58 |
private bool GetBaseInfoData() |
| 59 | 59 |
{
|
| 60 | 60 |
IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo(); |
| 61 |
IOMPersonInCharge PersonDB = new IOMPersonInCharge(); |
|
| 61 | 62 |
try |
| 62 | 63 |
{
|
| 63 |
string strSQL = cbDB.CreatePrimarykeyString(m_ConstructionCode); |
|
| 64 |
if (!cbDB.SelectAction(strSQL, ref m_ConstructionBaseInfo)) return false; |
|
| 64 |
StringBuilder strSQL = new StringBuilder(); |
|
| 65 |
strSQL.Append(cbDB.CreatePrimarykeyString(m_ConstructionCode)); |
|
| 66 |
if (!cbDB.SelectAction(strSQL.ToString(), ref m_ConstructionBaseInfo)) return false; |
|
| 65 | 67 |
|
| 68 |
strSQL.Clear(); |
|
| 69 |
strSQL.Append(PersonDB.CreatePrimarykeyString(m_ConstructionBaseInfo.ConstructionPersonCode)); |
|
| 70 |
if (!PersonDB.SelectAction(strSQL.ToString(), ref m_PersonInChargeMaster)) return false; |
|
| 71 |
|
|
| 66 | 72 |
return true; |
| 67 | 73 |
} |
| 68 | 74 |
catch (Exception ex) |
| ... | ... | |
| 73 | 79 |
finally |
| 74 | 80 |
{
|
| 75 | 81 |
cbDB.close(); cbDB = null; |
| 82 |
PersonDB.close(); PersonDB = null; |
|
| 76 | 83 |
} |
| 77 | 84 |
} |
| 78 | 85 |
#endregion |
| ... | ... | |
| 2162 | 2169 |
RowData[(int)GridColumn.EstimatePrice] = EstimateValue.ToString("#,0");
|
| 2163 | 2170 |
RowData[(int)GridColumn.ExecPrice] = ExecValue.ToString("#,0");
|
| 2164 | 2171 |
RowData[(int)GridColumn.Percent] = CalculattionPercent((double)ExecValue).ToString("0.00");
|
| 2172 |
RowData[(int)GridColumn.IndependentFlg] = "1"; |
|
| 2165 | 2173 |
RowData[(int)GridColumn.SourceCode] = m_ConstructionCode; |
| 2166 | 2174 |
|
| 2167 | 2175 |
// 行セット |
| ... | ... | |
| 2394 | 2402 |
RowData[(int)GridColumn.FixFlg] = "*"; |
| 2395 | 2403 |
RowData[(int)GridColumn.GroupCount] = (int)DataGroup.CurrentProfit; |
| 2396 | 2404 |
RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.CurrentProfit]; |
| 2405 |
RowData[(int)GridColumn.IndependentFlg] = "1"; |
|
| 2397 | 2406 |
RowData[(int)GridColumn.SourceCode] = m_ConstructionCode; |
| 2398 | 2407 |
|
| 2399 | 2408 |
// 合計欄位置取得 |
| ... | ... | |
| 4911 | 4920 |
} |
| 4912 | 4921 |
#endregion |
| 4913 | 4922 |
|
| 4914 |
#region 仕入先選択ダイアログ表示 |
|
| 4915 |
/// <summary> |
|
| 4916 |
/// 仕入先選択ダイアログ表示 |
|
| 4917 |
/// </summary> |
|
| 4918 |
private void ShowSuppliersDiag() |
|
| 4919 |
{
|
|
| 4920 |
FrmSuppliersDiag frm = new FrmSuppliersDiag(); |
|
| 4921 |
try |
|
| 4922 |
{
|
|
| 4923 |
DataGridView dgv = dgvAllDisplay; |
|
| 4924 |
|
|
| 4925 |
frm.ConstructionCode = m_ConstructionCode; |
|
| 4926 |
//frm.ShowInTaskbar = false; |
|
| 4927 |
frm.ShowDialog(); |
|
| 4928 |
if (frm.EndButton == System.Windows.Forms.DialogResult.OK) |
|
| 4929 |
{
|
|
| 4930 |
SuppliersMaster selRec = frm.SelectData; |
|
| 4931 |
dgv.CurrentRow.Cells[(int)GridColumn.CompanyType].Value = (int)CommonDefine.CodeDataType.Subconstractor; |
|
| 4932 |
dgv.CurrentRow.Cells[(int)GridColumn.CompanyCode].Value = selRec.SuppliersCode; |
|
| 4933 |
dgv.CurrentRow.Cells[(int)GridColumn.CompanyName].Value = selRec.SuppliersName1 + " " + selRec.SuppliersName2; |
|
| 4934 |
m_bChengeAns = true; |
|
| 4935 |
} |
|
| 4936 |
} |
|
| 4937 |
catch (System.Exception ex) |
|
| 4938 |
{
|
|
| 4939 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 4940 |
} |
|
| 4941 |
finally |
|
| 4942 |
{
|
|
| 4943 |
frm.Dispose(); |
|
| 4944 |
frm = null; |
|
| 4945 |
} |
|
| 4946 |
} |
|
| 4947 |
#endregion |
|
| 4948 |
|
|
| 4949 | 4923 |
#region 参照モードの設定 |
| 4950 | 4924 |
/// <summary> |
| 4951 | 4925 |
/// 参照モードにして各コントロールへロックをかける |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/ProcessControl.cs | ||
|---|---|---|
| 840 | 840 |
ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = s_CurrentProcessNo; |
| 841 | 841 |
ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = (Form)frm; |
| 842 | 842 |
frm.ConstructionCode = m_ConstructionCode; |
| 843 |
frm.PersonCode = CommonMotions.LoginUserData.PersonCode; |
|
| 843 |
|
|
| 844 |
frm.InitSetFlag = true; |
|
| 845 |
frm.DepartmentCode = m_PersonInChargeMaster.DepartmentCode; |
|
| 846 |
frm.PersonCode = m_ConstructionBaseInfo.ConstructionPersonCode; |
|
| 847 |
|
|
| 844 | 848 |
frm.EditLock = m_EditLock; |
| 845 | 849 |
frm.SubForm = true; |
| 846 | 850 |
frm.ShowInTaskbar = true; |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs | ||
|---|---|---|
| 172 | 172 |
"?S??????^???z"}; |
| 173 | 173 |
#endregion |
| 174 | 174 |
|
| 175 |
#region ???v???Z?X???? |
|
| 176 |
/// <summary> |
|
| 177 |
/// ???v???Z?X???? |
|
| 178 |
/// </summary> |
|
| 179 |
private static int s_CurrentProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionLedgerList; |
|
| 180 |
#endregion |
|
| 181 |
|
|
| 182 | 175 |
#region ?R???g???[???C?x???g??` |
| 183 | 176 |
/// <summary> |
| 184 | 177 |
/// ?R???g???[???C?x???g??` |
| ... | ... | |
| 279 | 272 |
private bool m_NextProcFlg = false; |
| 280 | 273 |
#endregion |
| 281 | 274 |
|
| 275 |
/// <summary> |
|
| 276 |
/// ?H???R?[?h |
|
| 277 |
/// </summary> |
|
| 278 |
private int m_ConstructionCode = 0; |
|
| 279 |
|
|
| 280 |
/// <summary> |
|
| 281 |
/// ?t?B?[???h?l????t???O |
|
| 282 |
/// </summary> |
|
| 283 |
private bool m_bChengeAns = false; |
|
| 284 |
|
|
| 285 |
// *-----* ?????????? *-----* |
|
| 286 |
/// <summary> |
|
| 287 |
/// ??o???I???t???O |
|
| 288 |
/// </summary> |
|
| 289 |
private bool m_ParentEnd = false; |
|
| 290 |
// *-----* ?????????? *-----* |
|
| 291 |
|
|
| 292 |
/// <summary> |
|
| 293 |
/// ?I???{?^???????t???O
|
|
| 294 |
/// </summary> |
|
| 295 |
private bool m_CloseingProcessOn = true; |
|
| 296 |
|
|
| 297 |
/// <summary> |
|
| 298 |
/// ?A?N?Z?X?????t???O |
|
| 299 |
/// </summary> |
|
| 300 |
private bool m_EditLock = false; |
|
| 301 |
|
|
| 302 |
/// <summary> |
|
| 303 |
/// ?Y???H????{???
|
|
| 304 |
/// </summary> |
|
| 305 |
private ConstructionBaseInfo m_ConstructionBaseInfo = new ConstructionBaseInfo(); |
|
| 306 |
|
|
| 307 |
/// <summary> |
|
| 308 |
/// ?Y???H???S???? |
|
| 309 |
/// </summary> |
|
| 310 |
private PersonInChargeMaster m_PersonInChargeMaster = new PersonInChargeMaster(); |
|
| 282 | 311 |
#endregion |
| 283 | 312 |
|
| 284 | 313 |
#region ?v???p?e?B |
| ... | ... | |
| 370 | 399 |
} |
| 371 | 400 |
#endregion |
| 372 | 401 |
|
| 402 |
/// <summary> |
|
| 403 |
/// ?A?N?Z?X?????t???O |
|
| 404 |
/// </summary> |
|
| 405 |
public bool EditLock |
|
| 406 |
{
|
|
| 407 |
get { return m_EditLock; }
|
|
| 408 |
set { m_EditLock = value; }
|
|
| 409 |
} |
|
| 410 |
|
|
| 411 |
// *-----* ?????????? *-----* |
|
| 412 |
/// <summary> |
|
| 413 |
/// ??o???I???t???O |
|
| 414 |
/// </summary> |
|
他の形式にエクスポート: Unified diff