リビジョン 351
積算書予算書データIO:パラメータ名修正
工事情報:依頼日入力後ロック追加
工事台帳:選択行色戻し時バグ修正
積算予算書入力:表示タイトルフォーマット修正・コメント行削除
注文書入力一覧:パラメータ追加・業者ごとの合計金額が30万円を超えた場合は表示する様に修正
注文書入力:承認画面よりの終了時にループするバグ修正
協力業者マスタ:工種・職種に2重選択を出来ない様に修正
メニュー:コメント行削除
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 202;
|
|
17 |
public static int s_SystemVersion = 204;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOEstimateBudgetDetail.cs | ||
---|---|---|
463 | 463 |
/// <param name="OutsourcingFlg"></param> |
464 | 464 |
/// <param name="LineCount"></param> |
465 | 465 |
/// <returns></returns> |
466 |
public string CreatePrimarykeyString(int ConstructionCode, int PageCount = 0, int LineCount = 0)
|
|
466 |
public string CreatePrimarykeyString(int ConstructionCode, int GroupCount = 0, int LineCount = 0)
|
|
467 | 467 |
{ |
468 | 468 |
StringBuilder strWork = new StringBuilder(); |
469 | 469 |
try |
470 | 470 |
{ |
471 | 471 |
strWork.AppendFormat(" Where ConstructionCode = {0}", ConstructionCode); |
472 |
if (PageCount != 0)
|
|
473 |
strWork.AppendFormat(" And OutsourcingFlg = {0}", PageCount);
|
|
472 |
if (GroupCount != 0)
|
|
473 |
strWork.AppendFormat(" And GroupCount = {0}", GroupCount);
|
|
474 | 474 |
if (LineCount != 0) |
475 | 475 |
strWork.AppendFormat(" And LineCount = {0}", LineCount); |
476 | 476 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
---|---|---|
1091 | 1091 |
m_DspCtrl[(int)DspCnt.TransferConstructionDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].TransferConstructionDate); // ?H?????? |
1092 | 1092 |
|
1093 | 1093 |
m_DspCtrl[(int)DspCnt.RequestedDate].Text = worklist[0].RequestedDate.ToShortDateString(); // ?????? |
1094 |
// ????????????f?[?^??X?o??????l????? |
|
1095 |
m_DspCtrl[(int)DspCnt.RequestedDate].Enabled = false; |
|
1094 | 1096 |
|
1095 | 1097 |
m_DspCtrl[(int)DspCnt.OrderDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].OrderDate); // ??? |
1096 | 1098 |
|
... | ... | |
4971 | 4973 |
&& !m_DspCtrl[i].GetType().Equals(typeof(ComboBox)) && !m_DspCtrl[i].GetType().Equals(typeof(ComboBoxEX))) |
4972 | 4974 |
continue; |
4973 | 4975 |
|
4976 |
// ?????????????????i??x?o?^????????X????????j |
|
4977 |
if (i == (int)DspCnt.RequestedDate) continue; |
|
4978 |
|
|
4974 | 4979 |
// ?????Enable???? |
4975 | 4980 |
m_DspCtrl[i].Enabled = FieldLockMap[i, nStatusCount]; |
4976 | 4981 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
---|---|---|
1367 | 1367 |
try |
1368 | 1368 |
{ |
1369 | 1369 |
DataGridView dgv = dgvAllDisplay; |
1370 |
|
|
1371 |
// 支払可能額のカラム位置 |
|
1372 |
int ResultCols = dgv.ColumnCount + (int)ColPayTotal.Results; |
|
1373 |
int OrverCols = dgv.ColumnCount + (int)ColPayTotal.Overpayments; |
|
1370 | 1374 |
|
1375 |
|
|
1371 | 1376 |
Color SetBackColor = Color.White; |
1372 | 1377 |
Color SetForeColor = Color.Black; |
1373 | 1378 |
// 列の色を変える |
... | ... | |
1392 | 1397 |
break; |
1393 | 1398 |
default: |
1394 | 1399 |
SetBackColor = Color.White; |
1400 |
SetForeColor = Color.Black; |
|
1401 |
|
|
1402 |
// 支払可能額のカラム位置はマイナスは赤字にする |
|
1403 |
if (i == ResultCols || i == OrverCols) |
|
1404 |
{ |
|
1405 |
int ResultValue = CommonMotions.cnvInt(CurRow.Cells[ResultCols].Value); |
|
1406 |
// 支払可能額・支払超過額がマイナスになったら文字を赤にする |
|
1407 |
if (ResultValue < 0) SetForeColor = Color.Red; |
|
1408 |
} |
|
1409 |
|
|
1395 | 1410 |
break; |
1396 | 1411 |
} |
1397 | 1412 |
CurRow.Cells[i].Style.BackColor = SetBackColor; |
1398 |
if (CurRow.Cells[i].Style.ForeColor != Color.Red) CurRow.Cells[i].Style.ForeColor = SetForeColor;
|
|
1413 |
CurRow.Cells[i].Style.ForeColor = SetForeColor; |
|
1399 | 1414 |
} |
1400 | 1415 |
} |
1401 | 1416 |
catch (System.Exception ex) |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs | ||
---|---|---|
225 | 225 |
/// ?O???b?h????s?^?C?g?? |
226 | 226 |
/// </summary> |
227 | 227 |
private static string[] GroupTitle = new string[] { "" |
228 |
, "?O?@?@???@?@??@?@" |
|
228 |
, "?O?@?@???@?@??@?@?@"
|
|
229 | 229 |
, "???@??@?{?@?H?@??@" |
230 | 230 |
, "???@??@???@??@??@" |
231 |
, "???????Z????@" |
|
231 |
, "?@???????Z????@"
|
|
232 | 232 |
, "????????????@" |
233 | 233 |
, "???@??@??@???@??@" |
234 | 234 |
, "????????????@" |
235 | 235 |
, "??@??@??@???@??@" |
236 |
, "?w?@?@???@?@?i?@?@" |
|
237 |
, "???@?o?@??@???@"
|
|
238 |
, "????????????@"
|
|
239 |
, "?[?@???@???@???@"};
|
|
236 |
, "?@?w?@?@???@?@?i?@?@"
|
|
237 |
, "?@???@?o?@??@???@?@"
|
|
238 |
, "?@????????????@?@"
|
|
239 |
, "?@?[?@???@???@???@?@"};
|
|
240 | 240 |
/// <summary> |
241 | 241 |
/// ?u???b?N????^?C?g?? |
242 | 242 |
/// </summary> |
243 | 243 |
private static string[] BlockTitle = new string[] { "" |
244 | 244 |
, "???@??@?H?@???@??@" |
245 |
, "???@?H?@???@??@"
|
|
246 |
, "?H?@???@???@???@"
|
|
247 |
, "?H?@???@???@?i?@"
|
|
248 |
, "?H?@?@???@?@??@?@" }; |
|
245 |
, "?@???@?H?@???@??@?@"
|
|
246 |
, "?@?H?@???@???@???@?@"
|
|
247 |
, "?@?H?@???@???@?i?@?@"
|
|
248 |
, "?@?H?@?@???@?@??@?@" };
|
|
249 | 249 |
#endregion |
250 | 250 |
|
251 | 251 |
#region ?Z????F |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs | ||
---|---|---|
37 | 37 |
|
38 | 38 |
bool bDspFlag = false; |
39 | 39 |
// 最高管理者以外は共通費計算画面を表示しない |
40 |
// 新セキュリティデータ対応済みかを確認する |
|
41 |
if (CommonMotions.LoginUserData.SecCode == 0) |
|
40 |
int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority; // 経営者アクセス |
|
41 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode |
|
42 |
|| CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key) |
|
42 | 43 |
{ |
43 |
// システム権限によってデータアクセスに制限がある |
|
44 |
if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement |
|
45 |
|| CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key) |
|
46 |
{ |
|
47 |
// 公共工事だけ共通費を計する |
|
48 |
if (m_PublicConstruction) bDspFlag = true; |
|
49 |
} |
|
44 |
// 公共工事だけ共通費を計する |
|
45 |
if (m_PublicConstruction) bDspFlag = true; |
|
50 | 46 |
} |
51 |
else |
|
52 |
{ |
|
53 |
int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority; // 経営者アクセス |
|
54 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode |
|
55 |
|| CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key) |
|
56 |
{ |
|
57 |
// 公共工事だけ共通費を計する |
|
58 |
if (m_PublicConstruction) bDspFlag = true; |
|
59 |
} |
|
60 |
} |
|
61 | 47 |
btnCommonTemporary.Visible = bDspFlag; |
62 | 48 |
} |
63 | 49 |
catch (Exception ex) |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs | ||
---|---|---|
159 | 159 |
#region 変数 |
160 | 160 |
|
161 | 161 |
/// <summary> |
162 |
/// 起動フラグ |
|
163 |
/// </summary> |
|
164 |
private int m_ExecuteFlg = 0; |
|
165 |
|
|
166 |
/// <summary> |
|
167 |
/// 起動時補助フラグ |
|
168 |
/// </summary> |
|
169 |
private int m_ExecuteSubFlg = 0; |
|
170 |
|
|
171 |
/// <summary> |
|
162 | 172 |
/// 工事コード |
163 | 173 |
/// </summary> |
164 | 174 |
private int m_ConstructionCode = 0; |
... | ... | |
193 | 203 |
#region プロパティ |
194 | 204 |
|
195 | 205 |
/// <summary> |
206 |
/// 起動フラグ |
|
207 |
/// </summary> |
|
208 |
public int ExecuteFlg |
|
209 |
{ |
|
210 |
get { return m_ExecuteFlg; } |
|
211 |
set { m_ExecuteFlg = value; } |
|
212 |
} |
|
213 |
|
|
214 |
/// <summary> |
|
215 |
/// 起動時補助フラグ |
|
216 |
/// </summary> |
|
217 |
public int ExecuteSubFlg |
|
218 |
{ |
|
219 |
get { return m_ExecuteSubFlg; } |
|
220 |
set { m_ExecuteSubFlg = value; } |
|
221 |
} |
|
222 |
|
|
223 |
/// <summary> |
|
196 | 224 |
/// 工事コード |
197 | 225 |
/// </summary> |
198 | 226 |
public int ConstructionCode |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs | ||
---|---|---|
185 | 185 |
strSQL.Append(", A.SECONDSTRING"); |
186 | 186 |
strSQL.Append(", A.COMPANYCODE AS COMPANYCODE"); |
187 | 187 |
strSQL.Append(", A.COMPANYNAME"); |
188 |
strSQL.Append(", SUM(A.EXECUTIONAMOUNT)"); |
|
188 |
//strSQL.Append(", SUM(A.EXECUTIONAMOUNT)"); |
|
189 |
strSQL.Append(", C.TotalVal"); |
|
189 | 190 |
strSQL.Append(", A.SOURCECODE"); |
190 | 191 |
strSQL.Append(", A.PURCHASEORDERFLG"); |
191 | 192 |
strSQL.Append(", B.DETAILSTRING"); |
... | ... | |
196 | 197 |
strSQL.AppendFormat(", DATE ('{0}') AS PRINTOUTDATE", DateTime.MinValue.ToShortDateString()); |
197 | 198 |
strSQL.Append(", ConstrType.PublicFlg"); |
198 | 199 |
strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL A"); |
200 |
|
|
201 |
strSQL.Append(" Inner Join("); |
|
202 |
strSQL.Append(" Select"); |
|
203 |
strSQL.Append(" ATD.ConstructionCode"); |
|
204 |
strSQL.Append(", ATD.GROUPCOUNT"); |
|
205 |
strSQL.Append(", ATD.COMPANYCODE"); |
|
206 |
strSQL.Append(", ATD.PurchaseOrderFlg"); |
|
207 |
strSQL.Append(", SUM(ATD.EXECUTIONAMOUNT) As TotalVal"); |
|
208 |
strSQL.Append(" From"); |
|
209 |
strSQL.Append(" CONSTRUCTIONLEDGERDETAIL As ATD"); |
|
210 |
strSQL.Append(" Group by"); |
|
211 |
strSQL.Append(" ATD.CONSTRUCTIONCODE"); |
|
212 |
strSQL.Append(", ATD.GROUPCOUNT"); |
|
213 |
strSQL.Append(", ATD.COMPANYCODE"); |
|
214 |
strSQL.Append(", ATD.PurchaseOrderFlg"); |
|
215 |
strSQL.Append(") As C"); |
|
216 |
strSQL.Append(" On C.ConstructionCode = A.ConstructionCode"); |
|
217 |
strSQL.Append(" And C.GROUPCOUNT = A.GROUPCOUNT"); |
|
218 |
strSQL.Append(" And C.COMPANYCODE = A.COMPANYCODE"); |
|
219 |
strSQL.Append(" And C.PurchaseOrderFlg = A.PurchaseOrderFlg"); |
|
220 |
|
|
199 | 221 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFODETAIL B"); |
200 | 222 |
strSQL.Append(" ON B.CONSTRUCTIONCODE = A.SOURCECODE"); |
201 | 223 |
strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
224 |
|
|
202 | 225 |
strSQL.Append(" Inner Join constructionbaseinfo AS Base"); |
203 | 226 |
strSQL.Append(" On Base.ConstructionCode = A.ConstructionCode"); |
227 |
|
|
204 | 228 |
strSQL.Append(" Inner Join constructiontypemaster As ConstrType"); |
205 | 229 |
strSQL.Append(" On ConstrType.TypeCode = Base.ConstructionType"); |
206 | 230 |
|
... | ... | |
211 | 235 |
strSQL.AppendFormat(" AND A.COMPANYTYPE != {0}", (int)CommonDefine.CodeDataType.Person); |
212 | 236 |
strSQL.AppendFormat(" AND (A.PurchaseOrderFlg > {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld); |
213 | 237 |
strSQL.AppendFormat(" AND A.PurchaseOrderFlg != {0})", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making); |
214 |
|
|
238 |
|
|
215 | 239 |
strSQL.AppendFormat(" AND ((ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
216 |
strSQL.AppendFormat(" AND A.EXECUTIONAMOUNT >= {0})", CommonDefine.s_PrintOutPrice); |
|
240 |
//strSQL.AppendFormat(" AND A.EXECUTIONAMOUNT >= {0})", CommonDefine.s_PrintOutPrice); |
|
241 |
strSQL.AppendFormat(" AND C.TotalVal >= {0})", CommonDefine.s_PrintOutPrice); |
|
217 | 242 |
strSQL.AppendFormat(" OR (ConstrType.PublicFlg = {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
218 | 243 |
strSQL.AppendFormat(" AND A.EXECUTIONAMOUNT >= {0}))", CommonDefine.s_PrintOutPricePublic); |
219 | 244 |
|
... | ... | |
231 | 256 |
strSQL.Append(", H.COMPANYNAME"); |
232 | 257 |
|
233 | 258 |
strSQL.Append(", Case ifnull(F.OrderPrice, 0)"); |
234 |
strSQL.Append(" When 0 Then A.EXECUTIONAMOUNT");
|
|
235 |
strSQL.Append(" Else F.OrderPrice");
|
|
259 |
strSQL.Append(" When 0 Then A.EXECUTIONAMOUNT");
|
|
260 |
strSQL.Append(" Else F.OrderPrice");
|
|
236 | 261 |
strSQL.Append(" End AS EXECUTIONAMOUNT"); |
237 | 262 |
|
238 | 263 |
strSQL.Append(", A.SOURCECODE"); |
... | ... | |
301 | 326 |
DataGridView dgv = dgvAllDisplay; |
302 | 327 |
bool LimitedDisp = false; |
303 | 328 |
|
304 |
StringBuilder strSQL = new StringBuilder(); ;
|
|
329 |
StringBuilder strSQL = new StringBuilder(); |
|
305 | 330 |
int ParentCode = m_ConstructionCode; |
306 | 331 |
if (m_ConstructionBaseInfo.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent) |
307 | 332 |
{ // 結合の親工事 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs | ||
---|---|---|
676 | 676 |
if (m_CloseingProcessOn) |
677 | 677 |
{ |
678 | 678 |
// 一覧リストへ移動 |
679 |
//ClsExcute.BackProcess();
|
|
679 |
if (m_DirectFlg) ClsExcute.BackProcess();
|
|
680 | 680 |
} |
681 | 681 |
} |
682 | 682 |
catch (System.Exception ex) |
branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs | ||
---|---|---|
6 | 6 |
using System.Text; |
7 | 7 |
using System.Windows.Forms; |
8 | 8 |
using System.Collections; |
9 |
using System.Linq; |
|
9 | 10 |
|
10 | 11 |
using log4net; |
11 | 12 |
using log4net.Appender; |
... | ... | |
292 | 293 |
{ |
293 | 294 |
frm.DialogUsed = true; |
294 | 295 |
|
296 |
frm.SelectData.Clear(); |
|
295 | 297 |
//frm.ShowInTaskbar = false; |
296 | 298 |
frm.ShowDialog(); |
297 | 299 |
if (frm.EndButton) return; |
298 | 300 |
|
299 | 301 |
List<KeyValuePair<int, string>> selectList = frm.SelectData; |
302 |
|
|
303 |
// 同一コードがあるかの確認 |
|
304 |
for (int i = 0; i < selectList.Count; i++) |
|
305 |
{ |
|
306 |
DataGridViewRow[] FindRow = dgvJobItem.Rows.Cast<DataGridViewRow>() |
|
307 |
.Where(x => CommonMotions.cnvInt(x.Cells[0].Value) == selectList[i].Key) |
|
308 |
.ToArray(); |
|
309 |
if (FindRow.Count() > 0) |
|
310 |
{ |
|
311 |
MessageBox.Show("同じ工種が選択されています。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
312 |
return; |
|
313 |
} |
|
314 |
} |
|
315 |
|
|
300 | 316 |
int icurcnt = dgvJobItem.CurrentRow.Index; |
301 | 317 |
|
302 | 318 |
// 追加行が表示行より多い場合は行を追加する |
... | ... | |
334 | 350 |
{ |
335 | 351 |
frm.DialogUsed = true; |
336 | 352 |
|
353 |
frm.SelectData.Clear(); |
|
337 | 354 |
//frm.ShowInTaskbar = false; |
338 | 355 |
frm.ShowDialog(); |
339 | 356 |
if (frm.EndButton) return; |
340 | 357 |
|
341 | 358 |
List<KeyValuePair<int, string>> selectList = frm.SelectData; |
359 |
|
|
360 |
// 同一コードがあるかの確認 |
|
361 |
for (int i = 0; i < selectList.Count; i++) |
|
362 |
{ |
|
363 |
DataGridViewRow[] FindRow = dgvJobLink.Rows.Cast<DataGridViewRow>() |
|
364 |
.Where(x => CommonMotions.cnvInt(x.Cells[0].Value) == selectList[i].Key) |
|
365 |
.ToArray(); |
|
366 |
if (FindRow.Count() > 0) |
|
367 |
{ |
|
368 |
MessageBox.Show("同じ職種が選択されています。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
369 |
return; |
|
370 |
} |
|
371 |
} |
|
372 |
|
|
342 | 373 |
int icurcnt = dgvJobLink.CurrentRow.Index; |
343 | 374 |
|
344 | 375 |
// 追加行が表示行より多い場合は行を追加する |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
508 | 508 |
} |
509 | 509 |
#endregion |
510 | 510 |
|
511 |
#region 旧マスタメンテナンスタブ表示制御 |
|
512 |
///// <summary> |
|
513 |
///// 旧マスタメンテナンスタブ表示制御 |
|
514 |
///// </summary> |
|
515 |
//private void DisplayOldMenteTab() |
|
516 |
//{ |
|
517 |
// try |
|
518 |
// { |
|
519 |
// int SecurityCode = CommonMotions.LoginUserData.SecurityManagement; |
|
520 |
// tabMenu.TabPages[(int)MenuTabAssign.MentenanceMenu].BackColor = OldMentenanceColor[SecurityCode]; |
|
521 |
// tblLayoutMaster.BackColor = OldMentenanceColor[SecurityCode]; |
|
522 |
|
|
523 |
// tabMenu.TabPages[(int)MenuTabAssign.MentenanceMenu].Text = CommonDefine.SystemManageDiv[(SecurityCode - 1)].Value + "マスタ"; |
|
524 |
|
|
525 |
// int[,] BtnDspFlg = null; |
|
526 |
// int Sec1 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key; |
|
527 |
// int Sec2 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key; |
|
528 |
// int Sec3 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key; |
|
529 |
// int Sec4 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key; |
|
530 |
|
|
531 |
// if (CommonMotions.LoginUserData.SecurityManagement == (int)Sec1) |
|
532 |
// { |
|
533 |
// BtnDspFlg = DspMentenance1; |
|
534 |
// } |
|
535 |
// else if (CommonMotions.LoginUserData.SecurityManagement == (int)Sec2) |
|
536 |
// { |
|
537 |
// BtnDspFlg = DspMentenance2; |
|
538 |
// } |
|
539 |
// else if (CommonMotions.LoginUserData.SecurityManagement == (int)Sec3) |
|
540 |
// { |
|
541 |
// BtnDspFlg = DspMentenance3; |
|
542 |
// } |
|
543 |
// else if (CommonMotions.LoginUserData.SecurityManagement == (int)Sec4) |
|
544 |
// { |
|
545 |
// BtnDspFlg = DspMentenance4; |
|
546 |
// } |
|
547 |
|
|
548 |
// bool bCreateLine = false; |
|
549 |
// bool bFisrt = true; |
|
550 |
// ProcessExcute wrkRec = new ProcessExcute(); |
|
551 |
// // 起動処理に設定されているかをチェックする |
|
552 |
// for (int iy = 0; iy < MentenanceMenuButton.GetLength(0); iy++) |
|
553 |
// { |
|
554 |
// bCreateLine = false; |
|
555 |
// for (int ix = 0; ix < MentenanceMenuButton.GetLength(1); ix++) |
|
556 |
// { |
|
557 |
// if (BtnDspFlg[iy, ix] == 0) continue; |
|
558 |
// // 新規時は行を作成する |
|
559 |
// if (!bCreateLine) |
|
560 |
// { |
|
561 |
// if (!bFisrt) TableLayoutRowAdd(tblLayoutMaster); |
|
562 |
// bFisrt = false; |
|
563 |
// } |
|
564 |
// wrkRec.ExecCode = MentenanceMenuButton[iy, ix]; |
|
565 |
// // ボタンを作成する |
|
566 |
// ButtonAdd(tblLayoutMaster, (ix * 2), wrkRec, 267, 44); |
|
567 |
|
|
568 |
// bCreateLine = true; |
|
569 |
// } |
|
570 |
// } |
|
571 |
// } |
|
572 |
// catch (Exception ex) |
|
573 |
// { |
|
574 |
// logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
575 |
// } |
|
576 |
//} |
|
577 |
#endregion |
|
578 |
|
|
579 | 511 |
#region マスタメンテナンスタブ表示制御 |
580 | 512 |
/// <summary> |
581 | 513 |
/// マスタメンテナンスタブ表示制御 |
... | ... | |
592 | 524 |
tblLayoutMaster.Height = s_MentenanceRowHeight; |
593 | 525 |
m_MentenanceButton.Clear(); |
594 | 526 |
|
595 |
//// チェック配列をセットする |
|
596 |
//// 旧セキュリティを使用している場合はパターンを変える |
|
597 |
//if (CommonMotions.LoginUserData.SecCode == 0) |
|
598 |
//{ |
|
599 |
// DisplayOldMenteTab(); |
|
600 |
// return; |
|
601 |
//} |
|
602 |
|
|
603 | 527 |
// タブカウント取得 |
604 | 528 |
int tabPageCnt = tabMenu.TabPages.IndexOf(m_tabManager.PageArray[(int)MenuTabAssign.MentenanceMenu].TabPage); |
605 | 529 |
if (tabPageCnt < 0) return; |
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.1.202")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.1.202")]
|
|
35 |
[assembly: AssemblyVersion("1.0.1.204")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.1.204")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff