リビジョン 308
工事明細情報定義コメント修正
工事一覧表示デザイン修正
一覧表示画面に営業期選択がある画面で選択時バグ修正
資材管理、当日に時間を空けての登録が出来なかったのを修正
請求まとめ修正中
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 124;
|
|
17 |
public static int s_SystemVersion = 125;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs | ||
---|---|---|
17 | 17 |
public enum DataNoDef |
18 | 18 |
{ |
19 | 19 |
/// <summary> |
20 |
/// 発注者名1 |
|
20 |
/// 1:発注者名1
|
|
21 | 21 |
/// </summary> |
22 | 22 |
OrderersName = 1, |
23 | 23 |
/// <summary> |
24 |
/// 工事名称 |
|
24 |
/// 2:工事名称
|
|
25 | 25 |
/// </summary> |
26 | 26 |
ConstructionName, |
27 | 27 |
/// <summary> |
28 |
/// 工事場所郵便番号 |
|
28 |
/// 3:工事場所郵便番号
|
|
29 | 29 |
/// </summary> |
30 | 30 |
PlaceZipCode, |
31 | 31 |
/// <summary> |
32 |
/// 工事場所1 |
|
32 |
/// 4:工事場所1
|
|
33 | 33 |
/// </summary> |
34 | 34 |
ConstructionPlace1, |
35 | 35 |
/// <summary> |
36 |
/// 工事場所2 |
|
36 |
/// 5:工事場所2
|
|
37 | 37 |
/// </summary> |
38 | 38 |
ConstructionPlace2, |
39 | 39 |
/// <summary> |
40 |
/// 工事場所3 |
|
40 |
/// 6:工事場所3
|
|
41 | 41 |
/// </summary> |
42 | 42 |
ConstructionPlace3, |
43 | 43 |
/// <summary> |
44 |
/// 工事概要1 |
|
44 |
/// 7:工事概要1
|
|
45 | 45 |
/// </summary> |
46 | 46 |
Overview1, |
47 | 47 |
/// <summary> |
48 |
/// 工事概要2 |
|
48 |
/// 8:工事概要2
|
|
49 | 49 |
/// </summary> |
50 | 50 |
Overview2, |
51 | 51 |
/// <summary> |
52 |
/// 工事概要3 |
|
52 |
/// 9:工事概要3
|
|
53 | 53 |
/// </summary> |
54 | 54 |
Overview3, |
55 | 55 |
/// <summary> |
56 |
/// 工事概要4 |
|
56 |
/// 10工事概要4
|
|
57 | 57 |
/// </summary> |
58 | 58 |
Overview4, |
59 | 59 |
/// <summary> |
60 |
/// 工事概要5 |
|
60 |
/// 11:工事概要5
|
|
61 | 61 |
/// </summary> |
62 | 62 |
Overview5, |
63 | 63 |
/// <summary> |
64 |
/// 支給品1 |
|
64 |
/// 12:支給品1
|
|
65 | 65 |
/// </summary> |
66 | 66 |
PaidGoods1, |
67 | 67 |
/// <summary> |
68 |
/// 支給品2 |
|
68 |
/// 13:支給品2
|
|
69 | 69 |
/// </summary> |
70 | 70 |
PaidGoods2, |
71 | 71 |
/// <summary> |
72 |
/// 別途工事1 |
|
72 |
/// 14:別途工事1
|
|
73 | 73 |
/// </summary> |
74 | 74 |
SeparateProject1, |
75 | 75 |
/// <summary> |
76 |
/// 別途工事2 |
|
76 |
/// 15:別途工事2
|
|
77 | 77 |
/// </summary> |
78 | 78 |
SeparateProject2, |
79 | 79 |
/// <summary> |
80 |
/// 備考1 |
|
80 |
/// 16:備考1
|
|
81 | 81 |
/// </summary> |
82 | 82 |
Note1, |
83 | 83 |
/// <summary> |
84 |
/// 備考2 |
|
84 |
/// 17:備考2
|
|
85 | 85 |
/// </summary> |
86 | 86 |
Note2, |
87 | 87 |
/// <summary> |
88 |
/// 受注決定申送りコメント |
|
88 |
/// 18:受注決定申送りコメント
|
|
89 | 89 |
/// </summary> |
90 | 90 |
OrdersDecisionComment, |
91 | 91 |
/// <summary> |
92 |
/// 工事担当者コメント |
|
92 |
/// 19:工事担当者コメント
|
|
93 | 93 |
/// </summary> |
94 | 94 |
ContructorComment, |
95 | 95 |
/// <summary> |
96 |
/// 施工完了コメント |
|
96 |
/// 20:施工完了コメント
|
|
97 | 97 |
/// </summary> |
98 | 98 |
CompleteComment, |
99 | 99 |
/// <summary> |
100 |
/// 営業コメント |
|
100 |
/// 21:営業コメント
|
|
101 | 101 |
/// </summary> |
102 | 102 |
SalesComment, |
103 | 103 |
/// <summary> |
104 |
/// 請求コメント |
|
104 |
/// 22:請求コメント
|
|
105 | 105 |
/// </summary> |
106 | 106 |
BillingComment, |
107 | 107 |
/// <summary> |
108 |
/// 入金コメント |
|
108 |
/// 23:入金コメント
|
|
109 | 109 |
/// </summary> |
110 | 110 |
PaymentComment, |
111 | 111 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs | ||
---|---|---|
284 | 284 |
{ |
285 | 285 |
if (m_bInitFlg) return; |
286 | 286 |
|
287 |
// ?R???{?{?b?N?X?Z?b?g |
|
288 |
int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
289 |
int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
290 |
SetcmbDepartment(); |
|
291 |
SetcmbPersons(); |
|
292 |
cmbDepartment.SelectedValue = DepCode; |
|
293 |
cmbConstructionPerson.SelectedValue = PerCode; |
|
294 |
|
|
295 | 287 |
// ?f?[?^?\?? |
296 | 288 |
DataDisplay(); |
297 | 289 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs | ||
---|---|---|
314 | 314 |
{ |
315 | 315 |
if (m_initDataLoad) return; |
316 | 316 |
|
317 |
// ?R???{?{?b?N?X?Z?b?g |
|
318 |
int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
319 |
int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
320 |
SubControlEvent((int)EventDef.Department | (int)EventDef.Person); |
|
321 |
SetcmbDepartment(); |
|
322 |
SetcmbPersons(); |
|
323 |
cmbDepartment.SelectedValue = DepCode; |
|
324 |
cmbConstructionPerson.SelectedValue = PerCode; |
|
325 |
SetControlEvent((int)EventDef.Department | (int)EventDef.Person); |
|
326 |
|
|
327 | 317 |
// ?f?[?^?\?? |
328 | 318 |
DataDisplay(); |
329 | 319 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs | ||
---|---|---|
180 | 180 |
this.grpExample1.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
181 | 181 |
this.grpExample1.Location = new System.Drawing.Point(10, 616); |
182 | 182 |
this.grpExample1.Name = "grpExample1"; |
183 |
this.grpExample1.Size = new System.Drawing.Size(400, 38);
|
|
183 |
this.grpExample1.Size = new System.Drawing.Size(330, 38);
|
|
184 | 184 |
this.grpExample1.TabIndex = 33; |
185 | 185 |
this.grpExample1.TabStop = false; |
186 | 186 |
this.grpExample1.Text = "施工状態変更より1カ月経過"; |
... | ... | |
190 | 190 |
// |
191 | 191 |
this.lblEstimateType03.BackColor = System.Drawing.Color.OliveDrab; |
192 | 192 |
this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
193 |
this.lblEstimateType03.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
193 | 194 |
this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed; |
194 |
this.lblEstimateType03.Location = new System.Drawing.Point(264, 14);
|
|
195 |
this.lblEstimateType03.Location = new System.Drawing.Point(224, 14);
|
|
195 | 196 |
this.lblEstimateType03.Name = "lblEstimateType03"; |
196 |
this.lblEstimateType03.Size = new System.Drawing.Size(120, 20);
|
|
197 |
this.lblEstimateType03.Size = new System.Drawing.Size(100, 20);
|
|
197 | 198 |
this.lblEstimateType03.TabIndex = 0; |
198 | 199 |
this.lblEstimateType03.Text = "予算取り案件"; |
199 | 200 |
this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
... | ... | |
203 | 204 |
this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange; |
204 | 205 |
this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
205 | 206 |
this.lblEstimateType02.ForeColor = System.Drawing.Color.Black; |
206 |
this.lblEstimateType02.Location = new System.Drawing.Point(136, 14);
|
|
207 |
this.lblEstimateType02.Location = new System.Drawing.Point(116, 14);
|
|
207 | 208 |
this.lblEstimateType02.Name = "lblEstimateType02"; |
208 |
this.lblEstimateType02.Size = new System.Drawing.Size(120, 20);
|
|
209 |
this.lblEstimateType02.Size = new System.Drawing.Size(100, 20);
|
|
209 | 210 |
this.lblEstimateType02.TabIndex = 0; |
210 | 211 |
this.lblEstimateType02.Text = "入札案件"; |
211 | 212 |
this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
... | ... | |
217 | 218 |
this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue; |
218 | 219 |
this.lblEstimateType01.Location = new System.Drawing.Point(8, 14); |
219 | 220 |
this.lblEstimateType01.Name = "lblEstimateType01"; |
220 |
this.lblEstimateType01.Size = new System.Drawing.Size(120, 20);
|
|
221 |
this.lblEstimateType01.Size = new System.Drawing.Size(100, 20);
|
|
221 | 222 |
this.lblEstimateType01.TabIndex = 0; |
222 | 223 |
this.lblEstimateType01.Text = "工事案件"; |
223 | 224 |
this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs | ||
---|---|---|
314 | 314 |
{ |
315 | 315 |
if (m_bInitFlag) return; |
316 | 316 |
|
317 |
// コンボボックスセット |
|
318 |
int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
319 |
int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
320 |
SetcmbDepartment(); |
|
321 |
SetcmbPersons(); |
|
322 |
cmbDepartment.SelectedValue = DepCode; |
|
323 |
cmbConstructionPerson.SelectedValue = PerCode; |
|
324 |
|
|
325 | 317 |
// データ表示 |
326 | 318 |
InitDataLoad(); |
327 | 319 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs | ||
---|---|---|
615 | 615 |
{ |
616 | 616 |
if (m_initDataLoad) return; |
617 | 617 |
|
618 |
// ?R???{?{?b?N?X?Z?b?g |
|
619 |
int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
620 |
int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
621 |
SubControlEvent((int)EventDef.Department | (int)EventDef.Person); |
|
622 |
SetcmbDepartment(); |
|
623 |
SetcmbPersons(); |
|
624 |
cmbDepartment.SelectedValue = DepCode; |
|
625 |
cmbConstructionPerson.SelectedValue = PerCode; |
|
626 |
SetControlEvent((int)EventDef.Department | (int)EventDef.Person); |
|
627 |
|
|
628 | 618 |
// ?f?[?^?\?? |
629 | 619 |
DataDisplay(); |
630 | 620 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs | ||
---|---|---|
282 | 282 |
{ |
283 | 283 |
if (m_initDataLoad) return; |
284 | 284 |
|
285 |
// ?R???{?{?b?N?X?Z?b?g |
|
286 |
int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
287 |
int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
288 |
SetcmbDepartment(); |
|
289 |
SetcmbPersons(); |
|
290 |
cmbDepartment.SelectedValue = DepCode; |
|
291 |
cmbConstructionPerson.SelectedValue = PerCode; |
|
292 |
|
|
293 | 285 |
// ?f?[?^?\?? |
294 | 286 |
DataDisplay(); |
295 | 287 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs | ||
---|---|---|
44 | 44 |
DataGridViewRow DataGridViewRow1 = (DataGridViewRow)x; |
45 | 45 |
DataGridViewRow DataGridViewRow2 = (DataGridViewRow)y; |
46 | 46 |
|
47 |
int CompareResult = System.String.Compare(
|
|
48 |
DataGridViewRow1.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value.ToString(),
|
|
49 |
DataGridViewRow2.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value.ToString());
|
|
47 |
int CompareResult = System.Decimal.Compare(
|
|
48 |
CommonMotions.cnvDecimal(DataGridViewRow1.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value),
|
|
49 |
CommonMotions.cnvDecimal(DataGridViewRow2.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value));
|
|
50 | 50 |
|
51 | 51 |
if (CompareResult == 0) |
52 | 52 |
{ |
53 |
CompareResult = System.String.Compare(
|
|
54 |
DataGridViewRow1.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value.ToString(),
|
|
55 |
DataGridViewRow2.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value.ToString());
|
|
53 |
CompareResult = System.DateTime.Compare(
|
|
54 |
CommonMotions.cnvDate(DataGridViewRow2.Cells[(int)DispColumn.ProcessDate].Value),
|
|
55 |
CommonMotions.cnvDate(DataGridViewRow1.Cells[(int)DispColumn.ProcessDate].Value));
|
|
56 | 56 |
} |
57 |
|
|
58 |
if (CompareResult == 0) |
|
59 |
{ |
|
60 |
CompareResult = System.Decimal.Compare( |
|
61 |
CommonMotions.cnvDecimal(DataGridViewRow1.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value), |
|
62 |
CommonMotions.cnvDecimal(DataGridViewRow2.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value)); |
|
63 |
} |
|
57 | 64 |
return CompareResult * sortOrderModifier; |
58 | 65 |
} |
59 | 66 |
} |
60 | 67 |
#endregion |
61 | 68 |
|
62 |
#region コンボボックスのロード
|
|
69 |
#region 初期表示のスタイルを変更
|
|
63 | 70 |
/// <summary> |
64 |
/// コンボボックスのロード
|
|
71 |
/// 初期表示のスタイルを変更
|
|
65 | 72 |
/// </summary> |
66 |
private void LoadComboBox() |
|
73 |
/// <param name="dgv"></param> |
|
74 |
private void InitDisplayStyle() |
|
67 | 75 |
{ |
68 |
IOMaterialRecordInfo IoMri = new IOMaterialRecordInfo(); |
|
69 | 76 |
try |
70 | 77 |
{ |
71 |
if (ConstructionCode == 0) return; |
|
72 |
|
|
73 |
StringBuilder strSQL = new StringBuilder(); |
|
74 |
strSQL.Append("select"); |
|
75 |
strSQL.AppendLine(" DATE_FORMAT(ProcessDate, '%Y/%m/%d')"); |
|
76 |
strSQL.AppendLine(" from"); |
|
77 |
strSQL.AppendLine(" MaterialRecordInfo"); |
|
78 |
strSQL.AppendLine(" where"); |
|
79 |
strSQL.AppendFormat(" ConstructionCode = {0}", ConstructionCode); |
|
80 |
strSQL.AppendFormat(" And RECKIND = {0} ", (int)MaterialRecordInfo.RecKindDef.Rental); |
|
81 |
strSQL.AppendLine(" group by ProcessDate"); |
|
82 |
strSQL.AppendLine(" order by ProcessDate desc"); |
|
83 |
|
|
84 |
ArrayList arData = new ArrayList(); |
|
85 |
if (!IoMri.ExecuteReader(strSQL.ToString(), ref arData)) return; |
|
86 |
|
|
87 |
List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>(); |
|
88 |
|
|
89 |
DataList.Add(new KeyValuePair<string, string>("0", " 新 規")); |
|
90 |
|
|
91 |
// データ表示 |
|
92 |
int cnt = 0; |
|
93 |
foreach (object[] work in arData) |
|
78 |
DataGridView dgv = dgvMaster; |
|
79 |
int nColumnMax = Enum.GetNames(typeof(DispColumn)).Length; |
|
80 |
for (int i = 0; i < nColumnMax; i++) |
|
94 | 81 |
{ |
95 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(CommonMotions.cnvString(work[0]), CommonMotions.cnvString(work[0])); |
|
96 |
|
|
97 |
DataList.Add(keyval); |
|
98 |
cnt++; |
|
82 |
dgv.Columns[i].Visible = s_ColumnVisbleDef[i]; |
|
99 | 83 |
} |
100 |
|
|
101 |
// コンボボックス初期表示 |
|
102 |
cmbProcessDate.DataSource = null; |
|
103 |
cmbProcessDate.ValueMember = "Key"; |
|
104 |
cmbProcessDate.DisplayMember = "Value"; |
|
105 |
ComboBoxAction.InitDataSetCombBox(cmbProcessDate, DataList, false); |
|
106 | 84 |
} |
107 | 85 |
catch (Exception ex) |
108 | 86 |
{ |
109 | 87 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
110 | 88 |
} |
111 |
finally |
|
112 |
{ |
|
113 |
IoMri.close(); |
|
114 |
IoMri = null; |
|
115 |
} |
|
116 | 89 |
} |
117 | 90 |
#endregion |
118 | 91 |
|
... | ... | |
123 | 96 |
private void InitDataLoad() |
124 | 97 |
{ |
125 | 98 |
IOConstructionBaseInfoDetail IoConB = new IOConstructionBaseInfoDetail(); |
126 |
ConstructionBaseInfoDetail ConB = new ConstructionBaseInfoDetail(); |
|
127 | 99 |
try |
128 | 100 |
{ |
129 | 101 |
// 画面表示用データ取得 |
130 | 102 |
StringBuilder strSQL = new StringBuilder(); |
131 |
strSQL.AppendFormat(" where ConstructionCode = {0} and DETAILNO = {1}", |
|
132 |
ConstructionCode, |
|
133 |
(int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
|
103 |
strSQL.AppendFormat(" Where ConstructionCode = {0}", ConstructionCode); |
|
104 |
strSQL.AppendFormat(" And DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
|
105 |
|
|
106 |
ConstructionBaseInfoDetail ConB = new ConstructionBaseInfoDetail(); |
|
134 | 107 |
if (!IoConB.SelectAction(strSQL.ToString(), ref ConB)) return; |
135 | 108 |
|
109 |
lblLabel01.Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8); |
|
136 | 110 |
lblDETAILSTRING.Text = ConB.DetailString; |
137 | 111 |
|
138 | 112 |
// 担当にログインユーザー名を表示 |
139 | 113 |
lblPerson.Text = CommonMotions.LoginUserData.PersonName; |
140 | 114 |
|
141 |
// コンボボックス設定
|
|
142 |
LoadComboBox();
|
|
115 |
// 貸出日
|
|
116 |
lblProcessDate.Text = DateTime.Now.Date.ToString("yyyy/MM/dd");
|
|
143 | 117 |
|
118 |
// データ表示 |
|
119 |
if (!DispGridData()) return; |
|
120 |
|
|
144 | 121 |
m_bChengeAns = false; |
145 | 122 |
} |
146 | 123 |
catch (Exception ex) |
... | ... | |
213 | 190 |
{ |
214 | 191 |
|
215 | 192 |
// 貸出日指定 |
216 |
DateTime dtProcessDate = CommonMotions.cnvDate(cmbProcessDate.SelectedValue).Date == DateTime.MinValue.Date ? |
|
217 |
DateTime.Now.Date : CommonMotions.cnvDate(cmbProcessDate.SelectedValue); |
|
193 |
DateTime dtProcessDate = CommonMotions.cnvDate(lblProcessDate.Text); |
|
218 | 194 |
|
219 |
|
|
220 | 195 |
StringBuilder strMimSQL = new StringBuilder(); |
221 | 196 |
|
222 | 197 |
int intMaterialItemCode = 0; |
... | ... | |
651 | 626 |
try |
652 | 627 |
{ |
653 | 628 |
// 貸出日指定 |
654 |
string strProcessdate = cmbProcessDate.SelectedValue.ToString() == "0" ? |
|
655 |
DateTime.Now.Date.ToString("yyyy/MM/dd") : cmbProcessDate.SelectedValue.ToString(); |
|
629 |
string strProcessdate = lblProcessDate.Text; |
|
656 | 630 |
|
657 | 631 |
// グリッドヘッダースタイルセット |
658 | 632 |
SetGridColumnHeaderStyle(); |
... | ... | |
674 | 648 |
sql.AppendLine(" , Cmi.RENTCOUNT"); |
675 | 649 |
sql.AppendLine(" , ifnull(DATE_FORMAT(Mri.RepayPlanDate, '%Y/%m/%d'), '') as RepayPlanDate"); |
676 | 650 |
sql.AppendLine(" , ifnull(Mri.CommentText, '') as CommentText"); |
677 |
sql.AppendLine(" , Cmi.PROCESSDATE");
|
|
651 |
sql.AppendLine(" , ifnull(DATE_FORMAT(Cmi.PROCESSDATE, '%Y/%m/%d'), '') as ProcessDate");
|
|
678 | 652 |
sql.AppendLine(" , Cmi.REPAYCOUNT"); |
679 | 653 |
sql.AppendLine(" , Cmi.JUNKCOUNT"); |
680 | 654 |
sql.AppendLine(" , Cmi.COMPLETEFLG "); |
... | ... | |
682 | 656 |
sql.AppendLine(" ConstructionMaterialInfo as Cmi"); |
683 | 657 |
sql.AppendLine(" left join MaterialInfo as Mi"); |
684 | 658 |
sql.AppendLine(" on Mi.MaterialItemCode = Cmi.MaterialItemCode "); |
685 |
sql.AppendLine(" left join ("); |
|
686 |
sql.AppendLine(" MaterialItemMaster as Mim"); |
|
659 |
sql.AppendLine(" left join (MaterialItemMaster as Mim"); |
|
687 | 660 |
sql.AppendLine(" left join MaterialKindMaster as Mkm"); |
688 | 661 |
sql.AppendLine(" on Mim.MaterialKindCode = Mkm.MaterialKindCode"); |
689 | 662 |
sql.AppendLine(" )"); |
... | ... | |
691 | 664 |
sql.AppendLine(", MaterialRecordInfo as Mri"); |
692 | 665 |
|
693 | 666 |
sql.AppendFormat(" where Cmi.CONSTRUCTIONCODE = {0} ", ConstructionCode); |
694 |
sql.AppendFormat(" and Cmi.PROCESSDATE = '{0}' ", strProcessdate); |
|
695 | 667 |
sql.AppendLine(" And Mri.CONSTRUCTIONCODE = Cmi.CONSTRUCTIONCODE"); |
696 | 668 |
sql.AppendLine(" And Mri.MATERIALITEMCODE = Cmi.MATERIALITEMCODE"); |
697 | 669 |
sql.AppendLine(" And Mri.PROCESSDATE = Cmi.PROCESSDATE"); |
... | ... | |
702 | 674 |
|
703 | 675 |
// データ表示 |
704 | 676 |
int icnt = 0; |
677 |
int nColumnMax = Enum.GetNames(typeof(DispColumn)).Length; |
|
705 | 678 |
foreach (object[] work in arData) |
706 | 679 |
{ |
707 | 680 |
icnt = dgv.Rows.Add(); |
708 | 681 |
|
709 |
dgv.Rows[icnt].Cells[(int)DispColumn.RowState].Value = DataRowState.Unchanged; |
|
710 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindCode]); |
|
711 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]); |
|
712 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindName].ToolTipText = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]); |
|
713 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindDisplayOrder]); |
|
714 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialItemCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]); |
|
715 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialItemName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialItemName]); |
|
716 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialItemDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemDisplayOrder]); |
|
717 |
dgv.Rows[icnt].Cells[(int)DispColumn.RentCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.RentCount]); |
|
718 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]); |
|
719 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialCountBefore].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]); |
|
720 |
dgv.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Value = CommonMotions.cnvString(work[(int)DataColumn.RepayPlanDate]); |
|
721 |
dgv.Rows[icnt].Cells[(int)DispColumn.CommentText].Value = CommonMotions.cnvString(work[(int)DataColumn.CommentText]); |
|
682 |
DataGridViewRow CurRow = dgv.Rows[icnt]; |
|
683 |
CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Unchanged; |
|
684 |
CurRow.Cells[(int)DispColumn.MaterialKindCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindCode]); |
|
685 |
CurRow.Cells[(int)DispColumn.MaterialKindName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]); |
|
686 |
CurRow.Cells[(int)DispColumn.MaterialKindName].ToolTipText = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]); |
|
687 |
CurRow.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindDisplayOrder]); |
|
688 |
CurRow.Cells[(int)DispColumn.MaterialItemCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]); |
|
689 |
CurRow.Cells[(int)DispColumn.MaterialItemName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialItemName]); |
|
690 |
CurRow.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemDisplayOrder]); |
|
691 |
CurRow.Cells[(int)DispColumn.RentCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.RentCount]); |
|
692 |
CurRow.Cells[(int)DispColumn.MaterialCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]); |
|
693 |
CurRow.Cells[(int)DispColumn.MaterialCountBefore].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]); |
|
694 |
CurRow.Cells[(int)DispColumn.ProcessDate].Value = CommonMotions.cnvString(work[(int)DataColumn.ProcessDate]); |
|
695 |
CurRow.Cells[(int)DispColumn.RepayPlanDate].Value = CommonMotions.cnvString(work[(int)DataColumn.RepayPlanDate]); |
|
696 |
CurRow.Cells[(int)DispColumn.CommentText].Value = CommonMotions.cnvString(work[(int)DataColumn.CommentText]); |
|
722 | 697 |
|
723 | 698 |
// 返却予定日は変えられない |
724 |
dgv.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].ReadOnly = true;
|
|
699 |
CurRow.Cells[(int)DispColumn.RepayPlanDate].ReadOnly = true;
|
|
725 | 700 |
|
701 |
// 当日分以外は変更禁止 |
|
702 |
if (CommonMotions.cnvDate(work[(int)DataColumn.ProcessDate]).Date != DateTime.Today.Date) |
|
703 |
{ |
|
704 |
CurRow.Cells[(int)DispColumn.MaterialCount].ReadOnly = true; |
|
705 |
CurRow.Cells[(int)DispColumn.CommentText].ReadOnly = true; |
|
706 |
// 変更禁止は色を変える |
|
707 |
for (int i = (int)DispColumn.MaterialItemCode; i < nColumnMax; i++) |
|
708 |
{ |
|
709 |
CurRow.Cells[i].Style.ForeColor = Color.Gray; |
|
710 |
} |
|
711 |
continue; |
|
712 |
} |
|
713 |
|
|
726 | 714 |
// 返却・破棄があるもの、返却済みのものは変更できない |
727 | 715 |
if (CommonMotions.cnvInt(work[(int)DataColumn.RepayCount]) > 0 || CommonMotions.cnvInt(work[(int)DataColumn.JunkCount]) > 0 |
728 | 716 |
|| CommonMotions.cnvInt(work[(int)DataColumn.CompleteFlg]) == (int)ConstructionMaterialInfo.CompleteFlgDef.Completed) |
729 | 717 |
{ |
730 |
dgv.Rows[icnt].Cells[(int)DispColumn.MaterialCount].ReadOnly = true;
|
|
731 |
dgv.Rows[icnt].Cells[(int)DispColumn.CommentText].ReadOnly = true;
|
|
718 |
CurRow.Cells[(int)DispColumn.MaterialCount].ReadOnly = true;
|
|
719 |
CurRow.Cells[(int)DispColumn.CommentText].ReadOnly = true;
|
|
732 | 720 |
} |
733 | 721 |
} |
734 | 722 |
|
735 | 723 |
// グリッドを資材種類表示、資材品目表示順にソート |
736 | 724 |
dgv.Sort(new RowComparer()); |
737 | 725 |
|
726 |
// 同じ種類名は表示しない |
|
738 | 727 |
icnt = 0; |
739 | 728 |
foreach (DataGridViewRow work in dgv.Rows) |
740 | 729 |
{ |
... | ... | |
754 | 743 |
|
755 | 744 |
// ボタン制御 |
756 | 745 |
setButtonEnable(); |
746 |
|
|
747 |
// 変更フラグOFF |
|
757 | 748 |
m_bChengeAns = false; |
758 | 749 |
|
759 |
// 貸出日退避 |
|
760 |
m_ProcessPrev = strProcessdate; |
|
761 | 750 |
} |
762 | 751 |
catch (Exception ex) |
763 | 752 |
{ |
... | ... | |
812 | 801 |
StringBuilder strSQL = new StringBuilder(); |
813 | 802 |
foreach (DataGridViewRow r in dgvMaster.Rows) |
814 | 803 |
{ |
804 |
// ----- 行に変化がない場合は処理しない |
|
805 |
if ((DataRowState)r.Cells[(int)DispColumn.RowState].Value == DataRowState.Unchanged) continue; |
|
806 |
|
|
815 | 807 |
// 行のチェック前に元に戻す |
816 | 808 |
CommonMotions.chgBackColor(r.Cells[(int)DispColumn.MaterialCount], true); |
817 | 809 |
CommonMotions.chgBackColor(r.Cells[(int)DispColumn.RepayPlanDate], true); |
... | ... | |
924 | 916 |
/// <summary> |
925 | 917 |
/// ボタン制御 |
926 | 918 |
/// </summary> |
927 |
private void setButtonEnable() |
|
919 |
private void setButtonEnable(DataGridViewRow CurRow = null)
|
|
928 | 920 |
{ |
929 |
bool bEnableFlg = false; |
|
930 | 921 |
try |
931 | 922 |
{ |
923 |
btnMaterialRelease.Enabled = false; |
|
924 |
btnMaterialHistory.Enabled = false; |
|
925 |
|
|
926 |
if (CurRow == null) return; |
|
927 |
|
|
928 |
// 資材履歴ボタン表示 |
|
929 |
btnMaterialHistory.Enabled = true; |
|
930 |
|
|
932 | 931 |
// 本日以外は修正できない |
933 |
DateTime dtWrk = CommonMotions.cnvDate(cmbProcessDate.SelectedValue);
|
|
934 |
if (DateTime.Now.Date != dtWrk.Date && DateTime.MinValue.Date != dtWrk) return;
|
|
932 |
DateTime dtWrk = CommonMotions.cnvDate(CurRow.Cells[(int)DispColumn.ProcessDate].Value);
|
|
933 |
if (DateTime.Now.Date != dtWrk.Date) return; |
|
935 | 934 |
|
936 |
bEnableFlg = true; |
|
935 |
// 資材削除ボタン表示 |
|
936 |
btnMaterialRelease.Enabled = true; |
|
937 | 937 |
} |
938 | 938 |
catch (System.Exception ex) |
939 | 939 |
{ |
940 | 940 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
941 | 941 |
} |
942 |
finally |
|
943 |
{ |
|
944 |
btnDataEntry.Enabled = bEnableFlg; |
|
945 |
btnMaterialSelect.Enabled = bEnableFlg; |
|
946 |
btnMaterialRelease.Enabled = bEnableFlg; |
|
947 |
btnMaterialHistory.Enabled = bEnableFlg; |
|
948 |
// ここでグリッドもロック制御 |
|
949 |
dgvMaster.ReadOnly = !bEnableFlg; |
|
950 |
} |
|
951 | 942 |
} |
952 | 943 |
#endregion |
953 | 944 |
|
... | ... | |
1010 | 1001 |
|
1011 | 1002 |
dgv.Rows[setRow].Cells[(int)DispColumn.RentCount].Value = itemscount[cnt]; |
1012 | 1003 |
dgv.Rows[setRow].Cells[(int)DispColumn.RepayPlanDate].ReadOnly = false; |
1004 |
|
|
1005 |
dgv.Rows[setRow].Cells[(int)DispColumn.ProcessDate].Value = lblProcessDate.Text; |
|
1013 | 1006 |
} |
1014 | 1007 |
|
1015 | 1008 |
cnt++; |
... | ... | |
1037 | 1030 |
|
1038 | 1031 |
// №再採番 |
1039 | 1032 |
LineReNumbering(); |
1033 |
|
|
1034 |
// 変更フラグON |
|
1035 |
m_bChengeAns = true; |
|
1036 |
|
|
1040 | 1037 |
} |
1041 | 1038 |
catch (System.Exception ex) |
1042 | 1039 |
{ |
... | ... | |
1105 | 1102 |
DataGridView dgv = dgvMaster; |
1106 | 1103 |
DataGridViewRow CurRow = dgv.CurrentRow; |
1107 | 1104 |
|
1108 |
DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => x.Visible == true).ToArray(); |
|
1109 |
|
|
1110 | 1105 |
if (CurRow == null) return; |
1111 |
if (rows.Count() == 0) return; |
|
1112 |
if(dgv.SelectedCells.Count == 0) return; |
|
1113 | 1106 |
|
1114 |
|
|
1115 | 1107 |
// 該当資材の「工事資材情報」存在確認 |
1116 | 1108 |
// 貸出日指定 |
1117 |
DateTime dtProcessdate = CommonMotions.cnvString(cmbProcessDate.SelectedValue).Equals("0") ? |
|
1118 |
DateTime.Now.Date : CommonMotions.cnvDate(cmbProcessDate.SelectedValue).Date; |
|
1109 |
DateTime dtProcessdate = CommonMotions.cnvDate(CurRow.Cells[(int)DispColumn.ProcessDate].Value); |
|
1119 | 1110 |
int nMateriakItemCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.MaterialItemCode].Value); |
1120 | 1111 |
|
1121 | 1112 |
List<ConstructionMaterialInfo> lcMi = new List<ConstructionMaterialInfo>(); |
... | ... | |
1145 | 1136 |
return; |
1146 | 1137 |
} |
1147 | 1138 |
|
1148 |
// 非表示 |
|
1149 |
int Cindex = CurRow.Index; |
|
1150 |
CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Deleted; |
|
1151 |
CurRow.Visible = false; |
|
1152 |
|
|
1153 |
// 資材種類名称設定 |
|
1139 |
// 削除行に資材種類名称があれば次行に設定 |
|
1154 | 1140 |
string chkString = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.MaterialKindName].Value); |
1155 | 1141 |
int NextRow = CurRow.Index + 1; |
1156 | 1142 |
if (chkString.Length > 0) |
... | ... | |
1167 | 1153 |
} |
1168 | 1154 |
} |
1169 | 1155 |
|
1156 |
// 非表示 |
|
1157 |
int Cindex = CurRow.Index; |
|
1170 | 1158 |
// データが登録されていない場合は行削除 |
1171 |
if (lcMi.Count == 0) dgv.Rows.RemoveAt(Cindex); |
|
1159 |
if (lcMi.Count == 0) |
|
1160 |
{ |
|
1161 |
dgv.Rows.RemoveAt(Cindex); |
|
1162 |
} |
|
1163 |
else |
|
1164 |
{ |
|
1165 |
CurRow.Visible = false; |
|
1166 |
CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Deleted; |
|
1167 |
} |
|
1172 | 1168 |
|
1173 | 1169 |
// №再採番 |
1174 | 1170 |
LineReNumbering(); |
... | ... | |
1179 | 1175 |
// ボタン制御 |
1180 | 1176 |
setButtonEnable(); |
1181 | 1177 |
} |
1178 |
catch (System.Exception ex) |
|
1179 |
{ |
|
1180 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1181 |
} |
|
1182 | 1182 |
finally |
1183 | 1183 |
{ |
1184 | 1184 |
cMi.close(); cMi = null; |
1185 | 1185 |
} |
1186 | 1186 |
} |
1187 | 1187 |
#endregion |
1188 |
|
|
1189 |
#region 変更行のカウントを取る |
|
1190 |
/// <summary> |
|
1191 |
/// 変更行のカウントを取る |
|
1192 |
/// </summary> |
|
1193 |
/// <returns></returns> |
|
1194 |
private int GetChangeRowCount() |
|
1195 |
{ |
|
1196 |
int nRet = 0; |
|
1197 |
try |
|
1198 |
{ |
|
1199 |
DataGridView dgv = dgvMaster; |
|
1200 |
DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where( |
|
1201 |
x => DataRowState.Unchanged != (DataRowState)x.Cells[(int)DispColumn.RowState].Value) |
|
1202 |
.ToArray(); |
|
1203 |
nRet = Rows.Count(); |
|
1204 |
|
|
1205 |
return nRet; |
|
1206 |
} |
|
1207 |
catch (System.Exception ex) |
|
1208 |
{ |
|
1209 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1210 |
return nRet; |
|
1211 |
} |
|
1212 |
} |
|
1213 |
#endregion |
|
1188 | 1214 |
} |
1189 | 1215 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.cs | ||
---|---|---|
56 | 56 |
RentCount, |
57 | 57 |
MaterialCount, |
58 | 58 |
MaterialCountBefore, |
59 |
ProcessDate, |
|
59 | 60 |
RepayPlanDate, |
60 | 61 |
CommentText, |
61 | 62 |
} |
62 | 63 |
|
64 |
/// <summary> |
|
65 |
/// 読み取りデータ |
|
66 |
/// </summary> |
|
63 | 67 |
private enum DataColumn |
64 | 68 |
{ |
65 | 69 |
MaterialKindCode = 0, |
... | ... | |
72 | 76 |
MaterialCount, |
73 | 77 |
RepayPlanDate, |
74 | 78 |
CommentText, |
79 |
ProcessDate, |
|
75 | 80 |
RepayCount, |
76 | 81 |
JunkCount, |
77 | 82 |
CompleteFlg, |
78 | 83 |
} |
84 |
|
|
79 | 85 |
/// <summary> |
80 |
/// マスタリストMAXライン
|
|
86 |
/// グリッドカラム表示定義
|
|
81 | 87 |
/// </summary> |
82 |
//private const int s_ListMaxLineCount = 53; |
|
88 |
private bool[] s_ColumnVisbleDef = new bool[] |
|
89 |
{ |
|
90 |
false, |
|
91 |
true, |
|
92 |
false, |
|
93 |
true, |
|
94 |
false, |
|
95 |
false, |
|
96 |
true, |
|
97 |
false, |
|
98 |
true, |
|
99 |
true, |
|
100 |
false, |
|
101 |
true, |
|
102 |
true, |
|
103 |
true, |
|
104 |
}; |
|
83 | 105 |
#endregion |
84 | 106 |
|
85 | 107 |
#region 変数 |
... | ... | |
103 | 125 |
private bool m_EndButton = false; |
104 | 126 |
|
105 | 127 |
/// <summary> |
106 |
/// 貸出日変更前値 |
|
107 |
/// </summary> |
|
108 |
private string m_ProcessPrev = ""; |
|
109 |
|
|
110 |
/// <summary> |
|
111 | 128 |
/// 参照フラグ |
112 | 129 |
/// </summary> |
113 | 130 |
private bool m_EditLock = false; |
... | ... | |
294 | 311 |
|
295 | 312 |
if(m_EditLock) btnDataEntry.Enabled = false; |
296 | 313 |
|
314 |
// 表示スタイル |
|
315 |
InitDisplayStyle(); |
|
316 |
|
|
297 | 317 |
// 初期表示 |
298 | 318 |
InitDataLoad(); |
299 |
|
|
319 |
|
|
300 | 320 |
// ダイアログ使用時 |
301 | 321 |
if (m_DialogFlg) |
302 | 322 |
{ |
... | ... | |
318 | 338 |
} |
319 | 339 |
#endregion |
320 | 340 |
|
341 |
#region セル入力開始時処理 |
|
342 |
/// <summary> |
|
343 |
/// 入力前値 |
|
344 |
/// </summary> |
|
345 |
object m_BeforeValue = null; |
|
346 |
int m_CheckCol = -1; |
|
347 |
int m_CheckRow = -1; |
|
348 |
/// <summary> |
|
349 |
/// セル入力開始時処理 |
|
350 |
/// </summary> |
|
351 |
/// <param name="sender"></param> |
|
352 |
/// <param name="e"></param> |
|
353 |
private void dgvMaster_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e) |
|
354 |
{ |
|
355 |
try |
|
356 |
{ |
|
357 |
DataGridView dgv = dgvMaster; |
|
358 |
// セル値取得 |
|
359 |
m_BeforeValue = dgv.CurrentCell.Value; |
|
360 |
m_CheckCol = e.ColumnIndex; |
|
361 |
m_CheckRow = e.RowIndex; |
|
362 |
} |
|
363 |
catch (System.Exception ex) |
|
364 |
{ |
|
365 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
366 |
} |
|
367 |
} |
|
368 |
#endregion |
|
369 |
|
|
321 | 370 |
#region セル値変化 |
322 | 371 |
/// <summary> |
323 | 372 |
/// セル値変化 |
... | ... | |
333 | 382 |
if (e.ColumnIndex == (int)DispColumn.RowState) return; |
334 | 383 |
|
335 | 384 |
DataGridView dgv = dgvMaster; |
336 |
|
|
385 |
|
|
337 | 386 |
// null値は処理しない |
338 | 387 |
if (dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value == null) return; |
339 | 388 |
|
389 |
// 値のチェック(同じ場合は変更フラグをONにしない) |
|
390 |
if (m_CheckCol != e.ColumnIndex || m_CheckRow != e.RowIndex) return; |
|
391 |
int CurVal = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value); |
|
392 |
if (CommonMotions.cnvInt(m_BeforeValue) == CurVal) return; |
|
393 |
|
|
340 | 394 |
// 返却予定日の処理 |
341 |
if (e.ColumnIndex == (int)DispColumn.RepayPlanDate) |
|
342 |
{ |
|
343 |
FormatRepayPlanDate(e); |
|
344 |
} |
|
395 |
if (e.ColumnIndex == (int)DispColumn.RepayPlanDate) FormatRepayPlanDate(e); |
|
345 | 396 |
|
346 |
// 行に変更フラグをON(編集した行は変更出来ない) |
|
347 |
if (DataRowState.Unchanged == (DataRowState)dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value) |
|
348 |
dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Modified; |
|
349 |
|
|
350 | 397 |
// 値が変わればツールチップを変更する |
351 | 398 |
dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].ToolTipText = CommonMotions.cnvString(dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value); |
399 |
|
|
400 |
// 行に変更フラグをON |
|
401 |
if ((DataRowState)dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value == DataRowState.Unchanged) |
|
402 |
dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Modified; |
|
403 |
|
|
352 | 404 |
// 変更フラグON |
353 | 405 |
m_bChengeAns = true; |
354 | 406 |
} |
... | ... | |
369 | 421 |
{ |
370 | 422 |
try |
371 | 423 |
{ |
424 |
// 変更なしは処理しない |
|
425 |
if (GetChangeRowCount() < 1) return; |
|
426 |
|
|
372 | 427 |
//データチェック |
373 | 428 |
if (!DispFeildCheck()) return; |
374 | 429 |
|
... | ... | |
384 | 439 |
CommonMotions.EntryEndMessage("資材貸出"); |
385 | 440 |
|
386 | 441 |
m_bChengeAns = false; |
387 |
LoadComboBox(); |
|
388 | 442 |
|
389 | 443 |
this.Refresh(); |
390 | 444 |
|
... | ... | |
443 | 497 |
/// <param name="e"></param> |
444 | 498 |
private void dgvMaster_CellClick(object sender, DataGridViewCellEventArgs e) |
445 | 499 |
{ |
446 |
setButtonEnable(); |
|
500 |
setButtonEnable(dgvMaster.CurrentRow);
|
|
447 | 501 |
} |
448 | 502 |
#endregion |
449 | 503 |
|
450 |
#region 日付コンボボックスの変更 |
|
451 |
/// <summary> |
|
452 |
/// 日付コンボボックスの変更 |
|
453 |
/// </summary> |
|
454 |
private void cmbProcessDate_SelectedIndexChanged(object sender, EventArgs e) |
|
455 |
{ |
|
456 |
// 選択無しは処理しない |
|
457 |
string strKey = CommonMotions.cnvString(cmbProcessDate.SelectedValue); |
|
458 |
if (strKey.Length == 0) return; |
|
459 |
|
|
460 |
string strProcessdate = strKey.Equals("0") ? DateTime.Now.Date.ToString("yyyy/MM/dd") : strKey; |
|
461 |
|
|
462 |
if (m_bChengeAns) |
|
463 |
{ |
|
464 |
if (MessageBox.Show("データに変更があります、登録せずに対象を変更してよろしいですか?。", |
|
465 |
"データ変更確認", |
|
466 |
MessageBoxButtons.YesNo, |
|
467 |
MessageBoxIcon.Warning) == DialogResult.No) |
|
468 |
{ |
|
469 |
cmbProcessDate.SelectedIndexChanged -= new System.EventHandler(this.cmbProcessDate_SelectedIndexChanged); |
|
470 |
cmbProcessDate.SelectedValue = m_ProcessPrev; |
|
471 |
cmbProcessDate.SelectedIndexChanged += new System.EventHandler(this.cmbProcessDate_SelectedIndexChanged); |
|
472 |
return; |
|
473 |
} |
|
474 |
} |
|
475 |
|
|
476 |
// グリッドデータ表示 |
|
477 |
DispGridData(); |
|
478 |
} |
|
479 |
#endregion |
|
480 |
|
|
481 | 504 |
#region 資材選択押下 |
482 | 505 |
/// <summary> |
483 | 506 |
/// 資材選択押下 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.designer.cs | ||
---|---|---|
31 | 31 |
private void InitializeComponent() |
32 | 32 |
{ |
33 | 33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); |
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 | 35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); |
36 | 36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); |
37 | 37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); |
38 | 38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); |
39 | 39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); |
40 | 40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); |
41 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
41 | 42 |
this.label1 = new System.Windows.Forms.Label(); |
42 | 43 |
this.btnEnd = new System.Windows.Forms.Button(); |
43 | 44 |
this.btnDataEntry = new System.Windows.Forms.Button(); |
44 | 45 |
this.button6 = new System.Windows.Forms.Button(); |
45 | 46 |
this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
47 |
this.label3 = new System.Windows.Forms.Label(); |
|
48 |
this.lblProcessDate = new System.Windows.Forms.Label(); |
|
49 |
this.lblLabel01 = new System.Windows.Forms.Label(); |
|
46 | 50 |
this.label2 = new System.Windows.Forms.Label(); |
47 |
this.label3 = new System.Windows.Forms.Label(); |
|
48 | 51 |
this.label4 = new System.Windows.Forms.Label(); |
49 |
this.cmbProcessDate = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
50 | 52 |
this.lblDETAILSTRING = new System.Windows.Forms.Label(); |
51 | 53 |
this.lblPerson = new System.Windows.Forms.Label(); |
52 | 54 |
this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
... | ... | |
65 | 67 |
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
66 | 68 |
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
67 | 69 |
this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
70 |
this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
68 | 71 |
this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
69 | 72 |
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
70 | 73 |
this.groupBoxEx2.SuspendLayout(); |
... | ... | |
78 | 81 |
this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
79 | 82 |
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
80 | 83 |
this.label1.ForeColor = System.Drawing.Color.Black; |
81 |
this.label1.Location = new System.Drawing.Point(333, 8);
|
|
84 |
this.label1.Location = new System.Drawing.Point(415, 8);
|
|
82 | 85 |
this.label1.Name = "label1"; |
83 | 86 |
this.label1.Size = new System.Drawing.Size(500, 20); |
84 | 87 |
this.label1.TabIndex = 0; |
... | ... | |
90 | 93 |
this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
91 | 94 |
this.btnEnd.BackColor = System.Drawing.Color.Blue; |
92 | 95 |
this.btnEnd.ForeColor = System.Drawing.Color.White; |
93 |
this.btnEnd.Location = new System.Drawing.Point(1039, 502);
|
|
96 |
this.btnEnd.Location = new System.Drawing.Point(1203, 502);
|
|
94 | 97 |
this.btnEnd.Name = "btnEnd"; |
95 | 98 |
this.btnEnd.Size = new System.Drawing.Size(120, 30); |
96 | 99 |
this.btnEnd.TabIndex = 10; |
... | ... | |
103 | 106 |
this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
104 | 107 |
this.btnDataEntry.BackColor = System.Drawing.Color.Green; |
105 | 108 |
this.btnDataEntry.ForeColor = System.Drawing.Color.White; |
106 |
this.btnDataEntry.Location = new System.Drawing.Point(913, 502);
|
|
109 |
this.btnDataEntry.Location = new System.Drawing.Point(1077, 502);
|
|
107 | 110 |
this.btnDataEntry.Name = "btnDataEntry"; |
108 | 111 |
this.btnDataEntry.Size = new System.Drawing.Size(120, 30); |
109 | 112 |
this.btnDataEntry.TabIndex = 9; |
... | ... | |
127 | 130 |
// groupBoxEx2 |
128 | 131 |
// |
129 | 132 |
this.groupBoxEx2.BorderColor = System.Drawing.Color.White; |
133 |
this.groupBoxEx2.Controls.Add(this.label3); |
|
134 |
this.groupBoxEx2.Controls.Add(this.lblProcessDate); |
|
135 |
this.groupBoxEx2.Controls.Add(this.lblLabel01); |
|
130 | 136 |
this.groupBoxEx2.Controls.Add(this.label2); |
131 |
this.groupBoxEx2.Controls.Add(this.label3); |
|
132 | 137 |
this.groupBoxEx2.Controls.Add(this.label4); |
133 |
this.groupBoxEx2.Controls.Add(this.cmbProcessDate); |
|
134 | 138 |
this.groupBoxEx2.Controls.Add(this.lblDETAILSTRING); |
135 | 139 |
this.groupBoxEx2.Controls.Add(this.lblPerson); |
136 |
this.groupBoxEx2.Location = new System.Drawing.Point(8, 36);
|
|
140 |
this.groupBoxEx2.Location = new System.Drawing.Point(5, 36);
|
|
137 | 141 |
this.groupBoxEx2.Name = "groupBoxEx2"; |
138 |
this.groupBoxEx2.Size = new System.Drawing.Size(1150, 66);
|
|
142 |
this.groupBoxEx2.Size = new System.Drawing.Size(1320, 66);
|
|
139 | 143 |
this.groupBoxEx2.TabIndex = 11; |
140 | 144 |
this.groupBoxEx2.TabStop = false; |
141 | 145 |
// |
146 |
// label3 |
|
147 |
// |
|
148 |
this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); |
|
149 |
this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
150 |
this.label3.ForeColor = System.Drawing.Color.Black; |
|
151 |
this.label3.Location = new System.Drawing.Point(6, 36); |
|
152 |
this.label3.Name = "label3"; |
|
153 |
this.label3.Size = new System.Drawing.Size(120, 24); |
|
154 |
this.label3.TabIndex = 9; |
|
155 |
this.label3.Text = "今回貸出日"; |
|
156 |
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
157 |
// |
|
158 |
// lblProcessDate |
|
159 |
// |
|
160 |
this.lblProcessDate.BackColor = System.Drawing.Color.White; |
|
161 |
this.lblProcessDate.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
162 |
this.lblProcessDate.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
163 |
this.lblProcessDate.ForeColor = System.Drawing.Color.Black; |
|
164 |
this.lblProcessDate.Location = new System.Drawing.Point(134, 36); |
|
165 |
this.lblProcessDate.Name = "lblProcessDate"; |
|
166 |
this.lblProcessDate.Size = new System.Drawing.Size(120, 24); |
|
167 |
this.lblProcessDate.TabIndex = 10; |
|
168 |
this.lblProcessDate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
169 |
// |
|
170 |
// lblLabel01 |
|
171 |
// |
|
172 |
this.lblLabel01.BackColor = System.Drawing.Color.White; |
|
173 |
this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
174 |
this.lblLabel01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
175 |
this.lblLabel01.ForeColor = System.Drawing.Color.Black; |
|
176 |
this.lblLabel01.Location = new System.Drawing.Point(134, 6); |
|
177 |
this.lblLabel01.Name = "lblLabel01"; |
|
178 |
this.lblLabel01.Size = new System.Drawing.Size(120, 24); |
|
179 |
this.lblLabel01.TabIndex = 8; |
|
180 |
this.lblLabel01.TextAlign = System.Drawing.ContentAlignment.MiddleRight; |
|
181 |
// |
|
142 | 182 |
// label2 |
143 | 183 |
// |
144 | 184 |
this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); |
... | ... | |
151 | 191 |
this.label2.Text = "工事名称"; |
152 | 192 |
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
153 | 193 |
// |
154 |
// label3 |
|
155 |
// |
|
156 |
this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); |
|
157 |
this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
158 |
this.label3.ForeColor = System.Drawing.Color.Black; |
|
159 |
this.label3.Location = new System.Drawing.Point(6, 36); |
|
160 |
this.label3.Name = "label3"; |
|
161 |
this.label3.Size = new System.Drawing.Size(120, 24); |
|
162 |
this.label3.TabIndex = 3; |
|
163 |
this.label3.Text = "貸出日"; |
|
164 |
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
165 |
// |
|
166 | 194 |
// label4 |
167 | 195 |
// |
168 | 196 |
this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); |
169 | 197 |
this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
170 | 198 |
this.label4.ForeColor = System.Drawing.Color.Black; |
171 |
this.label4.Location = new System.Drawing.Point(315, 36);
|
|
199 |
this.label4.Location = new System.Drawing.Point(262, 36);
|
|
172 | 200 |
this.label4.Name = "label4"; |
173 | 201 |
this.label4.Size = new System.Drawing.Size(120, 24); |
174 | 202 |
this.label4.TabIndex = 5; |
175 | 203 |
this.label4.Text = "貸出担当者"; |
176 | 204 |
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
177 | 205 |
// |
178 |
// cmbProcessDate |
|
179 |
// |
|
180 |
this.cmbProcessDate.BackColor = System.Drawing.Color.White; |
|
181 |
this.cmbProcessDate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
182 |
this.cmbProcessDate.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
183 |
this.cmbProcessDate.FormattingEnabled = true; |
|
184 |
this.cmbProcessDate.Location = new System.Drawing.Point(134, 36); |
|
185 |
this.cmbProcessDate.Name = "cmbProcessDate"; |
|
186 |
this.cmbProcessDate.Size = new System.Drawing.Size(165, 24); |
|
187 |
this.cmbProcessDate.TabIndex = 4; |
|
188 |
this.cmbProcessDate.SelectedIndexChanged += new System.EventHandler(this.cmbProcessDate_SelectedIndexChanged); |
|
189 |
// |
|
190 | 206 |
// lblDETAILSTRING |
191 | 207 |
// |
192 | 208 |
this.lblDETAILSTRING.BackColor = System.Drawing.Color.White; |
193 | 209 |
this.lblDETAILSTRING.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
194 | 210 |
this.lblDETAILSTRING.ForeColor = System.Drawing.Color.Black; |
195 |
this.lblDETAILSTRING.Location = new System.Drawing.Point(134, 6);
|
|
211 |
this.lblDETAILSTRING.Location = new System.Drawing.Point(262, 6);
|
|
196 | 212 |
this.lblDETAILSTRING.Name = "lblDETAILSTRING"; |
197 |
this.lblDETAILSTRING.Size = new System.Drawing.Size(1010, 24);
|
|
213 |
this.lblDETAILSTRING.Size = new System.Drawing.Size(1050, 24);
|
|
198 | 214 |
this.lblDETAILSTRING.TabIndex = 2; |
199 | 215 |
this.lblDETAILSTRING.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; |
200 | 216 |
// |
... | ... | |
203 | 219 |
this.lblPerson.BackColor = System.Drawing.Color.White; |
204 | 220 |
this.lblPerson.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
205 | 221 |
this.lblPerson.ForeColor = System.Drawing.Color.Black; |
206 |
this.lblPerson.Location = new System.Drawing.Point(443, 36);
|
|
222 |
this.lblPerson.Location = new System.Drawing.Point(390, 36);
|
|
207 | 223 |
this.lblPerson.Name = "lblPerson"; |
208 | 224 |
this.lblPerson.Size = new System.Drawing.Size(160, 24); |
209 | 225 |
this.lblPerson.TabIndex = 6; |
... | ... | |
216 | 232 |
this.groupBoxEx1.Controls.Add(this.btnMaterialRelease); |
217 | 233 |
this.groupBoxEx1.Controls.Add(this.btnMaterialSelect); |
218 | 234 |
this.groupBoxEx1.Controls.Add(this.dgvMaster); |
219 |
this.groupBoxEx1.Location = new System.Drawing.Point(8, 110);
|
|
235 |
this.groupBoxEx1.Location = new System.Drawing.Point(5, 110);
|
|
220 | 236 |
this.groupBoxEx1.Name = "groupBoxEx1"; |
221 |
this.groupBoxEx1.Size = new System.Drawing.Size(1150, 380);
|
|
237 |
this.groupBoxEx1.Size = new System.Drawing.Size(1320, 390);
|
|
222 | 238 |
this.groupBoxEx1.TabIndex = 7; |
223 | 239 |
this.groupBoxEx1.TabStop = false; |
224 | 240 |
// |
... | ... | |
227 | 243 |
this.btnMaterialHistory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
228 | 244 |
this.btnMaterialHistory.BackColor = System.Drawing.Color.Khaki; |
229 | 245 |
this.btnMaterialHistory.ForeColor = System.Drawing.Color.Black; |
230 |
this.btnMaterialHistory.Location = new System.Drawing.Point(8, 344);
|
|
246 |
this.btnMaterialHistory.Location = new System.Drawing.Point(8, 354);
|
|
231 | 247 |
this.btnMaterialHistory.Name = "btnMaterialHistory"; |
232 | 248 |
this.btnMaterialHistory.Size = new System.Drawing.Size(150, 30); |
233 | 249 |
this.btnMaterialHistory.TabIndex = 1; |
... | ... | |
240 | 256 |
this.btnMaterialRelease.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
241 | 257 |
this.btnMaterialRelease.BackColor = System.Drawing.Color.Violet; |
242 | 258 |
this.btnMaterialRelease.ForeColor = System.Drawing.Color.Black; |
243 |
this.btnMaterialRelease.Location = new System.Drawing.Point(993, 344);
|
|
259 |
this.btnMaterialRelease.Location = new System.Drawing.Point(1163, 354);
|
|
244 | 260 |
this.btnMaterialRelease.Name = "btnMaterialRelease"; |
245 | 261 |
this.btnMaterialRelease.Size = new System.Drawing.Size(150, 30); |
246 | 262 |
this.btnMaterialRelease.TabIndex = 2; |
... | ... | |
253 | 269 |
this.btnMaterialSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
254 | 270 |
this.btnMaterialSelect.BackColor = System.Drawing.Color.DarkSeaGreen; |
255 | 271 |
this.btnMaterialSelect.ForeColor = System.Drawing.Color.Black; |
256 |
this.btnMaterialSelect.Location = new System.Drawing.Point(835, 344);
|
|
272 |
this.btnMaterialSelect.Location = new System.Drawing.Point(1005, 354);
|
|
257 | 273 |
this.btnMaterialSelect.Name = "btnMaterialSelect"; |
258 | 274 |
this.btnMaterialSelect.Size = new System.Drawing.Size(150, 30); |
259 | 275 |
this.btnMaterialSelect.TabIndex = 3; |
... | ... | |
292 | 308 |
this.Column4, |
293 | 309 |
this.Column5, |
294 | 310 |
this.Column12, |
311 |
this.Column14, |
|
295 | 312 |
this.Column6, |
296 | 313 |
this.Column7}); |
297 | 314 |
this.dgvMaster.EnableHeadersVisualStyles = false; |
298 |
this.dgvMaster.Location = new System.Drawing.Point(8, 6);
|
|
315 |
this.dgvMaster.Location = new System.Drawing.Point(5, 6);
|
|
299 | 316 |
this.dgvMaster.MultiSelect = false; |
300 | 317 |
this.dgvMaster.Name = "dgvMaster"; |
301 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
302 |
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
|
|
303 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
304 |
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
305 |
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
306 |
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
307 |
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
308 |
this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
|
|
318 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
319 |
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
|
|
320 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
321 |
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
322 |
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
323 |
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
324 |
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
325 |
this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
|
|
309 | 326 |
this.dgvMaster.RowHeadersVisible = false; |
310 | 327 |
this.dgvMaster.RowHeadersWidth = 20; |
311 | 328 |
this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; |
312 |
this.dgvMaster.Size = new System.Drawing.Size(1135, 330);
|
|
329 |
this.dgvMaster.Size = new System.Drawing.Size(1310, 342);
|
|
313 | 330 |
this.dgvMaster.TabIndex = 0; |
331 |
this.dgvMaster.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvMaster_CellBeginEdit); |
|
314 | 332 |
this.dgvMaster.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellClick); |
315 | 333 |
this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellEnter); |
316 | 334 |
this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged); |
... | ... | |
321 | 339 |
this.Column13.Name = "Column13"; |
322 | 340 |
this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
323 | 341 |
this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
324 |
this.Column13.Visible = false; |
|
325 | 342 |
// |
326 | 343 |
// Column1 |
327 | 344 |
// |
... | ... | |
333 | 350 |
this.Column1.ReadOnly = true; |
334 | 351 |
this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
335 | 352 |
this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
336 |
this.Column1.Width = 40;
|
|
353 |
this.Column1.Width = 50;
|
|
337 | 354 |
// |
338 | 355 |
// Column11 |
339 | 356 |
// |
... | ... | |
342 | 359 |
this.Column11.ReadOnly = true; |
343 | 360 |
this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
344 | 361 |
this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
345 |
this.Column11.Visible = false; |
|
346 | 362 |
// |
347 | 363 |
// Column2 |
348 | 364 |
// |
... | ... | |
365 | 381 |
this.Column9.ReadOnly = true; |
366 | 382 |
this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
367 | 383 |
this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; |
368 |
this.Column9.Visible = false; |
|
369 | 384 |
// |
370 | 385 |
// Column8 |
371 | 386 |
// |
... | ... | |
374 | 389 |
this.Column8.ReadOnly = true; |
375 | 390 |
this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
376 | 391 |
this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
377 |
this.Column8.Visible = false; |
|
378 | 392 |
// |
379 | 393 |
// Column3 |
380 | 394 |
// |
... | ... | |
386 | 400 |
this.Column3.ReadOnly = true; |
387 | 401 |
this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
388 | 402 |
this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
389 |
this.Column3.Width = 300;
|
|
403 |
this.Column3.Width = 340;
|
|
390 | 404 |
// |
391 | 405 |
// Column10 |
392 | 406 |
// |
... | ... | |
395 | 409 |
this.Column10.ReadOnly = true; |
396 | 410 |
this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
397 | 411 |
this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; |
398 |
this.Column10.Visible = false; |
|
399 | 412 |
// |
400 | 413 |
// Column4 |
401 | 414 |
// |
... | ... | |
426 | 439 |
this.Column12.Name = "Column12"; |
427 | 440 |
this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
428 | 441 |
this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
429 |
this.Column12.Visible = false; |
|
430 | 442 |
// |
443 |
// Column14 |
|
444 |
// |
|
445 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
446 |
dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
447 |
dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black; |
|
448 |
this.Column14.DefaultCellStyle = dataGridViewCellStyle7; |
|
449 |
this.Column14.HeaderText = "貸出日"; |
|
450 |
this.Column14.Name = "Column14"; |
|
451 |
this.Column14.ReadOnly = true; |
|
452 |
this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
453 |
this.Column14.Width = 125; |
|
454 |
// |
|
431 | 455 |
// Column6 |
432 | 456 |
// |
433 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
434 |
dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
435 |
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
436 |
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
437 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
|
|
457 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
458 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
459 |
dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
|
|
460 |
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
461 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
|
|
438 | 462 |
this.Column6.HeaderText = "返却予定日"; |
439 | 463 |
this.Column6.Name = "Column6"; |
440 | 464 |
this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
... | ... | |
454 | 478 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
455 | 479 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
456 | 480 |
this.BackColor = System.Drawing.Color.Black; |
457 |
this.ClientSize = new System.Drawing.Size(1166, 537);
|
|
481 |
this.ClientSize = new System.Drawing.Size(1330, 537);
|
|
458 | 482 |
this.Controls.Add(this.groupBoxEx2); |
459 | 483 |
this.Controls.Add(this.groupBoxEx1); |
460 | 484 |
this.Controls.Add(this.button6); |
... | ... | |
482 | 506 |
|
483 | 507 |
private System.Windows.Forms.Label label1; |
484 | 508 |
private System.Windows.Forms.Label label2; |
485 |
private System.Windows.Forms.Label label3; |
|
486 | 509 |
private System.Windows.Forms.Label label4; |
487 | 510 |
private System.Windows.Forms.Label lblDETAILSTRING; |
488 | 511 |
private System.Windows.Forms.Label lblPerson; |
489 | 512 |
private System.Windows.Forms.Button btnEnd; |
490 | 513 |
private System.Windows.Forms.Button btnDataEntry; |
491 |
private ComboBoxEX cmbProcessDate; |
|
492 | 514 |
private System.Windows.Forms.Button btnMaterialRelease; |
493 | 515 |
private System.Windows.Forms.Button btnMaterialSelect; |
494 | 516 |
private System.Windows.Forms.Button btnMaterialHistory; |
... | ... | |
496 | 518 |
private DataGridViewEX dgvMaster; |
497 | 519 |
private GroupBoxEx groupBoxEx1; |
498 | 520 |
private GroupBoxEx groupBoxEx2; |
521 |
private System.Windows.Forms.Label lblLabel01; |
|
522 |
private System.Windows.Forms.Label label3; |
|
523 |
private System.Windows.Forms.Label lblProcessDate; |
|
499 | 524 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column13; |
500 | 525 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column1; |
501 | 526 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column11; |
... | ... | |
507 | 532 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column4; |
508 | 533 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column5; |
509 | 534 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column12; |
535 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column14; |
|
510 | 536 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column6; |
511 | 537 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column7; |
512 | 538 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.resx | ||
---|---|---|
144 | 144 |
<metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
145 | 145 |
<value>True</value> |
146 | 146 |
</metadata> |
147 |
<metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
148 |
<value>True</value> |
|
149 |
</metadata> |
|
147 | 150 |
</root> |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs | ||
---|---|---|
44 | 44 |
strSQL.AppendFormat(" and DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
45 | 45 |
if (!IoConB.SelectAction(strSQL.ToString(), ref ConB)) return; |
46 | 46 |
|
47 |
lblLabel01.Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8); |
|
47 | 48 |
lblDETAILSTRING.Text = ConB.DetailString; |
48 | 49 |
|
49 | 50 |
// 担当にログインユーザー名を表示 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.designer.cs | ||
---|---|---|
46 | 46 |
this.btnDataEntry = new System.Windows.Forms.Button(); |
47 | 47 |
this.button3 = new System.Windows.Forms.Button(); |
48 | 48 |
this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
49 |
this.lblLabel01 = new System.Windows.Forms.Label(); |
|
49 | 50 |
this.label2 = new System.Windows.Forms.Label(); |
50 | 51 |
this.label3 = new System.Windows.Forms.Label(); |
51 | 52 |
this.label4 = new System.Windows.Forms.Label(); |
... | ... | |
87 | 88 |
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
88 | 89 |
this.label1.Cursor = System.Windows.Forms.Cursors.Arrow; |
89 | 90 |
this.label1.ForeColor = System.Drawing.Color.Black; |
90 |
this.label1.Location = new System.Drawing.Point(383, 8);
|
|
91 |
this.label1.Location = new System.Drawing.Point(415, 8);
|
|
91 | 92 |
this.label1.Name = "label1"; |
92 | 93 |
this.label1.Size = new System.Drawing.Size(500, 20); |
93 | 94 |
this.label1.TabIndex = 0; |
... | ... | |
99 | 100 |
this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
100 | 101 |
this.btnEnd.BackColor = System.Drawing.Color.Blue; |
101 | 102 |
this.btnEnd.ForeColor = System.Drawing.Color.White; |
102 |
this.btnEnd.Location = new System.Drawing.Point(1138, 502);
|
|
103 |
this.btnEnd.Location = new System.Drawing.Point(1202, 502);
|
|
103 | 104 |
this.btnEnd.Name = "btnEnd"; |
104 | 105 |
this.btnEnd.Size = new System.Drawing.Size(120, 30); |
105 | 106 |
this.btnEnd.TabIndex = 10; |
... | ... | |
112 | 113 |
this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
113 | 114 |
this.btnDataEntry.BackColor = System.Drawing.Color.Green; |
114 | 115 |
this.btnDataEntry.ForeColor = System.Drawing.Color.White; |
115 |
this.btnDataEntry.Location = new System.Drawing.Point(1012, 502);
|
|
116 |
this.btnDataEntry.Location = new System.Drawing.Point(1076, 502);
|
|
116 | 117 |
this.btnDataEntry.Name = "btnDataEntry"; |
117 | 118 |
this.btnDataEntry.Size = new System.Drawing.Size(120, 30); |
118 | 119 |
this.btnDataEntry.TabIndex = 9; |
... | ... | |
136 | 137 |
// groupBoxEx2 |
137 | 138 |
// |
138 | 139 |
this.groupBoxEx2.BorderColor = System.Drawing.Color.White; |
140 |
this.groupBoxEx2.Controls.Add(this.lblLabel01); |
|
139 | 141 |
this.groupBoxEx2.Controls.Add(this.label2); |
140 | 142 |
this.groupBoxEx2.Controls.Add(this.label3); |
141 | 143 |
this.groupBoxEx2.Controls.Add(this.label4); |
142 | 144 |
this.groupBoxEx2.Controls.Add(this.lblRepaydate); |
143 | 145 |
this.groupBoxEx2.Controls.Add(this.lblDETAILSTRING); |
144 | 146 |
this.groupBoxEx2.Controls.Add(this.lblPerson); |
145 |
this.groupBoxEx2.Location = new System.Drawing.Point(8, 36);
|
|
147 |
this.groupBoxEx2.Location = new System.Drawing.Point(5, 36);
|
|
146 | 148 |
this.groupBoxEx2.Name = "groupBoxEx2"; |
147 |
this.groupBoxEx2.Size = new System.Drawing.Size(1250, 66);
|
|
149 |
this.groupBoxEx2.Size = new System.Drawing.Size(1320, 66);
|
|
148 | 150 |
this.groupBoxEx2.TabIndex = 11; |
149 | 151 |
this.groupBoxEx2.TabStop = false; |
150 | 152 |
// |
153 |
// lblLabel01 |
|
154 |
// |
|
155 |
this.lblLabel01.BackColor = System.Drawing.Color.White; |
|
156 |
this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
157 |
this.lblLabel01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
158 |
this.lblLabel01.ForeColor = System.Drawing.Color.Black; |
|
159 |
this.lblLabel01.Location = new System.Drawing.Point(134, 6); |
|
160 |
this.lblLabel01.Name = "lblLabel01"; |
|
161 |
this.lblLabel01.Size = new System.Drawing.Size(120, 24); |
|
162 |
this.lblLabel01.TabIndex = 7; |
|
163 |
this.lblLabel01.TextAlign = System.Drawing.ContentAlignment.MiddleRight; |
|
164 |
// |
|
151 | 165 |
// label2 |
152 | 166 |
// |
153 | 167 |
this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); |
... | ... | |
169 | 183 |
this.label3.Name = "label3"; |
170 | 184 |
this.label3.Size = new System.Drawing.Size(120, 24); |
171 | 185 |
this.label3.TabIndex = 3; |
172 |
this.label3.Text = "返却日"; |
|
186 |
this.label3.Text = "今回返却日";
|
|
173 | 187 |
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
174 | 188 |
// |
175 | 189 |
// label4 |
... | ... | |
177 | 191 |
this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); |
178 | 192 |
this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
179 | 193 |
this.label4.ForeColor = System.Drawing.Color.Black; |
180 |
this.label4.Location = new System.Drawing.Point(315, 36);
|
|
194 |
this.label4.Location = new System.Drawing.Point(262, 36);
|
|
181 | 195 |
this.label4.Name = "label4"; |
182 | 196 |
this.label4.Size = new System.Drawing.Size(120, 24); |
183 | 197 |
this.label4.TabIndex = 5; |
... | ... | |
191 | 205 |
this.lblRepaydate.ForeColor = System.Drawing.Color.Black; |
192 | 206 |
this.lblRepaydate.Location = new System.Drawing.Point(134, 36); |
193 | 207 |
this.lblRepaydate.Name = "lblRepaydate"; |
194 |
this.lblRepaydate.Size = new System.Drawing.Size(165, 24);
|
|
208 |
this.lblRepaydate.Size = new System.Drawing.Size(120, 24);
|
|
195 | 209 |
this.lblRepaydate.TabIndex = 4; |
196 | 210 |
this.lblRepaydate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
197 | 211 |
// |
... | ... | |
200 | 214 |
this.lblDETAILSTRING.BackColor = System.Drawing.Color.White; |
201 | 215 |
this.lblDETAILSTRING.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
202 | 216 |
this.lblDETAILSTRING.ForeColor = System.Drawing.Color.Black; |
203 |
this.lblDETAILSTRING.Location = new System.Drawing.Point(134, 6);
|
|
217 |
this.lblDETAILSTRING.Location = new System.Drawing.Point(262, 6);
|
|
204 | 218 |
this.lblDETAILSTRING.Name = "lblDETAILSTRING"; |
205 |
this.lblDETAILSTRING.Size = new System.Drawing.Size(1110, 24);
|
|
219 |
this.lblDETAILSTRING.Size = new System.Drawing.Size(1050, 24);
|
|
206 | 220 |
this.lblDETAILSTRING.TabIndex = 2; |
207 | 221 |
this.lblDETAILSTRING.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; |
208 | 222 |
// |
... | ... | |
211 | 225 |
this.lblPerson.BackColor = System.Drawing.Color.White; |
212 | 226 |
this.lblPerson.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
213 | 227 |
this.lblPerson.ForeColor = System.Drawing.Color.Black; |
214 |
this.lblPerson.Location = new System.Drawing.Point(443, 36);
|
|
228 |
this.lblPerson.Location = new System.Drawing.Point(390, 36);
|
|
215 | 229 |
this.lblPerson.Name = "lblPerson"; |
216 | 230 |
this.lblPerson.Size = new System.Drawing.Size(160, 24); |
217 | 231 |
this.lblPerson.TabIndex = 6; |
... | ... | |
225 | 239 |
this.groupBoxEx1.Controls.Add(this.label5); |
226 | 240 |
this.groupBoxEx1.Controls.Add(this.tglAllReturn); |
227 | 241 |
this.groupBoxEx1.Controls.Add(this.dgvMaster); |
228 |
this.groupBoxEx1.Location = new System.Drawing.Point(8, 110);
|
|
242 |
this.groupBoxEx1.Location = new System.Drawing.Point(5, 110);
|
|
229 | 243 |
this.groupBoxEx1.Name = "groupBoxEx1"; |
230 |
this.groupBoxEx1.Size = new System.Drawing.Size(1250, 380);
|
|
244 |
this.groupBoxEx1.Size = new System.Drawing.Size(1320, 380);
|
|
231 | 245 |
this.groupBoxEx1.TabIndex = 7; |
232 | 246 |
this.groupBoxEx1.TabStop = false; |
233 | 247 |
// |
... | ... | |
317 | 331 |
this.Column15, |
318 | 332 |
this.Column16}); |
319 | 333 |
this.dgvMaster.EnableHeadersVisualStyles = false; |
他の形式にエクスポート: Unified diff