リビジョン 442
入金入力:最上位者が入力すると当人しか見られないバグ修正
工事情報:期・年度切り替えバグ修正
工事予算書:期・年度切り替えバグ修正
セキュリティ区分:製品版起動フラグ不足を追加
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs | ||
---|---|---|
311 | 311 |
ShareFlag = 0, |
312 | 312 |
DepartmentCode, |
313 | 313 |
SecRank, |
314 |
FromCode |
|
314 |
FromCode, |
|
315 |
LinkType, |
|
315 | 316 |
} |
316 | 317 |
#endregion |
317 | 318 |
|
... | ... | |
347 | 348 |
|
348 | 349 |
int TergetCnt = Enum.GetNames(typeof(IOMessageBoardTerget.NameColumn)).Length; |
349 | 350 |
|
351 |
object[] objFirst = (object[])TargetList[0]; |
|
352 |
int nLinkType = CommonMotions.cnvInt(objFirst[TergetCnt + (int)GetTarget.LinkType]); |
|
353 |
|
|
350 | 354 |
// 書込み者は最上位者か? |
351 |
object[] objFirst = (object[])TargetList[0]; |
|
352 | 355 |
int WriterCode = CommonMotions.cnvInt(objFirst[TergetCnt + (int)GetTarget.FromCode]); |
353 |
bool bProtect = DecideLockData(WriterCode); |
|
354 |
if (!bProtect) |
|
356 |
bool bProtect = false; |
|
357 |
|
|
358 |
// 入金入力以外の時に最上位者チェックをしない |
|
359 |
if (nLinkType != (int)MessageBoardData.LinkTypeDef.PaymentEntry) |
|
355 | 360 |
{ |
356 |
// 読込者は最上位者が含まれているか? |
|
357 |
int ReadCode = 0; |
|
358 |
foreach (object[] objRec in TargetList) |
|
361 |
bProtect = DecideLockData(WriterCode); |
|
362 |
if (!bProtect) |
|
359 | 363 |
{ |
360 |
ReadCode = CommonMotions.cnvInt(objFirst[(int)IOMessageBoardTerget.NameColumn.ToCode]); |
|
361 |
bProtect = DecideLockData(ReadCode); |
|
362 |
if (bProtect) break; |
|
364 |
// 読込者は最上位者が含まれているか? |
|
365 |
int ReadCode = 0; |
|
366 |
foreach (object[] objRec in TargetList) |
|
367 |
{ |
|
368 |
ReadCode = CommonMotions.cnvInt(objFirst[(int)IOMessageBoardTerget.NameColumn.ToCode]); |
|
369 |
bProtect = DecideLockData(ReadCode); |
|
370 |
if (bProtect) break; |
|
371 |
} |
|
363 | 372 |
} |
364 | 373 |
} |
365 |
|
|
366 | 374 |
// ----- 書込み側対象者判定 |
367 | 375 |
if (bProtect) |
368 | 376 |
{ // 最上位者ロック有 |
... | ... | |
445 | 453 |
{ |
446 | 454 |
try |
447 | 455 |
{ |
448 |
// 掲示板閲覧テーブルのチェック |
|
449 |
StringBuilder strSQL = new StringBuilder(); |
|
450 |
strSQL.Append("SELECT"); |
|
451 |
strSQL.Append(" A.RecordNumber"); |
|
452 |
strSQL.Append(", A.BranchNumber"); |
|
453 |
strSQL.Append(", A.SeqNum"); |
|
454 |
strSQL.Append(", A.ToCode"); |
|
455 |
strSQL.Append(", A.ToName"); |
|
456 |
strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')"); |
|
457 |
strSQL.Append(", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')"); |
|
458 |
strSQL.Append(", B.SHAREFLAG"); |
|
459 |
strSQL.Append(", C.DEPARTMENTCODE"); |
|
460 |
strSQL.Append(", D.SECRANK"); |
|
461 |
strSQL.Append(", B.FromCode"); |
|
462 |
strSQL.Append(" FROM MESSAGEBOARDTERGET A"); |
|
463 |
strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C"); |
|
464 |
strSQL.Append(" ON C.PERSONCODE = A.TOCODE"); |
|
465 |
strSQL.Append(" LEFT JOIN SECURITYMASTER D"); |
|
466 |
strSQL.Append(" ON D.SECCODE = C.SECCODE"); |
|
467 |
strSQL.Append(", MESSAGEBOARDDATA B"); |
|
468 |
strSQL.AppendFormat(" WHERE A.RECORDNUMBER = {0}", RecoadNo); |
|
469 |
strSQL.AppendFormat(" AND A.BRANCHNUMBER = {0}", BuranchNo); |
|
470 |
strSQL.Append(" AND B.RECORDNUMBER = A.RECORDNUMBER"); |
|
471 |
strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER"); |
|
456 |
// 掲示板閲覧テーブルのチェック |
|
457 |
StringBuilder strSQL = new StringBuilder(); |
|
458 |
strSQL.Append("SELECT"); |
|
459 |
strSQL.Append(" A.RecordNumber"); |
|
460 |
strSQL.Append(", A.BranchNumber"); |
|
461 |
strSQL.Append(", A.SeqNum"); |
|
462 |
strSQL.Append(", A.ToCode"); |
|
463 |
strSQL.Append(", A.ToName"); |
|
464 |
strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')"); |
|
465 |
strSQL.Append(", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')"); |
|
466 |
strSQL.Append(", B.SHAREFLAG"); |
|
467 |
strSQL.Append(", C.DEPARTMENTCODE"); |
|
468 |
strSQL.Append(", D.SECRANK"); |
|
469 |
strSQL.Append(", B.FromCode"); |
|
470 |
strSQL.Append(", B.LinkType"); |
|
471 |
strSQL.Append(" FROM MESSAGEBOARDTERGET A"); |
|
472 |
strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C"); |
|
473 |
strSQL.Append(" ON C.PERSONCODE = A.TOCODE"); |
|
474 |
strSQL.Append(" LEFT JOIN SECURITYMASTER D"); |
|
475 |
strSQL.Append(" ON D.SECCODE = C.SECCODE"); |
|
476 |
strSQL.Append(", MESSAGEBOARDDATA B"); |
|
477 |
strSQL.AppendFormat(" WHERE A.RECORDNUMBER = {0}", RecoadNo); |
|
478 |
strSQL.AppendFormat(" AND A.BRANCHNUMBER = {0}", BuranchNo); |
|
479 |
strSQL.Append(" AND B.RECORDNUMBER = A.RECORDNUMBER"); |
|
480 |
strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER"); |
|
472 | 481 |
|
473 |
if (!mbtDB.ExecuteReader(strSQL.ToString(), ref TargetList)) return false;
|
|
482 |
if (!mbtDB.ExecuteReader(strSQL.ToString(), ref TargetList)) return false; |
|
474 | 483 |
|
475 |
return true;
|
|
484 |
return true; |
|
476 | 485 |
} |
477 | 486 |
catch (Exception ex) |
478 | 487 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs | ||
---|---|---|
396 | 396 |
try |
397 | 397 |
{ |
398 | 398 |
int ConstrPeriod = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text); |
399 |
if (CommonMotions.BasePeriodYear()) |
|
400 |
{ // ?c??? |
|
399 | 401 |
|
402 |
} |
|
403 |
else |
|
404 |
{ // ?H???N?x |
|
405 |
ConstrPeriod = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionYear].Text); |
|
406 |
} |
|
407 |
|
|
400 | 408 |
strSQL.Append("SELECT A.CONSTRUCTIONCODE,"); |
401 | 409 |
strSQL.AppendFormat(" CASE DATE(A.ConstructionPeriodStart2) WHEN DATE('{0}')", DateTime.MinValue.ToShortDateString()); |
402 | 410 |
strSQL.Append(" THEN A.ConstructionPeriodStart ELSE A.ConstructionPeriodStart2 END StDate,"); |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs | ||
---|---|---|
1474 | 1474 |
} |
1475 | 1475 |
|
1476 | 1476 |
// ?????t?H?[?J?X |
1477 |
this.ActiveControl = m_DspCtrl[(int)DspCnt.ConstructionPeriod]; |
|
1477 |
if (CommonMotions.BasePeriodYear()) |
|
1478 |
this.ActiveControl = m_DspCtrl[(int)DspCnt.ConstructionPeriod]; |
|
1479 |
else |
|
1480 |
this.ActiveControl = m_DspCtrl[(int)DspCnt.ConstructionYear]; |
|
1478 | 1481 |
|
1479 | 1482 |
// ???????t???O |
1480 | 1483 |
bInitFlg = false; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
---|---|---|
6189 | 6189 |
if (!bTarget) return; |
6190 | 6190 |
|
6191 | 6191 |
// ?w???????? |
6192 |
ComboBox wrkcmb = null; |
|
6192 | 6193 |
int Period = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text); // 2: ?H???? |
6194 |
if (CommonMotions.BasePeriodYear()) |
|
6195 |
{ // ?c??? |
|
6196 |
wrkcmb = (ComboBox)m_DspCtrl[(int)DspCnt.ConstructionPeriod]; |
|
6197 |
} |
|
6198 |
else |
|
6199 |
{ // ?H???N?x |
|
6200 |
Period = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionYear].Text); // 2: ?H???N?x |
|
6201 |
wrkcmb = (ComboBox)m_DspCtrl[(int)DspCnt.ConstructionYear]; |
|
6202 |
} |
|
6203 |
|
|
6193 | 6204 |
DateTime dtStart = DateTime.Now; |
6194 | 6205 |
DateTime dtEnd = DateTime.Now; |
6195 |
int iYear = 0; |
|
6196 |
int month = 0; |
|
6197 |
int day = 0; |
|
6198 | 6206 |
|
6199 | 6207 |
dtStart = CommonMotions.GetOpeningEndDate(Period, true); |
6200 | 6208 |
dtEnd = CommonMotions.GetOpeningEndDate(Period, false); |
... | ... | |
6210 | 6218 |
if (dtCEnd2 == DateTime.MinValue) dtCEnd2 = dtCEnd; |
6211 | 6219 |
if (dtCEnd < dtCEnd2) dtCEnd = dtCEnd2; |
6212 | 6220 |
|
6221 |
string strMsg = string.Empty; |
|
6222 |
if (CommonMotions.BasePeriodYear()) { strMsg = "?v???"; } |
|
6223 |
else { strMsg = "?v??N?x"; } |
|
6224 |
|
|
6213 | 6225 |
// ???????????O |
6226 |
string strDspMsg = string.Empty; |
|
6214 | 6227 |
if (dtCStart < dtStart) |
6215 | 6228 |
{ |
6216 |
if(MessageBox.Show("?_??H?????H????\n????v???????????O???w????????\n?v??????X????????H",
|
|
6217 |
"?_??H?????H???`?F?b?N",
|
|
6218 |
MessageBoxButtons.YesNo, MessageBoxIcon.Information)==DialogResult.Yes)
|
|
6229 |
strDspMsg = string.Format("?_??H?????H????\n????{0}????????O???w????????\n{0}???X????????H", strMsg);
|
|
6230 |
if (MessageBox.Show(strDspMsg, "?_??H?????H???`?F?b?N",
|
|
6231 |
MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
|
|
6219 | 6232 |
{ |
6220 | 6233 |
int NewPeriod = Period; |
6221 | 6234 |
for (int i = 1; i < 10; i++) |
6222 | 6235 |
{ |
6223 |
dtStart = new DateTime((iYear - i), month, day);
|
|
6236 |
dtStart = new DateTime((dtCStart.Year - i), dtCStart.Month, dtCStart.Day);
|
|
6224 | 6237 |
dtEnd = dtStart.AddYears(1).AddDays(-1); |
6225 | 6238 |
if (dtStart <= dtCStart && dtCStart <= dtEnd) |
6226 | 6239 |
{ |
... | ... | |
6228 | 6241 |
break; |
6229 | 6242 |
} |
6230 | 6243 |
} |
6231 |
m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text = NewPeriod.ToString();
|
|
6244 |
wrkcmb.Text = NewPeriod.ToString();
|
|
6232 | 6245 |
return; |
6233 | 6246 |
} |
6234 | 6247 |
} |
6235 | 6248 |
if (dtEnd < dtCEnd) |
6236 | 6249 |
{ |
6237 |
if (MessageBox.Show("?_??H??????????\n????v????????????~???w????????\n?v??????X????????H",
|
|
6238 |
"?_??H?????????`?F?b?N",
|
|
6250 |
strDspMsg = string.Format("?_??H??????????\n????{0}?????????~???w????????\n{0}???X????????H", strMsg);
|
|
6251 |
if (MessageBox.Show(strDspMsg, "?_??H?????????`?F?b?N",
|
|
6239 | 6252 |
MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) |
6240 | 6253 |
{ |
6241 | 6254 |
int NewPeriod = Period; |
6242 | 6255 |
for (int i = 1; i < 10; i++) |
6243 | 6256 |
{ |
6244 |
dtStart = new DateTime((iYear + i), month, day);
|
|
6257 |
dtStart = new DateTime((dtCStart.Year + i), dtCStart.Month, dtCStart.Day);
|
|
6245 | 6258 |
dtEnd = dtStart.AddYears(1).AddDays(-1); |
6246 | 6259 |
if (dtStart <= dtCEnd && dtCEnd <= dtEnd) |
6247 | 6260 |
{ |
... | ... | |
6249 | 6262 |
break; |
6250 | 6263 |
} |
6251 | 6264 |
} |
6252 |
m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text = NewPeriod.ToString();
|
|
6265 |
wrkcmb.Text = NewPeriod.ToString();
|
|
6253 | 6266 |
return; |
6254 | 6267 |
} |
6255 | 6268 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs | ||
---|---|---|
207 | 207 |
{ |
208 | 208 |
try |
209 | 209 |
{ |
210 |
int nPreiod = m_ConstructionBaseInfo.ConstructionPeriod; |
|
210 |
int nPreiod = 0; |
|
211 |
if (CommonMotions.BasePeriodYear()) |
|
212 |
{ // 営業期 |
|
213 |
nPreiod = m_ConstructionBaseInfo.ConstructionPeriod; |
|
214 |
} |
|
215 |
else |
|
216 |
{ // 工事年度 |
|
217 |
nPreiod = m_ConstructionBaseInfo.ConstructionYear; |
|
218 |
} |
|
211 | 219 |
int nDepartmentCode = m_ConstructionBaseInfo.ConstrDepCode; |
212 | 220 |
|
213 | 221 |
// 部署経費率マスタ取得 |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs | ||
---|---|---|
109 | 109 |
// |
110 | 110 |
// label3 |
111 | 111 |
// |
112 |
this.label3.Anchor = System.Windows.Forms.AnchorStyles.Top; |
|
112 | 113 |
this.label3.BackColor = System.Drawing.Color.Gold; |
113 | 114 |
this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
114 | 115 |
this.label3.Location = new System.Drawing.Point(420, 10); |
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs | ||
---|---|---|
213 | 213 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry, string.Empty), // 9:注文書入力 |
214 | 214 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint, string.Empty), // 10:注文書印刷 |
215 | 215 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderStatus, string.Empty), // 19:注文書発給一覧 |
216 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseStatusInput, string.Empty), // 40:注文書状況入力 |
|
216 | 217 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestInput, string.Empty), // 31:請求入力 |
217 | 218 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestPrint, string.Empty), // 32:請求書印刷 |
219 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ReqBillingStatInput, string.Empty), // 42:請求書状況入力 |
|
218 | 220 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ReqApprovalStatus, string.Empty), // 47:請求承認状況閲覧 |
219 |
|
|
221 |
new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation, string.Empty), // 30:入金確認 |
|
222 |
|
|
220 | 223 |
new KeyValuePair<int, string>(-1, "マスタメンテナンス"), // ----- タイトル |
221 | 224 |
new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.System, string.Empty), // システム管理登録 |
222 | 225 |
new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Security, string.Empty), // セキュリティ区分登録 |
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.cs | ||
---|---|---|
304 | 304 |
ClsExcute.ClearProcess(); |
305 | 305 |
|
306 | 306 |
int NowPoint = -1; |
307 |
switch (CommonMotions.cnvInt(m_LinkType))
|
|
307 |
switch (m_LinkType)
|
|
308 | 308 |
{ |
309 | 309 |
// 工事情報リンク |
310 | 310 |
case (int)MessageBoardData.LinkTypeDef.ConstructionInfo: |
他の形式にエクスポート: Unified diff