リビジョン 122
資材管理(日付入力時の書式設定、コメント入力時のIMEオン)
AssemblyInfo.cs(バージョンを1.0.0.27に変更)
ProcessManagement.xml(DB接続先を運用VPSに変更)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialCountEntry/FrmMaterialCountEntry.designer.cs | ||
---|---|---|
310 | 310 |
// |
311 | 311 |
// txtComment |
312 | 312 |
// |
313 |
this.txtComment.ImeMode = System.Windows.Forms.ImeMode.On; |
|
313 | 314 |
this.txtComment.Location = new System.Drawing.Point(102, 223); |
314 | 315 |
this.txtComment.Name = "txtComment"; |
315 | 316 |
this.txtComment.Size = new System.Drawing.Size(597, 23); |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.cs | ||
---|---|---|
24 | 24 |
using ProcessManagement.Forms.CustomControls; |
25 | 25 |
using ProcessManagement.Forms.ControlsAction; |
26 | 26 |
|
27 |
//*------------------------ 単位マスタメンテ画面 ----------------------*
|
|
27 |
//*------------------------ 資材貸出画面 ----------------------*
|
|
28 | 28 |
// 2015/07/14 Ver1.0.0.0 Create Source |
29 | 29 |
// |
30 | 30 |
// |
... | ... | |
228 | 228 |
|
229 | 229 |
#endregion |
230 | 230 |
|
231 |
#region セルの入力前処理 |
|
232 |
/// <summary> |
|
233 |
/// セルの入力前処理 |
|
234 |
/// </summary> |
|
235 |
/// <param name="sender"></param> |
|
236 |
/// <param name="e"></param> |
|
237 |
private void dgvAllDisplay_CellEnter(object sender, DataGridViewCellEventArgs e) |
|
238 |
{ |
|
239 |
try |
|
240 |
{ |
|
241 |
// データグリッドがActiveでなければ処理しない |
|
242 |
if (ActiveControl == null) return; |
|
243 |
if (!ActiveControl.GetType().Equals(typeof(DataGridViewEX))) return; |
|
231 | 244 |
|
245 |
DataGridView dgv = (DataGridView)sender; |
|
246 |
|
|
247 |
// 読込専用セルは処理しない |
|
248 |
if (dgv.CurrentCell.ReadOnly) return; |
|
249 |
|
|
250 |
//IMEのモードを変更する |
|
251 |
switch (e.ColumnIndex) |
|
252 |
{ |
|
253 |
case (int)DispColumn.CommentText: // コメント |
|
254 |
dgv.ImeMode = ImeMode.On; |
|
255 |
break; |
|
256 |
default: |
|
257 |
dgv.ImeMode = ImeMode.Disable; |
|
258 |
break; |
|
259 |
} |
|
260 |
// セル内容選択 |
|
261 |
dgv.BeginEdit(true); |
|
262 |
} |
|
263 |
catch (System.Exception ex) |
|
264 |
{ |
|
265 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
266 |
} |
|
267 |
} |
|
268 |
#endregion |
|
269 |
|
|
232 | 270 |
#region イベントメソッド |
233 | 271 |
/// <summary> |
234 | 272 |
/// ×ボタン押下処理 |
... | ... | |
447 | 485 |
// null値は処理しない |
448 | 486 |
if (dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].Value == null) return; |
449 | 487 |
|
488 |
if (dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].ColumnIndex == (int)DispColumn.RepayPlanDate) |
|
489 |
{ |
|
490 |
string txtbox = dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(); |
|
491 |
|
|
492 |
// 日付をyyyy/mm/dd形式で表示する |
|
493 |
if (txtbox.Length == 0) return; |
|
494 |
if (txtbox.Equals(CommonDefine.s_UndecidedString)) return; |
|
495 |
|
|
496 |
// 今の年を取得する |
|
497 |
int iYear = DateTime.Now.Year; |
|
498 |
|
|
499 |
// 文字の出現回数カウント |
|
500 |
if (CommonMotions.chkNumeric(txtbox)) |
|
501 |
{ // 数字のみ入力 |
|
502 |
if (txtbox.ToString().Length <= 4) |
|
503 |
{ |
|
504 |
txtbox = iYear.ToString() |
|
505 |
+ "/" + CommonMotions.cnvInt(txtbox.Substring(0, 2)).ToString("00") |
|
506 |
+ "/" + CommonMotions.cnvInt(txtbox.Substring(2)).ToString("00"); |
|
507 |
} |
|
508 |
} |
|
509 |
else |
|
510 |
{ // 99/99の入力 |
|
511 |
if (txtbox.ToString().Length <= 5) |
|
512 |
{ |
|
513 |
txtbox = iYear.ToString() |
|
514 |
+ "/" + CommonMotions.cnvInt(txtbox.Substring(0, txtbox.IndexOf("/"))).ToString("00") |
|
515 |
+ "/" + CommonMotions.cnvInt(txtbox.Substring(txtbox.IndexOf("/") + 1)).ToString("00"); |
|
516 |
|
|
517 |
} |
|
518 |
} |
|
519 |
|
|
520 |
if (!CommonMotions.chkDate(txtbox.ToString())) return; |
|
521 |
|
|
522 |
dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = DateTime.Parse(txtbox.ToString()).ToShortDateString(); |
|
523 |
} |
|
524 |
|
|
450 | 525 |
// 値が変わればツールチップを変更する |
451 | 526 |
dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].ToolTipText |
452 | 527 |
= CommonMotions.cnvString(((DataGridView)sender).Rows[e.RowIndex].Cells[e.ColumnIndex].Value); |
453 | 528 |
// 変更フラグON |
454 | 529 |
m_bChengeAns = true; |
455 | 530 |
} |
456 |
/// <summary> |
|
531 |
|
|
532 |
/// <summary> |
|
457 | 533 |
/// 行削除ボタン押下 |
458 | 534 |
/// </summary> |
459 | 535 |
/// <param name="sender"></param> |
... | ... | |
657 | 733 |
} |
658 | 734 |
} |
659 | 735 |
|
660 |
|
|
661 |
|
|
662 |
|
|
663 | 736 |
/// <summary> |
664 | 737 |
/// 初期表示処理 |
665 | 738 |
/// </summary> |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.designer.cs | ||
---|---|---|
269 | 269 |
this.dgvMaster.Size = new System.Drawing.Size(1137, 229); |
270 | 270 |
this.dgvMaster.TabIndex = 0; |
271 | 271 |
this.dgvMaster.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellClick); |
272 |
this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter); |
|
272 | 273 |
this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged); |
273 | 274 |
// |
274 | 275 |
// Column13 |
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Material/MaterialItemsMaster/FrmMaterialItemsMaster.cs | ||
---|---|---|
399 | 399 |
{ |
400 | 400 |
m_IoMt.rollback(); |
401 | 401 |
m_IoMi.rollback(); |
402 |
MessageBox.Show("削除に失敗しました。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
402 |
MessageBox.Show("他のユーザで更新されています。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
403 | 403 |
return; |
404 | 404 |
} |
405 | 405 |
|
... | ... | |
841 | 841 |
{ |
842 | 842 |
m_IoMt.rollback(); |
843 | 843 |
m_IoMtype.rollback(); |
844 |
MessageBox.Show("更新に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
844 |
MessageBox.Show("他のユーザで更新されています。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
845 | 845 |
return; |
846 | 846 |
} |
847 | 847 |
} |
branches/src/ProcessManagement/ProcessManagement/ProcessManagement.xml | ||
---|---|---|
2 | 2 |
<ProcessManagement> |
3 | 3 |
<!-- DB接続情報 --> |
4 | 4 |
<DBConnect> |
5 |
<!--<DBServer>203.137.94.208</DBServer>--> |
|
6 |
<DBServer>localhost</DBServer> |
|
5 |
<DBServer>203.137.94.208</DBServer> |
|
7 | 6 |
<DBUser>pmana</DBUser> |
8 | 7 |
<Password>manager</Password> |
9 | 8 |
<Database>processmanagement</Database> |
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.27")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.27")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff