プロジェクト

全般

プロフィール

リビジョン 217

堀内7年以上前に追加

請求書日付データ修正
請求状況確認画面実装
請求書郵送日付入力画面追加
セキュリティマスタ請求書状況入力追加
請求まとめ孤児承認処理追加
個人承認画面手間・業者支払い処理追加(暫定)
メニュー個人承認、手間・業者支払い対応
他の画面へボタンのセキュリティ不具合修正
資材管理一覧画面不具合修正

差分を表示:

branches/ddl/20170614_SQL.txt
27 27
CREATE TABLE RequestOrderDate
28 28
(
29 29
	ConstructionCode decimal(10,0) unsigned NOT NULL COMMENT '?H???R?[?h',
30
	RequestNo decimal(9,0) NOT NULL COMMENT '????No',
30
	InvoiceNo decimal(9,0) NOT NULL COMMENT '??????No',
31 31
	SendDate date NOT NULL COMMENT '???????????X????',
32 32
	EntryDate datetime NOT NULL COMMENT '?o?^???t',
33
	UpdateDate datetime NOT NULL COMMENT '?X?V???t'
33
	UpdateDate datetime NOT NULL COMMENT '?X?V???t',
34
	PRIMARY KEY (ConstructionCode, InvoiceNo)
34 35
) COMMENT = '?????????t?f?[?^';
35 36

  
36 37

  
branches/ddl/ProcessManagement.sql
1990 1990

  
1991 1991
create table requestorderdate (
1992 1992
  ConstructionCode decimal(10,0) unsigned not null comment '工事コード'
1993
  , RequestNo decimal(9,0) not null comment '請求No'
1993
  , InvoiceNo decimal(9,0) not null comment '請求書No'
1994 1994
  , SendDate date not null comment '請求書発給郵送日'
1995 1995
  , EntryDate datetime not null comment '登録日付'
1996
  , UpdateDate datetime not null comment '更新日付'
1996
  , UpdateDate datetime not null comment '更新日付',
1997
	PRIMARY KEY (ConstructionCode, InvoiceNo)
1997 1998
) comment '請求書日付データ' ;
1998 1999

  
1999 2000
-- 売上グラフデータ
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
2508 2508
            FrmReqBillingStatus frm = new FrmReqBillingStatus();
2509 2509
            try
2510 2510
            {
2511
                frm.ExecuteFlg = CurrentPara.IntExecParameter[0];
2511 2512
                // フォーム表示
2512 2513
                frm.ShowDialog();
2513 2514
            }
......
2535 2536
            try
2536 2537
            {
2537 2538
                // パラメータセット
2538
                frm.ConstructionCode = CurrentPara.IntExecParameter[0];
2539
                if (CurrentPara.IntExecParameter.Count > 1) frm.OrderNo = CurrentPara.IntExecParameter[1];
2539
                frm.InvoiceNo = CurrentPara.IntExecParameter[0];
2540 2540

  
2541 2541
                // フォーム表示
2542 2542
                frm.ShowDialog();
......
3669 3669
            FrmApprovalPerson frm = new FrmApprovalPerson();
3670 3670
            try
3671 3671
            {
3672
                frm.PersonCode = CurrentPara.IntExecParameter[0];
3673
                frm.ApprovalCode = CurrentPara.IntExecParameter[1];
3674
                frm.OrderNo = CurrentPara.IntExecParameter[2];
3675
                frm.OrderDate = CurrentPara.DateExecParameter[0];
3672
                frm.PersonCode = CurrentPara.IntExecParameter[0];           // 担当者コード
3673
                frm.ApprovalCode = CurrentPara.IntExecParameter[1];         // 承認機能番号
3674
                frm.OrderNo = CurrentPara.IntExecParameter[2];              // 受付番号
3675
                frm.OrderDate = CurrentPara.DateExecParameter[0];           // 受付日
3676 3676

  
3677 3677
                if (CurrentPara.DateExecParameter.Count > 1) frm.DataSearchDate = CurrentPara.DateExecParameter[1];
3678 3678
                if (CurrentPara.IntExecParameter.Count > 3) frm.DataSearchSeqNo = CurrentPara.IntExecParameter[3];
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORequestOrderDate.cs
34 34
        public enum TableColumn
35 35
        {
36 36
            ConstructionCode = 0,	    // 工事番号
37
            RequestNo,                  // 請求No
37
            InvoiceNo,                  // 請求書No
38 38
            SendDate,   	            // 請求書発給郵送日
39
            PaymentDate,                // 入金日
40 39
            EntryDate,	                // 登録年月日
41 40
            UpdateDate,	                // 更新年月日
42 41
        }
......
61 60
        /// <returns></returns>
62 61
        private string CreateSelectSQL()
63 62
        {
64
            string strcmd = "SELECT";
63
            StringBuilder strcmd = new StringBuilder();
64
            
65
            strcmd.Append("SELECT");
66
            strcmd .Append(" ConstructionCode");                                  // 工事番号
67
            strcmd .Append(", InvoiceNo");                                        // 請求書No
68
            strcmd .Append(", DATE_FORMAT(SendDate, '%Y/%m/%d')");                // 請求書発給郵送日
69
            strcmd .Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
70
            strcmd .Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
71
            strcmd .Append(" FROM RequestOrderDate");
65 72

  
66
            strcmd += " ConstructionCode";                                  // 工事番号
67
            strcmd += ", RequestNo";                                        // 請求No
68
            strcmd += ", DATE_FORMAT(SendDate, '%Y/%m/%d')";                // 請求書発給郵送日
69
            strcmd += ", DATE_FORMAT(PaymentDate, '%Y/%m/%d')";             // 入金日
70
            strcmd += ", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')";
71
            strcmd += ", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')";
72
            strcmd += " FROM RequestOrderDate";
73

  
74
            return strcmd;
73
            return strcmd.ToString();
75 74
        }
76 75
        #endregion
77 76

  
......
86 85
        public bool SelectAction(string AddSQLString, ref List<RequestOrderDate> data, bool bConnect = true)
87 86
        {
88 87
            // インターフェース
89
            string strcmd = "";
88
            StringBuilder strcmd = new StringBuilder(); ;
90 89
            ArrayList arData = new ArrayList();
91 90

  
92 91
            try
93 92
            {
94 93
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
95
                strcmd = CreateSelectSQL() + AddSQLString;
94
                strcmd.AppendFormat("{0}{1}", CreateSelectSQL(), AddSQLString);
96 95

  
97 96
                // SQL実行
98
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
97
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
99 98

  
100 99
                // データセット
101 100
                foreach (object[] objwrk in arData)
......
109 108
            }
110 109
            catch (Exception ex)
111 110
            {
112
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
111
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
113 112
                return false;
114 113
            }
115 114
        }
......
126 125
        public bool SelectAction(string AddSQLString, ref RequestOrderDate data, bool bConnect = true)
127 126
        {
128 127
            // インターフェース
129
            string strcmd = "";
128
            StringBuilder strcmd = new StringBuilder();
130 129
            ArrayList arData = new ArrayList();
131 130

  
132 131
            try
133 132
            {
134 133
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
135
                strcmd = CreateSelectSQL() + AddSQLString;
134
                strcmd.AppendFormat("{0}{1}", CreateSelectSQL(), AddSQLString);
136 135

  
137 136
                // SQL実行
138
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
137
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
139 138
                if (arData.Count == 0) return false;
140 139

  
141 140
                // データセット
......
149 148
            }
150 149
            catch (Exception ex)
151 150
            {
152
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
151
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
153 152
                return false;
154 153
            }
155 154
        }
......
163 162
        /// <returns>true:成功 false:失敗</returns>
164 163
        public bool InsertAction(RequestOrderDate work, bool bConnect = true)
165 164
        {
166
            string strcmd = "";
165
            StringBuilder strcmd = new StringBuilder();
167 166
            try
168 167
            {
169 168

  
170 169
                bool bColFirst = true;
171
                strcmd = "INSERT INTO RequestOrderDate";
172
                strcmd += " (";
170
                strcmd.Append("INSERT INTO RequestOrderDate");
171
                strcmd .Append(" (");
173 172
                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
174 173
                {
175
                    if (!bColFirst) strcmd += ", ";
176
                    strcmd += gender.ToString();
174
                    if (!bColFirst) strcmd .Append(", ");
175
                    strcmd .Append(gender.ToString());
177 176
                    bColFirst = false;
178 177
                }
179
                strcmd += ") VALUES (";
178
                strcmd .Append(") VALUES (");
180 179

  
181
                strcmd += string.Format(" {0}", work.ConstructionCode);                 // 工事番号
182
                strcmd += string.Format(",{0}", work.RequestNo);                        // 請求No
180
                strcmd .AppendFormat(" {0}", work.ConstructionCode);                 // 工事番号
181
                strcmd .AppendFormat(",{0}", work.InvoiceNo);                        // 請求No
183 182

  
184
                strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d')",
183
                strcmd .AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')",
185 184
                                            work.SendDate.ToShortDateString());         // 請求書発給郵送日
186
                strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d')",
187
                                            work.PaymentDate.ToShortDateString());      // 入金日
188 185

  
189
                strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
190
                strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
191
                strcmd += ")";
186
                strcmd .AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
187
                strcmd .AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
188
                strcmd .Append(")");
192 189

  
193
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
190
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
194 191

  
195 192
                return true;
196 193
            }
197 194
            catch (Exception ex)
198 195
            {
199
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
196
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
200 197
                return false;
201 198
            }
202 199
        }
......
210 207
        /// <returns>true:成功 false:失敗</returns>
211 208
        public bool InsertAction(List<RequestOrderDate> data, bool bConnect = true)
212 209
        {
213
            string strcmd = "";
210
            StringBuilder strcmd = new StringBuilder();
214 211
            try
215 212
            {
216 213
                bool bColFirst = true;
217
                strcmd = "INSERT INTO RequestOrderDate";
218
                strcmd += " (";
214
                strcmd.Append("INSERT INTO RequestOrderDate");
215
                strcmd.Append(" (");
219 216
                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
220 217
                {
221
                    if (!bColFirst) strcmd += ", ";
222
                    strcmd += gender.ToString();
218
                    if (!bColFirst) strcmd.Append(", ");
219
                    strcmd.Append(gender.ToString());
223 220
                    bColFirst = false;
224 221
                }
225
                strcmd += ") VALUES";
222
                strcmd.Append(") VALUES");
226 223

  
227 224
                bool bDataFirst = true;
228 225
                foreach (RequestOrderDate work in data)
229 226
                {
230
                    if (bDataFirst) strcmd += " (";
231
                    else strcmd += ", (";
227
                    if (bDataFirst) strcmd.Append(" (");
228
                    else strcmd.Append(", (");
232 229

  
233
                    strcmd += string.Format(" {0}", work.ConstructionCode);                 // 工事番号
234
                    strcmd += string.Format(",{0}", work.RequestNo);                        // 請求No
230
                    strcmd.AppendFormat(" {0}", work.ConstructionCode);                 // 工事番号
231
                    strcmd.AppendFormat(",{0}", work.InvoiceNo);                        // 請求No
235 232

  
236
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d')",
233
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')",
237 234
                                                work.SendDate.ToShortDateString());         // 請求書発給郵送日
238
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d')",
239
                                                work.PaymentDate.ToShortDateString());      // 入金日
240 235

  
241
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
242
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
243
                    strcmd += ")";
236
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
237
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
238
                    strcmd.Append(")");
244 239

  
245 240
                    bDataFirst = false;
246 241
                }
247 242

  
248
                if (!ExecuteNonQuery(strcmd, false)) return false;
243
                if (!ExecuteNonQuery(strcmd.ToString(), false)) return false;
249 244

  
250 245
                return true;
251 246
            }
252 247
            catch (Exception ex)
253 248
            {
254
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
249
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
255 250
                return false;
256 251
            }
257 252
        }
......
266 261
        /// <returns>true:成功 false:失敗</returns>
267 262
        public bool UpdateAction(string AddSQLString, RequestOrderDate data, bool bConnect = true)
268 263
        {
269
            string strcmd = "";
264
            StringBuilder strcmd = new StringBuilder();
270 265
            try
271 266
            {
272 267

  
273
                strcmd = "UPDATE RequestOrderDate";
268
                strcmd.Append("UPDATE RequestOrderDate");
274 269

  
275
                strcmd += " SET";
270
                strcmd.Append(" SET");
276 271

  
277
                strcmd += string.Format("  ConstructionCode = {0}", data.ConstructionCode);	    // 工事番号
278
                strcmd += string.Format(", RequestNo = {0}", data.RequestNo);                   // 請求No
272
                strcmd.AppendFormat("  ConstructionCode = {0}", data.ConstructionCode);	    // 工事番号
273
                strcmd.AppendFormat(", RequestNo = {0}", data.InvoiceNo);                   // 請求No
279 274

  
280
                strcmd += string.Format(", SendDate = STR_TO_DATE('{0}','%Y/%m/%d')",
275
                strcmd.AppendFormat(", SendDate = STR_TO_DATE('{0}','%Y/%m/%d')",
281 276
                                                    data.SendDate.ToShortDateString());         // 請求書発給郵送日
282
                strcmd += string.Format(", PaymentDate = STR_TO_DATE('{0}','%Y/%m/%d')",
283
                                                    data.PaymentDate.ToShortDateString());      // 入金日
284 277

  
285
                strcmd += ", UpdateDate = NOW()";
286
                strcmd += AddSQLString;
278
                strcmd.Append(", UpdateDate = NOW()");
279
                strcmd.Append(AddSQLString);
287 280

  
288
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
281
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
289 282

  
290 283
                return true;
291 284
            }
292 285
            catch (Exception ex)
293 286
            {
294
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
287
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
295 288
                return false;
296 289
            }
297 290
        }
......
307 300
        public bool DeleteAction(string AddSQLString, bool bConnect = true)
308 301
        {
309 302
            // インターフェース
310
            string strcmd = "";
303
            StringBuilder strcmd = new StringBuilder();
311 304
            try
312 305
            {
313
                strcmd = string.Format("{0}{1}", "DELETE FROM RequestOrderDate", AddSQLString);
306
                strcmd.AppendFormat("{0}{1}", "DELETE FROM RequestOrderDate", AddSQLString);
314 307

  
315
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
308
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
316 309

  
317 310
                return true;
318 311
            }
319 312
            catch (Exception ex)
320 313
            {
321
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
314
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
322 315
                return false;
323 316
            }
324 317
        }
......
329 322
        /// 1項目の更新を行う
330 323
        /// </summary>
331 324
        /// <returns></returns>
332
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int RequestNo = 0)
325
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int InvoiceNo = 0)
333 326
        {
334
            string strcmd = "";
327
            StringBuilder strcmd = new StringBuilder();
335 328
            try
336 329
            {
337
                strcmd = "UPDATE RequestOrderDate";
330
                strcmd.Append("UPDATE RequestOrderDate");
338 331

  
339
                strcmd += " SET";
332
                strcmd.Append(" SET");
340 333
                switch (FeildNo)
341 334
                {
342 335
                    case (int)TableColumn.ConstructionCode:	        // 工事番号
343
                        strcmd += string.Format(" ConstructionCode = {0}", ((int)value).ToString());
336
                        strcmd.AppendFormat(" ConstructionCode = {0}", ((int)value).ToString());
344 337
                        break;
345
                    case (int)TableColumn.RequestNo:                // 請求No
346
                        strcmd += string.Format(" RequestNo = {0}", ((int)value).ToString());
338
                    case (int)TableColumn.InvoiceNo:                // 請求書No
339
                        strcmd.AppendFormat(" InvoiceNo = {0}", ((int)value).ToString());
347 340
                        break;
348 341
                    case (int)TableColumn.SendDate:                 // 請求書発給郵送日
349
                        strcmd += string.Format("SendDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
342
                        strcmd.AppendFormat(" SendDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
350 343
                        break;
351
                    case (int)TableColumn.PaymentDate:              // 入金日
352
                        strcmd += string.Format("PaymentDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
353
                        break;
354 344
                }
355 345

  
356
                strcmd += ", UpdateDate = NOW()";
357
                strcmd += CreatePrimarykeyString(ConstructionCode, RequestNo);
346
                strcmd.Append(", UpdateDate = NOW()");
347
                strcmd.Append(CreatePrimarykeyString(ConstructionCode, InvoiceNo));
358 348

  
359
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
349
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
360 350

  
361 351
                return true;
362 352
            }
363 353
            catch (Exception ex)
364 354
            {
365
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
355
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
366 356
                return false;
367 357
            }
368 358
        }
......
380 370
            {
381 371
                // データ取得
382 372
                wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString());	            // 工事番号
383
                wrk.RequestNo = int.Parse(objwrk[(int)TableColumn.RequestNo].ToString());	                        // 請求No
373
                wrk.InvoiceNo = int.Parse(objwrk[(int)TableColumn.InvoiceNo].ToString());	                        // 請求書No
384 374

  
385 375
                wrk.SendDate = DateTime.Parse(objwrk[(int)TableColumn.SendDate].ToString());                        // 請求書発給郵送日
386
                wrk.PaymentDate = DateTime.Parse(objwrk[(int)TableColumn.PaymentDate].ToString());                  // 入金日
387 376

  
388 377
                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
389 378
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
......
403 392
        /// <summary>
404 393
        /// 主キー検索の文字列を返す
405 394
        /// </summary>
406
        public string CreatePrimarykeyString(int ConstructionCode, int RequestNo = 0)
395
        public string CreatePrimarykeyString(int ConstructionCode, int InvoiceNo = 0)
407 396
        {
408
            string strWork = "";
397
            StringBuilder strWork = new StringBuilder();
409 398
            try
410 399
            {
411
                strWork = string.Format(" Where ConstructionCode = {0}", ConstructionCode);
412
                if (RequestNo != 0)
413
                    strWork += string.Format(" And RequestNo = {0}", RequestNo);
400
                strWork.AppendFormat(" Where ConstructionCode = {0}", ConstructionCode);
401
                if (InvoiceNo != 0)
402
                    strWork.AppendFormat(" And InvoiceNo = {0}", InvoiceNo);
414 403
            }
415 404
            catch (Exception ex)
416 405
            {
417
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strWork);
406
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
418 407
            }
419 408

  
420
            return strWork;
409
            return strWork.ToString();
421 410
        }
422 411
        #endregion
423 412
    }
branches/src/ProcessManagement/ProcessManagement/DataModel/RequestOrderDate.cs
13 13
    {
14 14
        #region メンバ変数
15 15
        private int         m_ConstructionCode = 0;             // 工事番号
16
        private int         m_RequestNo = 0;	                // 請求No
16
        private int         m_InvoiceNo = 0;	                // 請求書No
17 17
        private DateTime    m_SendDate = DateTime.MinValue;     // 請求書発給郵送日
18
        private DateTime    m_PaymentDate = DateTime.MinValue;  // 入金日
19 18
        private DateTime    m_EntryDate = DateTime.Now;         // 登録日付
20 19
        private DateTime    m_UpdateDate = DateTime.Now;        // 更新日付
21 20
        #endregion
......
33 32
            set { m_ConstructionCode = value; }
34 33
        }
35 34
        /// <summary>
36
        /// 請求
35
        /// 請求
37 36
        /// </summary>
38
        public int RequestNo
37
        public int InvoiceNo
39 38
        {
40
            get { return m_RequestNo; }
41
            set { m_RequestNo = value; }
39
            get { return m_InvoiceNo; }
40
            set { m_InvoiceNo = value; }
42 41
        }
43 42
        /// <summary>
44 43
        /// 請求書発給郵送日
......
49 48
            set { m_SendDate = value; }
50 49
        }
51 50
        /// <summary>
52
        /// 入金日
53
        /// </summary>
54
        public DateTime PaymentDate
55
        {
56
            get { return m_PaymentDate; }
57
            set { m_PaymentDate = value; }
58
        }
59
        /// <summary>
60 51
        /// 登録日付
61 52
        /// </summary>
62 53
        public DateTime EntryDate
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
682 682
                case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:              // 10:??????o?^???F
683 683
                    iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SubConstrRegist;
684 684
                    break;
685
                case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:???x??
686
                    iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
687
                    break;
688
                case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:???x??
689
                    iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
690
                    break;
685 691
            }
686 692
            if (iNextProcessNo == 0) return;
687 693

  
688 694
            // ----- ?N???v???Z?X???
689 695
            int NowPoint = ClsExcute.NextProcess(iNextProcessNo);
696

  
697
            // ???E???x??????????????
698
            switch (m_ApprovalCode)
699
            {
700
                case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:???x??
701
                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Labor);
702
                    break;
703
                case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:???x??
704
                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Normal);
705
                    break;
706
            }
707
            
690 708
            // ----- ?S????R?[?h?Z?b?g
691 709
            ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PersonCode);
692 710
            // ??t??
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
803 803
            IOPersonApproval AppDB = new IOPersonApproval();
804 804
            try
805 805
            {
806
                string strSQL = string.Empty;
806
                StringBuilder strSQL = new StringBuilder();
807 807

  
808 808
                switch (m_ApprovalCode)
809 809
                {
810 810
                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:
811
                        strSQL = string.Format("UPDATE ATTENDANCEDATA SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
812
                        strSQL += string.Format(" ORDERNO = {0}", m_OrderNo);
813
                        strSQL += string.Format(" WHERE PersonCode = {0}",m_PersonCode);
814
                        strSQL += string.Format(" AND DATE(AttendanceMonth) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
811
                        strSQL.AppendFormat("UPDATE ATTENDANCEDATA SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
812
                        strSQL.AppendFormat(" ORDERNO = {0}", m_OrderNo);
813
                        strSQL.AppendFormat(" WHERE PersonCode = {0}",m_PersonCode);
814
                        strSQL.AppendFormat(" AND DATE(AttendanceMonth) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
815 815
                        break;
816 816
                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:
817
                        strSQL = string.Format("UPDATE COSTOMERREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
818
                        strSQL += string.Format(" ORDERNO = {0}", m_OrderNo);
819
                        strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
820
                        strSQL += string.Format(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
821
                        strSQL += string.Format(" AND SEQNO = {0}", m_SearchSeqNo);
817
                        strSQL.AppendFormat("UPDATE COSTOMERREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
818
                        strSQL.AppendFormat(" ORDERNO = {0}", m_OrderNo);
819
                        strSQL.AppendFormat(" WHERE PersonCode = {0}", m_PersonCode);
820
                        strSQL.AppendFormat(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
821
                        strSQL.AppendFormat(" AND SEQNO = {0}", m_SearchSeqNo);
822 822
                        break;
823 823
                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:
824
                        strSQL = string.Format("UPDATE SUBCONSTRREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
825
                        strSQL += string.Format(" ORDERNO = {0}", m_OrderNo);
826
                        strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
827
                        strSQL += string.Format(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
828
                        strSQL += string.Format(" AND SEQNO = {0}", m_SearchSeqNo);
824
                        strSQL.AppendFormat("UPDATE SUBCONSTRREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
825
                        strSQL.AppendFormat(" ORDERNO = {0}", m_OrderNo);
826
                        strSQL.AppendFormat(" WHERE PersonCode = {0}", m_PersonCode);
827
                        strSQL.AppendFormat(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
828
                        strSQL.AppendFormat(" AND SEQNO = {0}", m_SearchSeqNo);
829 829
                        break;
830 830
                    default:
831 831
                        break;
832 832
                }
833 833

  
834
                if (!AppDB.ExecuteNonQuery(strSQL)) return false;
834
                if (!AppDB.ExecuteNonQuery(strSQL.ToString())) return false;
835 835

  
836 836
                return true;
837 837
            }
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs
116 116
                            handle = ProcessExecute_ConstructionBudget;
117 117
                            break;
118 118
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
119
                            if (m_EditLock) continue;
120 119
                            handle = ProcessExecute_ConstructionCopyList;
121 120
                            break;
122 121
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/ProcessControl.cs
116 116
                            handle = ProcessExecute_ConstructionBudget;
117 117
                            break;
118 118
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
119
                            if (m_EditLock) continue;
120 119
                            handle = ProcessExecute_ConstructionCopyList;
121 120
                            break;
122 121
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
1747 1747
                DateTime DspSTDate = DateTime.MaxValue;
1748 1748
                DateTime DspEdDate = DateTime.MinValue;
1749 1749

  
1750
                // ???????B??o????^??\???????
1751
                if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
1750
                // ???^???W?v????
1751
                for (int i = 0; i < PersonCDArray.Count; i++)
1752 1752
                {
1753
                    // ???^???W?v????
1754
                    for (int i = 0; i < PersonCDArray.Count; i++)
1755
                    {
1756
                        // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1757
                        stDate = dtStartArray[i];
1758
                        edDate = dtMaxCompArray[i];
1759
                        CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1753
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1754
                    stDate = dtStartArray[i];
1755
                    edDate = dtMaxCompArray[i];
1756
                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1760 1757

  
1761
                        // ???^????
1762
                        int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1763
                        // ??v???Z
1764
                        TotalSalary += workSalary;
1765
                        // ?\?????t??
1766
                        if (DspSTDate > stDate) DspSTDate = stDate;
1767
                        if (DspEdDate < edDate) DspEdDate = edDate;
1768
                    }
1758
                    // ???^????
1759
                    int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1760
                    // ??v???Z
1761
                    TotalSalary += workSalary;
1762
                    // ?\?????t??
1763
                    if (DspSTDate > stDate) DspSTDate = stDate;
1764
                    if (DspEdDate < edDate) DspEdDate = edDate;
1769 1765
                }
1766

  
1770 1767
                // ----- ?\??????
1771 1768
                // ?U?????^???z?E?????v???z?E?e???v???z??
1772 1769
                ProfitGeneral(ref OnSalary, ref  NetIncome, ref  NonSalary);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
1703 1703
                DateTime DspSTDate = DateTime.MaxValue;
1704 1704
                DateTime DspEdDate = DateTime.MinValue;
1705 1705

  
1706
                // ???????B??o????^??\???????
1707
                if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
1706
                // ???^???W?v????
1707
                for (int i = 0; i < PersonCDArray.Count; i++)
1708 1708
                {
1709
                    // ???^???W?v????
1710
                    for (int i = 0; i < PersonCDArray.Count; i++)
1711
                    {
1712
                        // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1713
                        stDate = dtStartArray[i];
1714
                        edDate = dtMaxCompArray[i];
1715
                        CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1709
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1710
                    stDate = dtStartArray[i];
1711
                    edDate = dtMaxCompArray[i];
1712
                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1716 1713

  
1717
                        // ???^????
1718
                        int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1719
                        // ??v???Z
1720
                        TotalSalary += workSalary;
1714
                    // ???^????
1715
                    int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1716
                    // ??v???Z
1717
                    TotalSalary += workSalary;
1721 1718

  
1722
                        // ?\?????t??
1723
                        if (DspSTDate > stDate) DspSTDate = stDate;
1724
                        if (DspEdDate < edDate) DspEdDate = edDate;
1725
                    }
1719
                    // ?\?????t??
1720
                    if (DspSTDate > stDate) DspSTDate = stDate;
1721
                    if (DspEdDate < edDate) DspEdDate = edDate;
1726 1722
                }
1723

  
1727 1724
                // ----- ?\??????
1728 1725
                // ?U?????^???z?E?????v???z?E?e???v???z??
1729 1726
                ProfitGeneral(DepartmentCode, 0, ref OnSalary, ref  NetIncome, ref  NonSalary);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLList.designer.cs
138 138
            // 
139 139
            this.radioButton2.AutoSize = true;
140 140
            this.radioButton2.BackColor = System.Drawing.Color.Transparent;
141
            this.radioButton2.Checked = true;
141 142
            this.radioButton2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
142 143
            this.radioButton2.ForeColor = System.Drawing.Color.Black;
143 144
            this.radioButton2.Location = new System.Drawing.Point(662, 32);
144 145
            this.radioButton2.Name = "radioButton2";
145 146
            this.radioButton2.Size = new System.Drawing.Size(77, 20);
146 147
            this.radioButton2.TabIndex = 44;
148
            this.radioButton2.TabStop = true;
147 149
            this.radioButton2.Text = "工 事";
148 150
            this.radioButton2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
149 151
            this.radioButton2.UseVisualStyleBackColor = false;
......
153 155
            // 
154 156
            this.radioButton1.AutoSize = true;
155 157
            this.radioButton1.BackColor = System.Drawing.Color.Transparent;
156
            this.radioButton1.Checked = true;
157 158
            this.radioButton1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
158 159
            this.radioButton1.ForeColor = System.Drawing.Color.Black;
159 160
            this.radioButton1.Location = new System.Drawing.Point(662, 12);
160 161
            this.radioButton1.Name = "radioButton1";
161 162
            this.radioButton1.Size = new System.Drawing.Size(77, 20);
162 163
            this.radioButton1.TabIndex = 43;
163
            this.radioButton1.TabStop = true;
164 164
            this.radioButton1.Text = "営 業";
165 165
            this.radioButton1.TextAlign = System.Drawing.ContentAlignment.TopCenter;
166 166
            this.radioButton1.UseVisualStyleBackColor = false;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs
50 50
            CONSTMANDISPORDER,
51 51
            CONSTDEPDISPORDER,
52 52
            MARKCONSTRCODE,
53
            COMPLETEFLG,
53 54
        }
54 55
        #endregion
55 56

  
......
122 123
        /// ????SQL??Z?L?????e?B??????????????
123 124
        /// </summary>
124 125
        /// <param name="strSQL"></param>
125
        private void CreateSecuritySQL(ref string strSQL)
126
        private void CreateSecuritySQL(ref StringBuilder strSQL)
126 127
        {
127 128
            try
128 129
            {
......
147 148
                    // ???????L
148 149
                    // ?@???????i?????????j
149 150

  
150
                    strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
151
                    strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
151
                    strSQL.Append(" And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1");
152
                    strSQL.AppendFormat(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
152 153

  
153
                    strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
154
                    strSQL.AppendFormat(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
154 155

  
155
                    strSQL += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
156
                    strSQL += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
156
                    strSQL.Append(" And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3");
157
                    strSQL.AppendFormat(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
157 158

  
158
                    strSQL += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
159
                    strSQL += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
159
                    strSQL.Append(" Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5");
160
                    strSQL.AppendFormat(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
160 161

  
161
                    strSQL += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
162
                    strSQL += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0}))))", CommonMotions.LoginUserData.PersonCode);
162
                    strSQL.Append(" Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7");
163
                    strSQL.AppendFormat(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0}))))", CommonMotions.LoginUserData.PersonCode);
163 164

  
164
                    strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0} And A.ConstructionPersonCode = 0)", iStatus);          // ????????????o???H???S??????????????????\??
165
                    strSQL += string.Format(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // ???????p??????p???????????????
166
                    strSQL += string.Format(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
165
                    strSQL.AppendFormat(" Or (A.ConstructionStatusFlg >= {0} And A.ConstructionPersonCode = 0)", iStatus);          // ????????????o???H???S??????????????????\??
166
                    strSQL.AppendFormat(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // ???????p??????p???????????????
167
                    strSQL.AppendFormat(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
167 168
                }
168 169
                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
169 170
                {
170 171
                    // ???g?p??
171
                    strSQL += string.Format(" And (A.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
172
                    strSQL.AppendFormat(" And (A.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
172 173

  
173
                    strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
174
                    strSQL.AppendFormat(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
174 175

  
175
                    strSQL += string.Format(" And (A.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
176
                    strSQL.AppendFormat(" And (A.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
176 177

  
177
                    strSQL += string.Format(" Or A.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
178
                    strSQL.AppendFormat(" Or A.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
178 179

  
179
                    strSQL += string.Format(" Or A.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
180
                    strSQL.AppendFormat(" Or A.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
180 181
                }
181 182
            }
182 183
            catch (Exception ex)
......
227 228
        {
228 229
            try
229 230
            {
230
                string strRet = string.Empty;
231
                StringBuilder strRet = new StringBuilder(); ;
231 232

  
232 233
                int DepartmentCode = GetDepartmentCode();
233
                if (DepartmentCode == 0) return strRet;
234
                if (DepartmentCode == 0) return strRet.ToString();
234 235
                    
235
                strRet += string.Format(" AND (C.DEPARTMENTCODE = {0} OR D.DEPARTMENTCODE = {0})", DepartmentCode);
236
                strRet.AppendFormat(" AND (C.DEPARTMENTCODE = {0} OR D.DEPARTMENTCODE = {0})", DepartmentCode);
236 237

  
237
                return strRet;
238
                return strRet.ToString();
238 239
            }
239 240
            catch (Exception ex)
240 241
            {
......
249 250
        /// ?????o???????SQL??
250 251
        /// </summary>
251 252
        /// <param name="strSQL"></param>
252
        private void CreateSQL01(ref string strSQL)
253
        private void CreateSQL01(ref StringBuilder strSQL)
253 254
        {
254 255
            try
255 256
            {
256 257
                int Status1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
257 258
                int Status2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?{?H????")).Key;
258 259

  
259
                strSQL = "SELECT * FROM (";
260
                strSQL.Append("SELECT * FROM (");
260 261
                for (int i = 0; i < 2; i++)
261 262
                {
262 263
                    switch (i)
263 264
                    {
264 265
                        case 0:
265
                            strSQL += "SELECT";
266
                            strSQL.Append("SELECT");
266 267
                            break;
267 268
                        case 1:
268
                            strSQL += " UNION SELECT";
269
                            strSQL.Append(" UNION SELECT");
269 270
                            break;
270 271
                    }
271 272

  
272
                    strSQL += " DISTINCT A.CONSTRUCTIONCODE,";
273
                    strSQL += " A.CONSTRUCTIONPERIOD,";
274
                    strSQL += " B.DETAILSTRING,";
275
                    strSQL += " A.CONSTRUCTIONSTATUSFLG,";
276
                    strSQL += " C.PERSONCODE AS SALESMANCODE,";
277
                    strSQL += " C.PERSONNAME AS SALESMANNAME,";
278
                    strSQL += " C.DEPARTMENTCODE AS SALESDEPCODE,";
279
                    strSQL += " C.DEPARTMENTNAME AS SALESDEPNAME,";
280
                    strSQL += " C.MANDISPORDER AS SALESMANORDER,";
281
                    strSQL += " C.DEPDISPORDER AS SALESDEPORDER,";
282
                    strSQL += " D.PERSONCODE,";
283
                    strSQL += " D.PERSONNAME,";
284
                    strSQL += " D.DEPARTMENTCODE,";
285
                    strSQL += " D.DEPARTMENTNAME,";
286
                    strSQL += " D.MANDISPORDER,";
287
                    strSQL += " D.DEPDISPORDER,";
288
                    strSQL += " E.CONSTRUCTIONCODE AS MARCKCODE";
273
                    strSQL.Append(" DISTINCT A.CONSTRUCTIONCODE,");
274
                    strSQL.Append(" A.CONSTRUCTIONPERIOD,");
275
                    strSQL.Append(" B.DETAILSTRING,");
276
                    strSQL.Append(" A.CONSTRUCTIONSTATUSFLG,");
277
                    strSQL.Append(" C.PERSONCODE AS SALESMANCODE,");
278
                    strSQL.Append(" C.PERSONNAME AS SALESMANNAME,");
279
                    strSQL.Append(" C.DEPARTMENTCODE AS SALESDEPCODE,");
280
                    strSQL.Append(" C.DEPARTMENTNAME AS SALESDEPNAME,");
281
                    strSQL.Append(" C.MANDISPORDER AS SALESMANORDER,");
282
                    strSQL.Append(" C.DEPDISPORDER AS SALESDEPORDER,");
283
                    strSQL.Append(" D.PERSONCODE,");
284
                    strSQL.Append(" D.PERSONNAME,");
285
                    strSQL.Append(" D.DEPARTMENTCODE,");
286
                    strSQL.Append(" D.DEPARTMENTNAME,");
287
                    strSQL.Append(" D.MANDISPORDER,");
288
                    strSQL.Append(" D.DEPDISPORDER,");
289
                    strSQL.Append(" E.CONSTRUCTIONCODE AS MARCKCODE,");
290
                    strSQL.Append(" E.COMPLETEFLG AS COMPLETEFLG");
289 291

  
290
                    strSQL += " FROM CONSTRUCTIONBASEINFO A";
292
                    strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
291 293

  
292
                    strSQL += " LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,";
293
                    strSQL += " CB.DEPARTMENTCODE DEPARTMENTCODE, CC.DEPARTMENTSTRING DEPARTMENTNAME,";
294
                    strSQL += " CB.DISPLAYORDER MANDISPORDER, CC.DISPLAYORDER DEPDISPORDER";
295
                    strSQL += " FROM CONSTRUCTIONBASEINFO CA";
296
                    strSQL += " LEFT JOIN PERSONINCHARGEMASTER CB ON CA.SALESPERSONCODE = CB.PERSONCODE";
297
                    strSQL += " LEFT JOIN DEPARTMENTMASTER CC ON CB.DEPARTMENTCODE = CC.DEPARTMENTCODE";
298
                    strSQL += string.Format(" WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE", numUDConstPro.Value);
294
                    strSQL.Append(" LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,");
295
                    strSQL.Append(" CB.DEPARTMENTCODE DEPARTMENTCODE, CC.DEPARTMENTSTRING DEPARTMENTNAME,");
296
                    strSQL.Append(" CB.DISPLAYORDER MANDISPORDER, CC.DISPLAYORDER DEPDISPORDER");
297
                    strSQL.Append(" FROM CONSTRUCTIONBASEINFO CA");
298
                    strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER CB ON CA.SALESPERSONCODE = CB.PERSONCODE");
299
                    strSQL.Append(" LEFT JOIN DEPARTMENTMASTER CC ON CB.DEPARTMENTCODE = CC.DEPARTMENTCODE");
300
                    strSQL.AppendFormat(" WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE", numUDConstPro.Value);
299 301

  
300
                    strSQL += " LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,";
301
                    strSQL += " DB.DEPARTMENTCODE DEPARTMENTCODE, DC.DEPARTMENTSTRING DEPARTMENTNAME,";
302
                    strSQL += " DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER";
303
                    strSQL += " FROM CONSTRUCTIONBASEINFO DA";
304
                    strSQL += " LEFT JOIN PERSONINCHARGEMASTER DB ON DA.CONSTRUCTIONPERSONCODE = DB.PERSONCODE";
305
                    strSQL += " LEFT JOIN DEPARTMENTMASTER DC ON DB.DEPARTMENTCODE = DC.DEPARTMENTCODE";
302
                    strSQL.Append(" LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,");
303
                    strSQL.Append(" DB.DEPARTMENTCODE DEPARTMENTCODE, DC.DEPARTMENTSTRING DEPARTMENTNAME,");
304
                    strSQL.Append(" DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER");
305
                    strSQL.Append(" FROM CONSTRUCTIONBASEINFO DA");
306
                    strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER DB ON DA.CONSTRUCTIONPERSONCODE = DB.PERSONCODE");
307
                    strSQL.Append(" LEFT JOIN DEPARTMENTMASTER DC ON DB.DEPARTMENTCODE = DC.DEPARTMENTCODE");
306 308

  
307
                    strSQL += string.Format(" WHERE DA.CONSTRUCTIONPERIOD = {0}) D ON A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE", numUDConstPro.Value);
309
                    strSQL.AppendFormat(" WHERE DA.CONSTRUCTIONPERIOD = {0}) D ON A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE", numUDConstPro.Value);
308 310
                    switch (i)
309 311
                    {
310 312
                        case 0:
311
                            strSQL += ", CONSTRUCTIONBASEINFODETAIL B";
312
                            strSQL += " LEFT JOIN CONSTRUCTIONMATERIALINFO E ON E.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
313
                            strSQL.Append(", CONSTRUCTIONBASEINFODETAIL B");
314
                            strSQL.Append(" LEFT JOIN CONSTRUCTIONMATERIALINFO E ON E.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
313 315
                            break;
314 316
                        case 1:
315
                            strSQL += ", CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONMATERIALINFO E";
317
                            strSQL.Append(", CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONMATERIALINFO E");
316 318
                            break;
317 319
                    }
318 320

  
319
                    strSQL += string.Format(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
320
                    strSQL += string.Format(" AND A.TYINGFLG != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
321
                    strSQL += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
322
                    strSQL += string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
321
                    strSQL.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
322
                    strSQL.AppendFormat(" AND A.TYINGFLG != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
323
                    strSQL.Append(" AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
324
                    strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
323 325

  
324 326
                    switch (i)
325 327
                    {
326 328
                        case 0:
327
                            strSQL += string.Format(" AND (A.CONSTRUCTIONSTATUSFLG != {0}", Status1);
328
                            strSQL += string.Format(" AND A.CONSTRUCTIONSTATUSFLG <= {0})", Status2);
329
                            strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG != {0}", Status1);
330
                            strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG <= {0})", Status2);
329 331
                            break;
330 332
                        case 1:
331
                            strSQL += " AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
333
                            strSQL.Append(" AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
332 334
                            break;
333 335
                    }
334 336

  
335 337
                    // ???????I???????????
336
                    strSQL += GetDepartmentString();
338
                    strSQL.Append(GetDepartmentString());
337 339

  
338 340
                    // ?S??????I???????????
339
                    strSQL += GetPersonString();
341
                    strSQL.Append(GetPersonString());
340 342

  
341 343
                    // ?Z?L?????e?B???????
342
                    string wrkBuff = string.Empty;
344
                    StringBuilder wrkBuff = new StringBuilder();
343 345
                    CreateSecuritySQL(ref wrkBuff);
344
                    strSQL += wrkBuff;
346
                    strSQL.Append(wrkBuff.ToString());
345 347
                }
346 348

  
347
                strSQL += ") AS UNI";
349
                strSQL.Append(") AS UNI");
348 350
                // ORDER BY ???
349
                strSQL += " ORDER BY 4 ASC, 10 ASC, 9 ASC, 16 ASC, 15 ASC, 1 DESC";
351
                strSQL.Append(" ORDER BY 4 ASC, 10 ASC, 9 ASC, 16 ASC, 15 ASC, 1 DESC");
350 352

  
351 353
            }
352 354
            catch (Exception ex)
......
361 363
        /// ?????p???????SQL??
362 364
        /// </summary>
363 365
        /// <param name="strSQL"></param>
364
        private void CreateSQL02(ref string strSQL)
366
        private void CreateSQL02(ref StringBuilder strSQL)
365 367
        {
366 368
            try
367 369
            {
368
                strSQL = string.Empty;
369
                strSQL += "SELECT";
370
                strSQL.Append("SELECT");
370 371

  
371
                strSQL += " DISTINCT A.CONSTRUCTIONCODE,";
372
                strSQL += " A.CONSTRUCTIONPERIOD, B.DETAILSTRING, A.CONSTRUCTIONSTATUSFLG,";
373
                strSQL += " C.PERSONCODE, C.PERSONNAME, C.DEPARTMENTCODE, C.DEPARTMENTNAME, C.MANDISPORDER, C.DEPDISPORDER,";
374
                strSQL += " D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER,";
372
                strSQL.Append(" DISTINCT A.CONSTRUCTIONCODE,");
373
                strSQL.Append(" A.CONSTRUCTIONPERIOD, B.DETAILSTRING, A.CONSTRUCTIONSTATUSFLG,");
374
                strSQL.Append(" C.PERSONCODE, C.PERSONNAME, C.DEPARTMENTCODE, C.DEPARTMENTNAME, C.MANDISPORDER, C.DEPDISPORDER,");
375
                strSQL.Append(" D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER,");
375 376

  
376
                strSQL += " E.CONSTRUCTIONCODE";
377
                strSQL.Append(" E.CONSTRUCTIONCODE AS MARCKCODE,");
378
                strSQL.Append(" E.COMPLETEFLG AS COMPLETEFLG");
377 379

  
378
                strSQL += " FROM CONSTRUCTIONBASEINFO A";
380
                strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
379 381

  
380
                strSQL += " LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,";
381
                strSQL += " CB.DEPARTMENTCODE DEPARTMENTCODE, CC.DEPARTMENTSTRING DEPARTMENTNAME,";
382
                strSQL += " CB.DISPLAYORDER MANDISPORDER, CC.DISPLAYORDER DEPDISPORDER";
383
                strSQL += " FROM CONSTRUCTIONBASEINFO CA";
384
                strSQL += " LEFT JOIN PERSONINCHARGEMASTER CB ON CA.SALESPERSONCODE = CB.PERSONCODE";
385
                strSQL += " LEFT JOIN DEPARTMENTMASTER CC ON CB.DEPARTMENTCODE = CC.DEPARTMENTCODE";
386
                strSQL += string.Format(" WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE", numUDConstPro.Value);
382
                strSQL.Append(" LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,");
383
                strSQL.Append(" CB.DEPARTMENTCODE DEPARTMENTCODE, CC.DEPARTMENTSTRING DEPARTMENTNAME,");
384
                strSQL.Append(" CB.DISPLAYORDER MANDISPORDER, CC.DISPLAYORDER DEPDISPORDER");
385
                strSQL.Append(" FROM CONSTRUCTIONBASEINFO CA");
386
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER CB ON CA.SALESPERSONCODE = CB.PERSONCODE");
387
                strSQL.Append(" LEFT JOIN DEPARTMENTMASTER CC ON CB.DEPARTMENTCODE = CC.DEPARTMENTCODE");
388
                strSQL.AppendFormat(" WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE", numUDConstPro.Value);
387 389

  
388
                strSQL += " LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,";
389
                strSQL += " DB.DEPARTMENTCODE DEPARTMENTCODE, DC.DEPARTMENTSTRING DEPARTMENTNAME,";
390
                strSQL += " DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER";
391
                strSQL += " FROM CONSTRUCTIONBASEINFO DA";
392
                strSQL += " LEFT JOIN PERSONINCHARGEMASTER DB ON DA.CONSTRUCTIONPERSONCODE = DB.PERSONCODE";
393
                strSQL += " LEFT JOIN DEPARTMENTMASTER DC ON DB.DEPARTMENTCODE = DC.DEPARTMENTCODE";
394
                strSQL += string.Format(" WHERE DA.CONSTRUCTIONPERIOD = {0}) D ON A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE", numUDConstPro.Value);
395
                strSQL += ", CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONMATERIALINFO E";
390
                strSQL.Append(" LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,");
391
                strSQL.Append(" DB.DEPARTMENTCODE DEPARTMENTCODE, DC.DEPARTMENTSTRING DEPARTMENTNAME,");
392
                strSQL.Append(" DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER");
393
                strSQL.Append(" FROM CONSTRUCTIONBASEINFO DA");
394
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER DB ON DA.CONSTRUCTIONPERSONCODE = DB.PERSONCODE");
395
                strSQL.Append(" LEFT JOIN DEPARTMENTMASTER DC ON DB.DEPARTMENTCODE = DC.DEPARTMENTCODE");
396
                strSQL.AppendFormat(" WHERE DA.CONSTRUCTIONPERIOD = {0}) D ON A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE", numUDConstPro.Value);
397
                strSQL.Append(", CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONMATERIALINFO E");
396 398

  
397
                strSQL += string.Format(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
398
                strSQL += string.Format(" AND A.TYINGFLG != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
399
                strSQL += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
400
                strSQL += string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
399
                strSQL.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
400
                strSQL.AppendFormat(" AND A.TYINGFLG != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
401
                strSQL.Append(" AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
402
                strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
401 403

  
402
                strSQL += " AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
403
                strSQL += " AND E.COMPLETEFLG != 1";
404
                strSQL.Append(" AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
405
                strSQL.Append(" AND E.COMPLETEFLG != 1");
404 406

  
405 407
                // ???????I???????????
406
                strSQL += GetDepartmentString();
408
                strSQL.Append(GetDepartmentString());
407 409

  
408 410
                // ?S??????I???????????
409
                strSQL += GetPersonString();
411
                strSQL.Append(GetPersonString());
410 412

  
411 413
                // ?Z?L?????e?B???????
412
                string wrkBuff = string.Empty;
414
                StringBuilder wrkBuff = new StringBuilder();
413 415
                CreateSecuritySQL(ref wrkBuff);
414
                strSQL += wrkBuff;
416
                strSQL.Append(wrkBuff.ToString());
415 417

  
416 418
                // ORDER BY ???
417
                strSQL += " ORDER BY 4 ASC, 10 ASC, 9 ASC, 16 ASC, 15 ASC, 1 DESC";
419
                strSQL.Append(" ORDER BY 4 ASC, 10 ASC, 9 ASC, 16 ASC, 15 ASC, 1 DESC");
418 420
            }
419 421
            catch (Exception ex)
420 422
            {
......
427 429
        /// <summary>
428 430
        /// ?\???p?f?[?^??SQL??
429 431
        /// </summary>
430
        private void CreateInitSQL(ref string strSQL)
432
        private void CreateInitSQL(ref StringBuilder strSQL)
431 433
        {
432 434
            try
433 435
            {
......
483 485
                    strConstrName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME]);
484 486

  
485 487
                    MarkCode = string.Empty;
486
                    if (CommonMotions.cnvInt(objwrk[(int)GetData.MARKCONSTRCODE]) != 0) MarkCode = "??o?L";
488
                    if (CommonMotions.cnvInt(objwrk[(int)GetData.MARKCONSTRCODE]) != 0
489
                        && CommonMotions.cnvInt(objwrk[(int)GetData.COMPLETEFLG]) == 0)
490
                    {
491
                        MarkCode = "??o?L";
492
                    }
487 493

  
488 494
                    // ?X?e?[?^?X?t???O??????1?s?J????
489 495
                    if (StatusFlg != CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONSTATUSFLG]))
......
611 617
            {
612 618
                foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) wrkCol.SortMode = DataGridViewColumnSortMode.NotSortable;
613 619
                dgvMaster.Rows.Clear();
614
                string strSQL = "";
620
                StringBuilder strSQL = new StringBuilder();
615 621
                // SQL??
616 622
                CreateInitSQL(ref strSQL);
617 623
                ArrayList arData = new ArrayList();
618 624
                // ?H????{????
619
                if (cbiDB.ExecuteReader(strSQL, ref arData))
625
                if (cbiDB.ExecuteReader(strSQL.ToString(), ref arData))
620 626
                {
621 627
                    // ?O???b?h??Z?b?g?????
622 628
                    SetToGridData(arData);
......
957 963
                cmbDepartment.Items.Clear();
958 964
                cmbDepartment.Text = "";
959 965

  
960
                string strSQL = string.Empty;
966
                StringBuilder strSQL = new StringBuilder();
961 967
                // ?????}?X?^??????????
962
                strSQL = "SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*)";
963
                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C";
964
                strSQL += " WHERE A.DELETEFLG = 0";
968
                strSQL.Append("SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*)");
969
                strSQL.Append(" FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C");
970
                strSQL.Append(" WHERE A.DELETEFLG = 0");
965 971

  
966 972
                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
967 973
                {
968 974
                    // ?Q??????}?X?^????????
969
                    strSQL += " AND A.DEPARTMENTCODE IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1";
970
                    strSQL += string.Format(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
975
                    strSQL.Append(" AND A.DEPARTMENTCODE IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1");
976
                    strSQL.AppendFormat(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
971 977
                }
972 978

  
973
                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
974
                strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
975
                strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER";
976
                strSQL += " ORDER BY A.DISPLAYORDER ASC";
979
                strSQL.Append(" AND A.DEPARTMENTCODE = B.DEPARTMENTCODE");
980
                strSQL.Append(" AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE");
981
                strSQL.Append(" GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER");
982
                strSQL.Append(" ORDER BY A.DISPLAYORDER ASC");
977 983

  
978 984
                // ?????}?X?^???
979 985
                ArrayList arList = new ArrayList();
980
                if (!depDB.ExecuteReader(strSQL, ref arList)) return;
986
                if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
981 987

  
982 988
                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
983 989
                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
......
1024 1030
                cmbConstructionPerson.Text = "";
1025 1031

  
1026 1032
                int DepartmentCode = GetDepartmentCode();
1027
                string strSQL = string.Empty;
1033
                StringBuilder strSQL = new StringBuilder();
1028 1034
                // ????????
1029
                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
1030
                strSQL += " AND (DEPARTMENTCODE";
1031
                string strSubSQL = string.Empty;
1035
                strSQL.AppendFormat(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
1036
                strSQL.Append(" AND (DEPARTMENTCODE");
1037
                StringBuilder strSubSQL = new StringBuilder(); ;
1032 1038
                if (DepartmentCode == 0)
1033 1039
                {
1034 1040
                    // ?Q??????}?X?^????????
1035
                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
1041
                    strSubSQL.AppendFormat(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
1036 1042
                                            , CommonMotions.LoginUserData.PersonCode);
1037 1043
                }
1038 1044
                else
1039 1045
                {
1040
                    strSubSQL += string.Format(" = {0}", DepartmentCode);
1046
                    strSubSQL.AppendFormat(" = {0}", DepartmentCode);
1041 1047
                }
1042
                strSQL += strSubSQL + ")";
1048
                strSQL.Append(strSubSQL);
1049
                strSQL.Append(")");
1043 1050

  
1044 1051
                // ??????????E??????????
1045 1052
                DateTime dtDefaultStart = DateTime.MinValue;
1046 1053
                DateTime dtDefaultEnd = DateTime.MinValue;
1047 1054
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
1048 1055

  
1049
                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
1050
                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
1051
                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
1056
                strSQL.AppendFormat(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
1057
                strSQL.AppendFormat(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
1058
                strSQL.AppendFormat(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
1052 1059

  
1053
                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
1060
                strSQL.Append(" Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC");
1054 1061
                // ?S????}?X?^???
1055
                if (!picDB.SelectAction(strSQL, ref workList)) return;
1062
                if (!picDB.SelectAction(strSQL.ToString(), ref workList)) return;
1056 1063

  
1057 1064
                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
1058 1065
                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/ProcessControl.cs
109 109
                            handle = ProcessExecute_ConstructionBudget;
110 110
                            break;
111 111
                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:工事案件コピー機能
112
                            if (m_EditLock) continue;
113 112
                            handle = ProcessExecute_ConstructionCopyList;
114 113
                            break;
115 114
                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:注文書入力
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseStatusInput/FrmPurchaseStatusInputAuxiliary.cs
196 196
            finally
197 197
            {
198 198
                DetailDB.close(); DetailDB = null;
199
                PersonDB.close(); PersonDB = null;
199 200
            }
200 201
        }
201 202
        #endregion
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqBillingStatInput/FrmBillingStatInput.cs
34 34
        private enum DispColumn
35 35
        {
36 36
            No = 0,
37
            SeqNo,
38
            CompanyCode,
39
            CompanyName,
40
            OrderPrice,
41
            PrintOutDate,
42
            MailingDate,
43
            ReturnDate,
44
            ReturnCheckDate,
45
            DataChangeFlg,
37
            RequestNo,
38
            ConstrName,
39
            ReqestValue,
40
            ApprovalDate,
41
            ConstrCode,
46 42
        }
47 43

  
48 44
        #endregion
......
63 59

  
64 60
        #endregion
65 61

  
66
        #region ?Y???H????{???
62
        #region ?????????
67 63
        /// <summary>
68
        /// ?Y???H????{???
64
        /// ?????????
69 65
        /// </summary>
70
        private ConstructionBaseInfo m_ConstructionBaseInfo = new ConstructionBaseInfo();
66
        private int m_InvoiceNo = 0;
71 67
        #endregion
72 68

  
73
        #region ?H???R?[?h
74
        /// <summary>
75
        /// ?H???R?[?h
76
        /// </summary>
77
        private int m_ConstructionCode = 0;
78
        #endregion
79

  
80 69
        #region ??t???
81 70
        /// <summary>
82 71
        /// ??t???
......
88 77

  
89 78
        #region ?v???p?e?B
90 79
        /// <summary>
91
        /// ?H???R?[?h
80
        /// ?????????
92 81
        /// </summary>
93
        public int ConstructionCode
82
        public int InvoiceNo
94 83
        {
95
            get { return m_ConstructionCode; }
96
            set { m_ConstructionCode = value; }
84
            get { return m_InvoiceNo; }
85
            set { m_InvoiceNo = value; }
97 86
        }
87

  
98 88
        /// <summary>
99 89
        /// ??t???
100 90
        /// </summary>
......
103 93
            get { return m_OrderNo; }
104 94
            set { m_OrderNo = value; }
105 95
        }
96

  
106 97
        #endregion
107 98

  
108 99
        #region ?R???X?g???N?^
......
156 147
        /// <param name="e"></param>
157 148
        private void btnDataEntry_Click(object sender, EventArgs e)
158 149
        {
159
            //?f?[?^?`?F?b?N
160
            if (!DispFeildCheck()) return;
161

  
162 150
            // ?f?[?^?o?^
163 151
            if (!DataEntryProcess()) return;
164 152

  
......
191 179
        /// <param name="e"></param>
192 180
        private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
193 181
        {
194
            // ?H??????
195
            if (!GetBaseInfoData())
196
            {
197
                MessageBox.Show("?H????{????????????", "?G???[?\??", MessageBoxButtons.OK, MessageBoxIcon.Error);
198
                this.Close();
199
                return;
200
            }
201

  
202 182
            // ???????
203 183
            InitSettingLoad();
204 184

  
205 185
            // ?????\??
206 186
            InitDataLoad();
187

  
188
            m_DataChangeFlg = false;
207 189
        }
208 190
        #endregion
209 191

  
......
255 237
        }
256 238
        #endregion
257 239

  
258
        #region ?Z???l???X
240
        #region ?X???????????
259 241
        /// <summary>
260
        /// ?Z???l???X
242
        /// ?X???????????
261 243
        /// </summary>
262 244
        /// <param name="sender"></param>
263 245
        /// <param name="e"></param>
264
        private void dgvMaster_CellValueChanged(object sender, DataGridViewCellEventArgs e)
246
        private void textBox1_Validated(object sender, EventArgs e)
265 247
        {
266
            try
267
            {
268
                // ??X?t???OON
269
                m_DataChangeFlg = true;
270
                
271
                // ??X?t???OON
272
                DataGridView dgv = (DataGridView)sender;
273
                DataGridViewRow dgvRow = dgv.CurrentRow;
274
                DataGridViewCell dgvCell = dgv.CurrentCell;
248
            // ?I??????`?F?b?N?????
249
            if (ActiveControl == btnEnd) return;
275 250

  
276
                dgvRow.Cells[(int)DispColumn.DataChangeFlg].Value = 1;
277
                
278
                // ???t??W
279
                txtInputDate_TextChanged(dgvCell);
280
            }
281
            catch (Exception ex)
282
            {
283
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
284
            }
251
            txtInputDate_TextChanged((Control)sender);
285 252
        }
286 253
        #endregion
287 254
    }
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqBillingStatInput/FrmBillingStatInput.designer.cs
30 30
        {
31 31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32 32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
34 34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
35 35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
36 36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
37 37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
41 38
            this.btnEnd = new System.Windows.Forms.Button();
42 39
            this.label1 = new System.Windows.Forms.Label();
43 40
            this.groupBox1 = new System.Windows.Forms.GroupBox();
41
            this.textBox1 = new System.Windows.Forms.TextBox();
42
            this.label7 = new System.Windows.Forms.Label();
44 43
            this.label2 = new System.Windows.Forms.Label();
45 44
            this.lblLabel03 = new System.Windows.Forms.Label();
46 45
            this.label5 = new System.Windows.Forms.Label();
47
            this.lblLabel05 = new System.Windows.Forms.Label();
46
            this.lblLabel04 = new System.Windows.Forms.Label();
48 47
            this.label4 = new System.Windows.Forms.Label();
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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