プロジェクト

全般

プロフィール

リビジョン 266

堀内7年以上前に追加

資材返却:返却予定日表示

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 75;
17
        public static int s_SystemVersion = 76;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/DataModel/MaterialRecordInfo.cs
8 8
{
9 9
    public class MaterialRecordInfo
10 10
    {
11
        #region レコード区分
12
        /// <summary>
13
        /// レコード区分定義
14
        /// </summary>
15
        public enum RecKindDef
16
        {
17
            /// <summary>
18
            /// 0:貸出
19
            /// </summary>
20
            Rental = 0,
21
            /// <summary>
22
            /// 1:返却
23
            /// </summary>
24
            Return,
25
            /// <summary>
26
            /// 2:追加
27
            /// </summary>
28
            AddTo,
29
            /// <summary>
30
            /// 3:破棄
31
            /// </summary>
32
            Discard,
33
        }
34
        #endregion
35

  
11 36
        #region メンバ変数
12 37
        private int m_MaterialItemCode = 0;	            // キー項目
13 38
        private DateTime m_ProcessDate = DateTime.Now;  // キー項目2 処理日
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.cs
53 53
            MaterialItemCode,
54 54
            MaterialItemName,
55 55
            MaterialItemDisplayOrder,
56
            RepayPlanDate,
56 57
            RentCount,
57 58
            RepayCount,
58 59
            MaterialCount,
......
62 63
        }
63 64
        #endregion
64 65

  
65
        #region 表示カラム
66
        #region データ取得カラム
67
        /// <summary>
68
        /// データ取得カラム
69
        /// </summary>
66 70
        private enum DataColumn
67 71
        {
68 72
            MaterialKindCode = 0,
......
76 80
            MaterialCount,
77 81
            CommentText,
78 82
            CompleteFlg,
83
            RepayPlanDate,
79 84
        }
80 85
        #endregion
81 86

  
......
957 962
        }
958 963
        #endregion
959 964

  
960
        #region 単位マスタ表示
965
        #region データ表示
961 966
        /// <summary>
962
        /// 単位マスタ表示
967
        ///データ表示
963 968
        /// </summary>
964 969
        /// <returns></returns>
965 970
        private bool DispGridData()
......
985 990
                sql.AppendLine("        ,ifnull(Mri.MaterialCount,0) as MaterialCount ");
986 991
                sql.AppendLine("        ,ifnull(Mri.CommentText,'') as CommentText ");
987 992
                sql.AppendLine("        ,Cmi.CompleteFlg ");
993
                sql.AppendLine("        ,ifnull(DATE_FORMAT(RentMri.RepayPlanDate, '%Y/%m/%d'),'') as RepayPlanDate ");
994

  
988 995
                sql.AppendLine(" from ConstructionMaterialInfo as Cmi");
996

  
997
                sql.AppendLine(" left join MaterialRecordInfo as RentMri");
998
                sql.AppendLine(" on Cmi.CONSTRUCTIONCODE = RentMri.CONSTRUCTIONCODE");
999
                sql.AppendLine(" and Cmi.MATERIALITEMCODE = RentMri.MATERIALITEMCODE");
1000
                sql.AppendFormat(" and RentMri.RECKIND = {0}", (int)MaterialRecordInfo.RecKindDef.Rental);
1001
                
989 1002
                sql.AppendLine(" left join MaterialRecordInfo as Mri");
990 1003
                sql.AppendLine(" on Cmi.CONSTRUCTIONCODE = Mri.CONSTRUCTIONCODE");
991 1004
                sql.AppendLine(" and Cmi.MATERIALITEMCODE = Mri.MATERIALITEMCODE");
992
                sql.AppendLine(" and Mri.RECKIND = 1");
993
                sql.AppendFormat(" and ProcessDate = DATE_FORMAT('{0}','%Y/%m/%d') ", lblRepaydate.Text);
1005
                sql.AppendFormat(" and RentMri.RECKIND = {0}", (int)MaterialRecordInfo.RecKindDef.Return);
1006
                //sql.AppendFormat(" and ProcessDate = DATE_FORMAT('{0}','%Y/%m/%d') ", lblRepaydate.Text);
994 1007

  
995 1008
                //sql.AppendFormat(" from ConstructionMaterialInfo as Cmi left join MaterialRecordInfo as Mri on Cmi.CONSTRUCTIONCODE = Mri.CONSTRUCTIONCODE and Cmi.MATERIALITEMCODE = Mri.MATERIALITEMCODE and Mri.RECKIND = 1 and ProcessDate = DATE_FORMAT('{0}','%Y/%m/%d') ", lblRepaydate.Text);
996 1009

  
......
1008 1021
                // データ表示
1009 1022
                int icnt = 0;
1010 1023
                bool CompleteFlg = false;
1024
                DateTime dtWork = DateTime.MinValue;
1011 1025
                foreach (object[] work in arData)
1012 1026
                {
1027
                    if (CommonMotions.cnvInt(work[(int)DataColumn.RENTCOUNT]) <= CommonMotions.cnvInt(work[(int)DataColumn.REPAYCOUNT])) continue;
1028
                    
1013 1029
                    dgvMaster.Rows.Add();
1014 1030

  
1015 1031
                    string chkString = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]);
......
1035 1051
                    dgvMaster.Rows[icnt].Cells[(int)DispColumn.MaterialCountBefore].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]);
1036 1052
                    dgvMaster.Rows[icnt].Cells[(int)DispColumn.CommentText].Value = CommonMotions.cnvString(work[(int)DataColumn.CommentText]);
1037 1053

  
1054
                    dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Value = CommonMotions.cnvString(work[(int)DataColumn.RepayPlanDate]);
1055
                    if (CommonMotions.cnvString(work[(int)DataColumn.RepayPlanDate]).Length > 0)
1056
                    {
1057
                        dtWork = CommonMotions.cnvDate(work[(int)DataColumn.RepayPlanDate]);
1058
                        if (dtWork.Date == DateTime.Now.Date)
1059
                        {
1060
                            dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Style.BackColor = Color.SkyBlue;
1061
                        }
1062
                        else if (dtWork.Date < DateTime.Now.Date)
1063
                        {
1064
                            dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Style.BackColor = Color.Red;
1065
                        }
1066
                    }
1067

  
1038 1068
                    if (CommonMotions.cnvInt(work[(int)DataColumn.CompleteFlg]) == 0)
1039 1069
                    {
1040 1070
                        dgvMaster.Rows[icnt].Cells[(int)DispColumn.MaterialDumpCount].Value = 0;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.designer.cs
30 30
        /// </summary>
31 31
        private void InitializeComponent()
32 32
        {
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
41 41
            this.label1 = new System.Windows.Forms.Label();
42 42
            this.label2 = new System.Windows.Forms.Label();
43 43
            this.label3 = new System.Windows.Forms.Label();
......
58 58
            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
59 59
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
60 60
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61
            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61 62
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62 63
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
63 64
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
143 144
            // 
144 145
            this.btnEnd.BackColor = System.Drawing.Color.Blue;
145 146
            this.btnEnd.ForeColor = System.Drawing.Color.White;
146
            this.btnEnd.Location = new System.Drawing.Point(1032, 386);
147
            this.btnEnd.Location = new System.Drawing.Point(1138, 386);
147 148
            this.btnEnd.Name = "btnEnd";
148 149
            this.btnEnd.Size = new System.Drawing.Size(120, 30);
149 150
            this.btnEnd.TabIndex = 10;
......
155 156
            // 
156 157
            this.btnDataEntry.BackColor = System.Drawing.Color.Green;
157 158
            this.btnDataEntry.ForeColor = System.Drawing.Color.White;
158
            this.btnDataEntry.Location = new System.Drawing.Point(906, 386);
159
            this.btnDataEntry.Location = new System.Drawing.Point(1012, 386);
159 160
            this.btnDataEntry.Name = "btnDataEntry";
160 161
            this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
161 162
            this.btnDataEntry.TabIndex = 9;
......
193 194
            this.groupBoxEx1.Controls.Add(this.dgvMaster);
194 195
            this.groupBoxEx1.Location = new System.Drawing.Point(8, 107);
195 196
            this.groupBoxEx1.Name = "groupBoxEx1";
196
            this.groupBoxEx1.Size = new System.Drawing.Size(1150, 273);
197
            this.groupBoxEx1.Size = new System.Drawing.Size(1250, 273);
197 198
            this.groupBoxEx1.TabIndex = 7;
198 199
            this.groupBoxEx1.TabStop = false;
199 200
            // 
......
218 219
            this.dgvMaster.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders;
219 220
            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
220 221
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
221
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
222
            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
223
            dataGridViewCellStyle25.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
224
            dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText;
225
            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
226
            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
227
            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
228
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
222
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
223
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
224
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
225
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
226
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
227
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
228
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
229
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
229 230
            this.dgvMaster.ColumnHeadersHeight = 27;
230 231
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
231 232
            this.Column1,
......
235 236
            this.Column10,
236 237
            this.Column3,
237 238
            this.Column11,
239
            this.Column14,
238 240
            this.Column4,
239 241
            this.Column5,
240 242
            this.Column6,
......
244 246
            this.dgvMaster.Location = new System.Drawing.Point(6, 6);
245 247
            this.dgvMaster.MultiSelect = false;
246 248
            this.dgvMaster.Name = "dgvMaster";
247
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
248
            dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control;
249
            dataGridViewCellStyle32.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
250
            dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText;
251
            dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
252
            dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
253
            dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
254
            this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle32;
249
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
250
            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
251
            dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
252
            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
253
            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
254
            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
255
            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
256
            this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
255 257
            this.dgvMaster.RowHeadersVisible = false;
256 258
            this.dgvMaster.RowHeadersWidth = 24;
257 259
            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
258
            this.dgvMaster.Size = new System.Drawing.Size(1137, 229);
260
            this.dgvMaster.Size = new System.Drawing.Size(1237, 229);
259 261
            this.dgvMaster.TabIndex = 0;
260 262
            this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged);
261 263
            // 
262 264
            // Column1
263 265
            // 
264
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
265
            dataGridViewCellStyle26.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
266
            this.Column1.DefaultCellStyle = dataGridViewCellStyle26;
266
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
267
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
268
            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
267 269
            this.Column1.HeaderText = "№";
268 270
            this.Column1.Name = "Column1";
269 271
            this.Column1.ReadOnly = true;
......
279 281
            // 
280 282
            // Column2
281 283
            // 
282
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
283
            dataGridViewCellStyle27.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
284
            this.Column2.DefaultCellStyle = dataGridViewCellStyle27;
284
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
285
            dataGridViewCellStyle3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
286
            this.Column2.DefaultCellStyle = dataGridViewCellStyle3;
285 287
            this.Column2.HeaderText = "種類";
286 288
            this.Column2.Name = "Column2";
287 289
            this.Column2.ReadOnly = true;
......
315 317
            this.Column11.Name = "Column11";
316 318
            this.Column11.Visible = false;
317 319
            // 
320
            // Column14
321
            // 
322
            this.Column14.HeaderText = "返却予定日";
323
            this.Column14.Name = "Column14";
324
            this.Column14.ReadOnly = true;
325
            this.Column14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
326
            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
327
            // 
318 328
            // Column4
319 329
            // 
320
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
321
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
322
            dataGridViewCellStyle28.Format = "#,0";
323
            this.Column4.DefaultCellStyle = dataGridViewCellStyle28;
330
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
331
            dataGridViewCellStyle4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
332
            dataGridViewCellStyle4.Format = "#,0";
333
            this.Column4.DefaultCellStyle = dataGridViewCellStyle4;
324 334
            this.Column4.HeaderText = "貸出数";
325 335
            this.Column4.Name = "Column4";
326 336
            this.Column4.ReadOnly = true;
......
329 339
            // 
330 340
            // Column5
331 341
            // 
332
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
333
            dataGridViewCellStyle29.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
334
            dataGridViewCellStyle29.Format = "#,0";
335
            this.Column5.DefaultCellStyle = dataGridViewCellStyle29;
342
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
343
            dataGridViewCellStyle5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
344
            dataGridViewCellStyle5.Format = "#,0";
345
            this.Column5.DefaultCellStyle = dataGridViewCellStyle5;
336 346
            this.Column5.HeaderText = "返却済";
337 347
            this.Column5.Name = "Column5";
338 348
            this.Column5.ReadOnly = true;
......
341 351
            // 
342 352
            // Column6
343 353
            // 
344
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
345
            dataGridViewCellStyle30.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
346
            this.Column6.DefaultCellStyle = dataGridViewCellStyle30;
354
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
355
            dataGridViewCellStyle6.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
356
            this.Column6.DefaultCellStyle = dataGridViewCellStyle6;
347 357
            this.Column6.HeaderText = "返却数";
348 358
            this.Column6.Name = "Column6";
349 359
            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
351 361
            // 
352 362
            // Column13
353 363
            // 
354
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
355
            dataGridViewCellStyle31.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
356
            this.Column13.DefaultCellStyle = dataGridViewCellStyle31;
364
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
365
            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
366
            this.Column13.DefaultCellStyle = dataGridViewCellStyle7;
357 367
            this.Column13.HeaderText = "破棄数";
358 368
            this.Column13.Name = "Column13";
359 369
            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
378 388
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
379 389
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
380 390
            this.BackColor = System.Drawing.Color.Black;
381
            this.ClientSize = new System.Drawing.Size(1166, 423);
391
            this.ClientSize = new System.Drawing.Size(1266, 423);
382 392
            this.Controls.Add(this.groupBoxEx1);
383 393
            this.Controls.Add(this.button3);
384 394
            this.Controls.Add(this.lblRepaydate);
......
429 439
        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
430 440
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
431 441
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
442
        private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
432 443
        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
433 444
        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
434 445
        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.resx
138 138
  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139 139
    <value>True</value>
140 140
  </metadata>
141
  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142
    <value>True</value>
143
  </metadata>
141 144
  <metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142 145
    <value>True</value>
143 146
  </metadata>
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.75")]
36
[assembly: AssemblyFileVersion("1.0.0.75")]
35
[assembly: AssemblyVersion("1.0.0.76")]
36
[assembly: AssemblyFileVersion("1.0.0.76")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

他の形式にエクスポート: Unified diff