プロジェクト

全般

プロフィール

リビジョン 263

堀内7年以上前に追加

売上確認月選択バグ修正

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
38 38
            this.label3 = new System.Windows.Forms.Label();
39 39
            this.dgvMaster = new System.Windows.Forms.DataGridView();
40
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
41
            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
42
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
43
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
44
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
45
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
46
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
47
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
48
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
49
            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
40 50
            this.btnEnd = new System.Windows.Forms.Button();
41 51
            this.groupBox1 = new System.Windows.Forms.GroupBox();
42 52
            this.comboBox1 = new System.Windows.Forms.ComboBox();
......
52 62
            this.label8 = new System.Windows.Forms.Label();
53 63
            this.label2 = new System.Windows.Forms.Label();
54 64
            this.lblCellTotal = new System.Windows.Forms.Label();
55
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
56
            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
57
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
58
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
59
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
60
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
63
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
64
            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
65 65
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
66 66
            this.groupBox1.SuspendLayout();
67 67
            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
......
91 91
            | System.Windows.Forms.AnchorStyles.Left) 
92 92
            | System.Windows.Forms.AnchorStyles.Right)));
93 93
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
94
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
95
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
96
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
97
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
98
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
99
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
100
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
101
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
94
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
95
            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
96
            dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
97
            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
98
            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
99
            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
100
            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
101
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
102 102
            this.dgvMaster.ColumnHeadersHeight = 24;
103 103
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
104 104
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
125 125
            this.dgvMaster.SizeChanged += new System.EventHandler(this.dgvMaster_SizeChanged);
126 126
            this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
127 127
            // 
128
            // Column1
129
            // 
130
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
131
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
132
            this.Column1.DefaultCellStyle = dataGridViewCellStyle9;
133
            this.Column1.Frozen = true;
134
            this.Column1.HeaderText = "№";
135
            this.Column1.Name = "Column1";
136
            this.Column1.ReadOnly = true;
137
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
138
            this.Column1.Width = 60;
139
            // 
140
            // Column10
141
            // 
142
            this.Column10.Frozen = true;
143
            this.Column10.HeaderText = "発注区分コード";
144
            this.Column10.Name = "Column10";
145
            this.Column10.ReadOnly = true;
146
            this.Column10.Visible = false;
147
            this.Column10.Width = 5;
148
            // 
149
            // Column2
150
            // 
151
            this.Column2.Frozen = true;
152
            this.Column2.HeaderText = "発注者コード";
153
            this.Column2.Name = "Column2";
154
            this.Column2.ReadOnly = true;
155
            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
156
            this.Column2.Visible = false;
157
            this.Column2.Width = 5;
158
            // 
159
            // Column4
160
            // 
161
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
162
            this.Column4.DefaultCellStyle = dataGridViewCellStyle10;
163
            this.Column4.Frozen = true;
164
            this.Column4.HeaderText = "発 注 区 分";
165
            this.Column4.Name = "Column4";
166
            this.Column4.ReadOnly = true;
167
            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
168
            this.Column4.Width = 380;
169
            // 
170
            // Column3
171
            // 
172
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
173
            this.Column3.DefaultCellStyle = dataGridViewCellStyle11;
174
            this.Column3.Frozen = true;
175
            this.Column3.HeaderText = "発 注 者 名";
176
            this.Column3.Name = "Column3";
177
            this.Column3.ReadOnly = true;
178
            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
179
            this.Column3.Width = 400;
180
            // 
181
            // Column5
182
            // 
183
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
184
            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
185
            this.Column5.DefaultCellStyle = dataGridViewCellStyle12;
186
            this.Column5.Frozen = true;
187
            this.Column5.HeaderText = "請求金額";
188
            this.Column5.Name = "Column5";
189
            this.Column5.ReadOnly = true;
190
            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
191
            this.Column5.Width = 200;
192
            // 
193
            // Column6
194
            // 
195
            this.Column6.Frozen = true;
196
            this.Column6.HeaderText = "部署コード";
197
            this.Column6.Name = "Column6";
198
            this.Column6.ReadOnly = true;
199
            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
200
            this.Column6.Visible = false;
201
            this.Column6.Width = 5;
202
            // 
203
            // Column7
204
            // 
205
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
206
            this.Column7.DefaultCellStyle = dataGridViewCellStyle13;
207
            this.Column7.Frozen = true;
208
            this.Column7.HeaderText = "部  署";
209
            this.Column7.Name = "Column7";
210
            this.Column7.ReadOnly = true;
211
            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
212
            // 
213
            // Column8
214
            // 
215
            this.Column8.Frozen = true;
216
            this.Column8.HeaderText = "工事担当者コード";
217
            this.Column8.Name = "Column8";
218
            this.Column8.ReadOnly = true;
219
            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
220
            this.Column8.Visible = false;
221
            this.Column8.Width = 5;
222
            // 
223
            // Column9
224
            // 
225
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
226
            this.Column9.DefaultCellStyle = dataGridViewCellStyle14;
227
            this.Column9.Frozen = true;
228
            this.Column9.HeaderText = "工事担当者";
229
            this.Column9.Name = "Column9";
230
            this.Column9.ReadOnly = true;
231
            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
232
            // 
128 233
            // btnEnd
129 234
            // 
130 235
            this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
......
173 278
            this.comboBox1.FormattingEnabled = true;
174 279
            this.comboBox1.Location = new System.Drawing.Point(422, 17);
175 280
            this.comboBox1.Name = "comboBox1";
176
            this.comboBox1.Size = new System.Drawing.Size(100, 24);
281
            this.comboBox1.Size = new System.Drawing.Size(150, 24);
177 282
            this.comboBox1.TabIndex = 32;
178 283
            this.comboBox1.ValueMember = "Key";
179 284
            // 
......
244 349
            0,
245 350
            0,
246 351
            0});
352
            this.numericUpDown2.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged);
247 353
            // 
248 354
            // label5
249 355
            // 
......
251 357
            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
252 358
            this.label5.CausesValidation = false;
253 359
            this.label5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
254
            this.label5.Location = new System.Drawing.Point(876, 16);
360
            this.label5.Location = new System.Drawing.Point(926, 16);
255 361
            this.label5.Name = "label5";
256 362
            this.label5.Size = new System.Drawing.Size(120, 27);
257 363
            this.label5.TabIndex = 37;
......
267 373
            this.comboBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
268 374
            this.comboBox3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
269 375
            this.comboBox3.FormattingEnabled = true;
270
            this.comboBox3.Location = new System.Drawing.Point(1004, 17);
376
            this.comboBox3.Location = new System.Drawing.Point(1054, 17);
271 377
            this.comboBox3.Name = "comboBox3";
272 378
            this.comboBox3.Size = new System.Drawing.Size(194, 24);
273 379
            this.comboBox3.TabIndex = 36;
......
279 385
            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
280 386
            this.label4.CausesValidation = false;
281 387
            this.label4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
282
            this.label4.Location = new System.Drawing.Point(538, 16);
388
            this.label4.Location = new System.Drawing.Point(588, 16);
283 389
            this.label4.Name = "label4";
284 390
            this.label4.Size = new System.Drawing.Size(120, 27);
285 391
            this.label4.TabIndex = 35;
......
295 401
            this.comboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
296 402
            this.comboBox2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
297 403
            this.comboBox2.FormattingEnabled = true;
298
            this.comboBox2.Location = new System.Drawing.Point(666, 17);
404
            this.comboBox2.Location = new System.Drawing.Point(716, 17);
299 405
            this.comboBox2.Name = "comboBox2";
300 406
            this.comboBox2.Size = new System.Drawing.Size(194, 24);
301 407
            this.comboBox2.TabIndex = 34;
......
340 446
            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
341 447
            this.lblCellTotal.TabIndex = 37;
342 448
            // 
343
            // Column1
344
            // 
345
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
346
            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
347
            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
348
            this.Column1.Frozen = true;
349
            this.Column1.HeaderText = "№";
350
            this.Column1.Name = "Column1";
351
            this.Column1.ReadOnly = true;
352
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
353
            this.Column1.Width = 60;
354
            // 
355
            // Column10
356
            // 
357
            this.Column10.Frozen = true;
358
            this.Column10.HeaderText = "発注区分コード";
359
            this.Column10.Name = "Column10";
360
            this.Column10.ReadOnly = true;
361
            this.Column10.Visible = false;
362
            this.Column10.Width = 5;
363
            // 
364
            // Column2
365
            // 
366
            this.Column2.Frozen = true;
367
            this.Column2.HeaderText = "発注者コード";
368
            this.Column2.Name = "Column2";
369
            this.Column2.ReadOnly = true;
370
            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
371
            this.Column2.Visible = false;
372
            this.Column2.Width = 5;
373
            // 
374
            // Column4
375
            // 
376
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
377
            this.Column4.DefaultCellStyle = dataGridViewCellStyle3;
378
            this.Column4.Frozen = true;
379
            this.Column4.HeaderText = "発 注 区 分";
380
            this.Column4.Name = "Column4";
381
            this.Column4.ReadOnly = true;
382
            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
383
            this.Column4.Width = 380;
384
            // 
385
            // Column3
386
            // 
387
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
388
            this.Column3.DefaultCellStyle = dataGridViewCellStyle4;
389
            this.Column3.Frozen = true;
390
            this.Column3.HeaderText = "発 注 者 名";
391
            this.Column3.Name = "Column3";
392
            this.Column3.ReadOnly = true;
393
            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
394
            this.Column3.Width = 400;
395
            // 
396
            // Column5
397
            // 
398
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
399
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
400
            this.Column5.DefaultCellStyle = dataGridViewCellStyle5;
401
            this.Column5.Frozen = true;
402
            this.Column5.HeaderText = "請求金額";
403
            this.Column5.Name = "Column5";
404
            this.Column5.ReadOnly = true;
405
            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
406
            this.Column5.Width = 200;
407
            // 
408
            // Column6
409
            // 
410
            this.Column6.Frozen = true;
411
            this.Column6.HeaderText = "部署コード";
412
            this.Column6.Name = "Column6";
413
            this.Column6.ReadOnly = true;
414
            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
415
            this.Column6.Visible = false;
416
            this.Column6.Width = 5;
417
            // 
418
            // Column7
419
            // 
420
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
421
            this.Column7.DefaultCellStyle = dataGridViewCellStyle6;
422
            this.Column7.Frozen = true;
423
            this.Column7.HeaderText = "部  署";
424
            this.Column7.Name = "Column7";
425
            this.Column7.ReadOnly = true;
426
            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
427
            // 
428
            // Column8
429
            // 
430
            this.Column8.Frozen = true;
431
            this.Column8.HeaderText = "工事担当者コード";
432
            this.Column8.Name = "Column8";
433
            this.Column8.ReadOnly = true;
434
            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
435
            this.Column8.Visible = false;
436
            this.Column8.Width = 5;
437
            // 
438
            // Column9
439
            // 
440
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
441
            this.Column9.DefaultCellStyle = dataGridViewCellStyle7;
442
            this.Column9.Frozen = true;
443
            this.Column9.HeaderText = "工事担当者";
444
            this.Column9.Name = "Column9";
445
            this.Column9.ReadOnly = true;
446
            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
447
            // 
448 449
            // FrmSalesConfirm
449 450
            // 
450 451
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs
261 261
        /// <returns></returns>
262 262
        private void numericUpDown2_ValueChanged(object sender, EventArgs e)
263 263
        {
264
            DisplayData();
264
            // 対象月
265
            this.listMonth = getTargetMonthList();
266

  
267
            comboBox1.DataSource = listMonth;
268
            comboBox1.SelectedIndex = 0;
265 269
        }
266 270
        #endregion
267 271

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs
217 217
        /// <returns></returns>
218 218
        private List<KeyValuePair<int, String>> getTargetMonthList()
219 219
        {
220
            IORequestHead ReqHDB = new IORequestHead();
220 221
            var listMonth = new List<KeyValuePair<int, String>>();
222
            try
223
            {
224
                listMonth.Add(new KeyValuePair<int, String>(0, "?@?????@"));
221 225

  
222
            listMonth.Add(new KeyValuePair<int, String>(0, "?????"));
226
                var sql = new StringBuilder();
227
                sql.Append("Select");
228
                sql.Append(" A1.REQUESTMONTH");
229
                sql.Append(" From");
230
                sql.Append(" requesthead AS A1");
231
                sql.Append(", constructionbaseinfo AS C1");
232
                sql.Append(" WHERE");
233
                sql.Append(" C1.ConstructionCode = A1.REQCONSTRUCTIONCODE");
234
                sql.AppendFormat(" AND C1.ConstructionPeriod = {0}", numericUpDown2.Value);
235
                sql.Append(" Group By A1.REQUESTMONTH");
236
                sql.Append(" Order By A1.REQUESTMONTH");
223 237

  
224
            DateTime stDate = DateTime.Now;
225
            switch (CommonMotions.SystemMasterData.ConstructionNoBase)
226
            {
227
                case (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod:
228
                    // ?c???
229
                    int iYear = CommonMotions.BusinessPeriodToConstructionYears(CommonMotions.SystemMasterData.BusinessPeriod);
230
                    stDate = CommonMotions.cnvDate(string.Format("{0}/{1}",
231
                                                    iYear,
232
                                                    CommonMotions.SystemMasterData.BusinessBeginningDate));
233
                    break;
234
                case (int)CommonDefine.SystemConstructionNoBase.ConstructionYear:
235
                    // ?H???N?x
236
                    stDate = CommonMotions.cnvDate(string.Format("{0}/{1}",
237
                                                    CommonMotions.SystemMasterData.ConstructionYear,
238
                                                    CommonMotions.SystemMasterData.ConstructionBeginningDate));
239
                    break;
238
                var data = new ArrayList();
239
                ReqHDB.ExecuteReader(sql.ToString(), ref data);
240

  
241
                int GetMonth = 0;
242
                foreach (object[] objRec in data)
243
                {
244
                    GetMonth = CommonMotions.cnvInt(objRec[0]);
245

  
246
                    listMonth.Add(new KeyValuePair<int, String>(GetMonth, string.Format("{0}?N{1}??",
247
                                                                                        CommonMotions.cnvTruncate(GetMonth / 100),
248
                                                                                        GetMonth % 100)));
249
                }
240 250
            }
241
            
242
            int DataCnt = 1;
243
            DateTime WorkDate = stDate;
244
            DateTime EndDate = DateTime.Now;
245
            for (int i = stDate.Month; i < 13; i++, DataCnt++)
251
            catch (Exception ex)
246 252
            {
247
                EndDate = DateTimeUtil.EndOfMonth(WorkDate);
248
                listMonth.Add(new KeyValuePair<int, String>(CommonMotions.cnvInt(EndDate.ToString("yyyyMM")),
249
                                                            string.Format("{0, 4}??", i)));
250
                WorkDate = stDate.AddMonths(DataCnt);
253
                logger.ErrorFormat("?V?X?e???G???[?F{0}", ex.Message);
251 254
            }
252
            if (DataCnt < 12)
255
            finally
253 256
            {
254
                for (int i = 1; i < stDate.Month; i++, DataCnt++)
255
                {
256
                    EndDate = DateTimeUtil.EndOfMonth(WorkDate);
257
                    listMonth.Add(new KeyValuePair<int, String>(CommonMotions.cnvInt(EndDate.ToString("yyyyMM")),
258
                                                                string.Format("{0, 4}??", i)));
259
                    WorkDate = stDate.AddMonths(DataCnt);
260
                }
257
                ReqHDB.close(); ReqHDB = null;
261 258
            }
262

  
263 259
            return listMonth;
264

  
265 260
        }
266 261
        #endregion
267 262

  
......
289 284
            DiviDisplayOrder,
290 285
            DiviNameString,
291 286

  
292
            C2DetailString,
293

  
294 287
            E1DisplayOrder,
295 288
            E1DepartmentCode,
296 289
            E1DepartmentString,
......
330 323
                string strPersonName = string.Empty;
331 324
                foreach (object[] objRec in data)
332 325
                {
333
                    strConstrName=string.Empty;
326
                    strConstrName = string.Empty;
334 327
                    strConstrName = CommonMotions.cnvString(objRec[(int)GetOrder.A2OrderersName1])
335 328
                        + CommonMotions.cnvString(objRec[(int)GetOrder.A2OrderersName2]);
336 329

  
......
436 429
                sql.Append(", A2.OrderCotegory");
437 430
                sql.Append(", A2.OrderersCode");
438 431
                sql.Append(", A2.DisplayOrder");
439
                sql.Append(", A2.OrderersName1");
432
                sql.Append(", ifnull(A2.OrderersName1, C2.DetailString)");
440 433
                sql.Append(", A2.OrderersName2");
441 434

  
442 435
                sql.Append(", Divi.DivisionCode");
......
444 437
                sql.Append(", Divi.DisplayOrder");
445 438
                sql.Append(", Divi.NameString");
446 439

  
447
                sql.Append(", C2.DetailString");
448

  
449 440
                sql.Append(", E1.DisplayOrder");
450 441
                sql.Append(", E1.DepartmentCode");
451 442
                sql.Append(", E1.DepartmentString");
......
462 453
                                    (int)DivisionMaster.DivisionMasterCodeDefine.OrderDivision);
463 454

  
464 455
                sql.Append(", constructionbaseinfo AS C1");
465
                sql.AppendFormat(" LEFT JOIN constructionbaseinfodetail C2 ON C2.ConstructionCode = C1.ConstructionCode AND C2.DetailNo= {0}",
456
                sql.Append(" LEFT JOIN constructionbaseinfodetail C2");
457
                sql.AppendFormat(" ON C2.ConstructionCode = C1.ConstructionCode AND C2.DetailNo= {0}",
466 458
                                    (int)ConstructionBaseInfoDetail.DetailDataNo.OrderersName);
467 459
                sql.Append(" LEFT JOIN personinchargemaster D1 ON D1.PersonCode = C1.ConstructionPersonCode");
468 460
                sql.Append(" LEFT JOIN departmentmaster E1 ON E1.DepartmentCode = D1.DepartmentCode");
......
478 470
                int SelComb = SelectedCondition();
479 471
                StringBuilder strGroup = new StringBuilder();
480 472
                StringBuilder strOrder = new StringBuilder();
473
                strOrder.Append("Value DESC");
481 474
                // ??????????????W?v?P???????
482 475
                if (SelComb == 0)
483 476
                {   // ?S?????
484 477
                    strGroup.Append("A2.OrderCotegory, A2.OrderersCode");
478
                    if (strOrder.ToString().Length > 0) strOrder.Append(",");
485 479
                    strOrder.Append("Divi.DisplayOrder, A2.DisplayOrder");
486 480
                }
487 481
                else if ((SelComb & s_SelectedDepartment) != 0)
......
498 492
                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
499 493
                    strOrder.Append("E1.DisplayOrder");
500 494
                }
501

  
502 495
                else if ((SelComb & s_SelectedPerson) != 0)
503 496
                {   // ?S?????I?????????
504 497
                }
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
718 718
                                                                    (int)ClsExcute.MaintenanceExecuteNo.MaterialKind,
719 719
                                                                    (int)ClsExcute.MaintenanceExecuteNo.MaterialItem
720 720
                                                                },
721
                                                                { (int)ClsExcute.MaintenanceExecuteNo.SaleSalesGraphData,
721
                                                                { 0,
722 722
                                                                    0,
723 723
                                                                    0,
724 724
                                                                    (int)ClsExcute.MaintenanceExecuteNo.SalesConfirm
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.71")]
36
[assembly: AssemblyFileVersion("1.0.0.71")]
35
[assembly: AssemblyVersion("1.0.0.72")]
36
[assembly: AssemblyFileVersion("1.0.0.72")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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