リビジョン 460
承認処理：承認後の非承認・保留対応
工事詳細台帳：一般管理費表示位置バグ修正・データ表示SQL注文書データ取得バグ修正・人件費振分バグ修正
工事検索サブウィンドウ：全年度対応
積算見積入力：中項目行入力フラグをマスタ無時に既存データより判定する様に変更
メニュー：掲示板データ絞り込みコンボボックス文字修正・非受注工事／完了工事検索、全年度対象追加
| trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsCommonApproval.cs | ||
|---|---|---|
| 631 | 631 |
if (DataRec.SeqNo == s_PrimartyRecord) continue; |
| 632 | 632 |
|
| 633 | 633 |
// 承認以外は対象にしない |
| 634 |
if (DataRec.ApprovalStatus != (int)CommonDefine.ApprovalStatus.Approval) continue; |
|
| 634 |
//if (DataRec.ApprovalStatus != (int)CommonDefine.ApprovalStatus.Approval) continue;
|
|
| 635 | 635 |
|
| 636 | 636 |
foreach (ApprovalMaster MasterRec in MasterList) |
| 637 | 637 |
{
|
| ... | ... | |
| 645 | 645 |
if (MasterRec.ApprovalAuthority == (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval) |
| 646 | 646 |
{
|
| 647 | 647 |
// 最終承認済みは処理しない |
| 648 |
if (RequestData.ApprovalStatus == (int)CommonDefine.ApprovalStatus.Approval) break; |
|
| 648 |
//if (RequestData.ApprovalStatus == (int)CommonDefine.ApprovalStatus.Approval) break;
|
|
| 649 | 649 |
|
| 650 | 650 |
bApproval = true; |
| 651 | 651 |
break; |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
|---|---|---|
| 316 | 316 |
// 工事情報取得 |
| 317 | 317 |
if (!SetBaseInfoData()) return false; |
| 318 | 318 |
|
| 319 |
// 現在申請データ取得 |
|
| 320 |
if (!SetFirstApprovalData(statusCode)) return false; |
|
| 321 |
|
|
| 319 | 322 |
ProcessApproval Rec = new ProcessApproval(); |
| 320 | 323 |
|
| 321 | 324 |
// 承認レコードの作成 |
| ... | ... | |
| 359 | 362 |
} |
| 360 | 363 |
|
| 361 | 364 |
// ----- 申請レコード更新 |
| 362 |
// 承認以外は以下を処理しない |
|
| 363 |
if (statusCode != (int)CommonDefine.ApprovalStatus.Approval) return true; |
|
| 365 |
// 申請中は承認以外は以下を処理しない |
|
| 366 |
if (m_PettionData.ApprovalStatus == (int)CommonDefine.ApprovalStatus.Petition) |
|
| 367 |
{
|
|
| 368 |
if (statusCode != (int)CommonDefine.ApprovalStatus.Approval) return true; |
|
| 369 |
} |
|
| 364 | 370 |
|
| 365 | 371 |
// ----- 承認 |
| 366 | 372 |
// 案件に対して最終承認がされているかを確認する |
| ... | ... | |
| 712 | 718 |
} |
| 713 | 719 |
#endregion |
| 714 | 720 |
|
| 721 |
#region 現在申請データ取得 |
|
| 722 |
/// <summary> |
|
| 723 |
/// 現在申請データ取得 |
|
| 724 |
/// </summary> |
|
| 725 |
/// <returns></returns> |
|
| 726 |
private bool SetFirstApprovalData(int statusCode) |
|
| 727 |
{
|
|
| 728 |
IOProcessApproval AppDB = new IOProcessApproval(); |
|
| 729 |
try |
|
| 730 |
{
|
|
| 731 |
// 申請時は取得しない |
|
| 732 |
if (statusCode == (int)CommonDefine.ApprovalStatus.Petition) |
|
| 733 |
{
|
|
| 734 |
m_PettionData.ApprovalStatus = (int)(int)CommonDefine.ApprovalStatus.Petition; |
|
| 735 |
return true; |
|
| 736 |
} |
|
| 737 |
|
|
| 738 |
StringBuilder strSQL = new StringBuilder(); |
|
| 739 |
strSQL.Append(AppDB.CreatePrimarykeyString(m_ConstructionCode, |
|
| 740 |
m_ApprovalCode, |
|
| 741 |
m_OrderNo, |
|
| 742 |
1)); |
|
| 743 |
|
|
| 744 |
if (!AppDB.SelectAction(strSQL.ToString(), ref m_PettionData)) return false; |
|
| 745 |
|
|
| 746 |
|
|
| 747 |
return true; |
|
| 748 |
} |
|
| 749 |
catch (Exception ex) |
|
| 750 |
{
|
|
| 751 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 752 |
return false; |
|
| 753 |
} |
|
| 754 |
finally |
|
| 755 |
{
|
|
| 756 |
AppDB.close(); AppDB = null; |
|
| 757 |
} |
|
| 758 |
} |
|
| 759 |
#endregion |
|
| 760 |
|
|
| 715 | 761 |
#region ヘッダー情報表示 |
| 716 | 762 |
/// <summary> |
| 717 | 763 |
/// ヘッダー情報表示 |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
|---|---|---|
| 1990 | 1990 |
} |
| 1991 | 1991 |
|
| 1992 | 1992 |
int nSetRow = m_CostsRowCount[(int)CostsRowLine.ExpensesRowLine] - 1; |
| 1993 |
if (nSetRow < 0) nSetRow = 0; ;
|
|
| 1993 |
if (nSetRow < 0) nSetRow = 0; |
|
| 1994 | 1994 |
dgvAllDisplay.Rows[nSetRow].Cells[(int)GridColumn.EstimatePrice].Value = nRetVal.ToString("#,#");
|
| 1995 | 1995 |
dgvAllDisplay.Rows[nSetRow].Cells[(int)GridColumn.EstimatePrice].ToolTipText = "一 般 管 理 費"; |
| 1996 | 1996 |
} |
| ... | ... | |
| 3553 | 3553 |
strcmd.Append(" ON Odr.ConstructionCode = A.SourceCode");
|
| 3554 | 3554 |
strcmd.Append(" And Odr.SourceCode = A.ConstructionCode");
|
| 3555 | 3555 |
strcmd.Append(" And Odr.SourceDetailCnt = A.DetailCount");
|
| 3556 |
strcmd.AppendFormat(" And Odr.GroupCount = {0}", (int)PurchaseOrderDetail.GroupCountDef.Detail);
|
|
| 3556 | 3557 |
|
| 3557 | 3558 |
strcmd.Append(" LEFT JOIN PurchaseOrderDetail As Odr2");
|
| 3558 | 3559 |
strcmd.Append(" ON Odr2.ConstructionCode = Odr.ConstructionCode");
|
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSerarch/FrmConstrSerarch.Designer.cs | ||
|---|---|---|
| 41 | 41 |
this.cmbEstiDate = new System.Windows.Forms.ComboBox(); |
| 42 | 42 |
this.textBox1 = new System.Windows.Forms.TextBox(); |
| 43 | 43 |
this.textBox2 = new System.Windows.Forms.TextBox(); |
| 44 |
this.checkBox1 = new System.Windows.Forms.CheckBox(); |
|
| 44 | 45 |
((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit(); |
| 45 | 46 |
this.SuspendLayout(); |
| 46 | 47 |
// |
| ... | ... | |
| 202 | 203 |
this.textBox2.Size = new System.Drawing.Size(480, 23); |
| 203 | 204 |
this.textBox2.TabIndex = 3; |
| 204 | 205 |
// |
| 206 |
// checkBox1 |
|
| 207 |
// |
|
| 208 |
this.checkBox1.BackColor = System.Drawing.Color.Transparent; |
|
| 209 |
this.checkBox1.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 210 |
this.checkBox1.ForeColor = System.Drawing.Color.White; |
|
| 211 |
this.checkBox1.Location = new System.Drawing.Point(412, 45); |
|
| 212 |
this.checkBox1.Name = "checkBox1"; |
|
| 213 |
this.checkBox1.Size = new System.Drawing.Size(200, 32); |
|
| 214 |
this.checkBox1.TabIndex = 51; |
|
| 215 |
this.checkBox1.Text = "全データ対象検索"; |
|
| 216 |
this.checkBox1.UseVisualStyleBackColor = false; |
|
| 217 |
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); |
|
| 218 |
// |
|
| 205 | 219 |
// FrmConstrSerarch |
| 206 | 220 |
// |
| 207 | 221 |
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 16F); |
| ... | ... | |
| 209 | 223 |
this.BackColor = System.Drawing.Color.Black; |
| 210 | 224 |
this.CancelButton = this.btnEnd; |
| 211 | 225 |
this.ClientSize = new System.Drawing.Size(618, 211); |
| 226 |
this.Controls.Add(this.checkBox1); |
|
| 212 | 227 |
this.Controls.Add(this.textBox2); |
| 213 | 228 |
this.Controls.Add(this.textBox1); |
| 214 | 229 |
this.Controls.Add(this.cmbEstiDate); |
| ... | ... | |
| 256 | 271 |
private System.Windows.Forms.ComboBox cmbEstiDate; |
| 257 | 272 |
private System.Windows.Forms.TextBox textBox1; |
| 258 | 273 |
private System.Windows.Forms.TextBox textBox2; |
| 274 |
private System.Windows.Forms.CheckBox checkBox1; |
|
| 259 | 275 |
} |
| 260 | 276 |
} |
| 261 | 277 |
|
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSerarch/FrmConstrSerarch.cs | ||
|---|---|---|
| 47 | 47 |
private Point m_InitPoint = new Point(); |
| 48 | 48 |
#endregion |
| 49 | 49 |
|
| 50 |
#region 全データ対象 |
|
| 51 |
/// <summary> |
|
| 52 |
/// 全データ対象 |
|
| 53 |
/// </summary> |
|
| 54 |
private bool m_AllData = false; |
|
| 55 |
#endregion |
|
| 56 |
|
|
| 50 | 57 |
#region 営業期の表示制御 |
| 51 | 58 |
/// <summary> |
| 52 | 59 |
/// 営業期の表示制御 |
| ... | ... | |
| 129 | 136 |
} |
| 130 | 137 |
#endregion |
| 131 | 138 |
|
| 139 |
#region 全データ対象 |
|
| 140 |
/// <summary> |
|
| 141 |
/// 全データ対象 |
|
| 142 |
/// </summary> |
|
| 143 |
public bool AllData |
|
| 144 |
{
|
|
| 145 |
get { return m_AllData; }
|
|
| 146 |
set { m_AllData = value; }
|
|
| 147 |
} |
|
| 148 |
#endregion |
|
| 149 |
|
|
| 132 | 150 |
#region 営業期の表示制御 |
| 133 | 151 |
/// <summary> |
| 134 | 152 |
/// 営業期の表示制御 |
| ... | ... | |
| 347 | 365 |
/// <param name="e"></param> |
| 348 | 366 |
private void btnExec_Click(object sender, EventArgs e) |
| 349 | 367 |
{
|
| 368 |
// 全データ選択 |
|
| 369 |
m_AllData = CommonMotions.cnvBool(checkBox1.Checked); |
|
| 350 | 370 |
// 営業期 |
| 351 | 371 |
m_Period = (int)numUDConstPro.Value; |
| 352 | 372 |
// 見積年月 |
| ... | ... | |
| 375 | 395 |
numUDConstPro.ValueChanged += new System.EventHandler(numUDConstPro_ValueChanged); |
| 376 | 396 |
} |
| 377 | 397 |
#endregion |
| 398 |
|
|
| 399 |
#region 全年度対象検索チェック |
|
| 400 |
/// <summary> |
|
| 401 |
/// 全年度対象検索チェック |
|
| 402 |
/// </summary> |
|
| 403 |
/// <param name="sender"></param> |
|
| 404 |
/// <param name="e"></param> |
|
| 405 |
private void checkBox1_CheckedChanged(object sender, EventArgs e) |
|
| 406 |
{
|
|
| 407 |
bool bVisDisp = true; |
|
| 408 |
if (checkBox1.Checked) bVisDisp = false; |
|
| 409 |
|
|
| 410 |
label4.Visible = bVisDisp; |
|
| 411 |
label8.Visible = bVisDisp; |
|
| 412 |
numUDConstPro.Visible = bVisDisp; |
|
| 413 |
label7.Visible = bVisDisp; |
|
| 414 |
|
|
| 415 |
label2.Visible = bVisDisp; |
|
| 416 |
cmbEstiDate.Visible = bVisDisp; |
|
| 417 |
|
|
| 418 |
if (bVisDisp) CommonMotions.SetSerchTitle(label4, label8, numUDConstPro, label7); |
|
| 419 |
} |
|
| 420 |
#endregion |
|
| 378 | 421 |
} |
| 379 | 422 |
} |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSerarch/FrmConstrSerarchAux.cs | ||
|---|---|---|
| 59 | 59 |
label8.Visible = false; |
| 60 | 60 |
numUDConstPro.Visible = false; |
| 61 | 61 |
|
| 62 |
checkBox1.Visible = false; |
|
| 63 |
|
|
| 62 | 64 |
return false; |
| 63 | 65 |
} |
| 64 | 66 |
catch (Exception ex) |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs | ||
|---|---|---|
| 4839 | 4839 |
SmallRec.UpdateDate = CommonMotions.cnvDate(objRec[(int)IOEstimateDataDetail.TableColumn.UpdateDate]); // 更新日付 |
| 4840 | 4840 |
SmallList.Add(SmallRec); |
| 4841 | 4841 |
|
| 4842 |
// 構成データセット
|
|
| 4842 |
// 中項目データセット
|
|
| 4843 | 4843 |
ConstructionItemMaster MciRec = new ConstructionItemMaster(); |
| 4844 | 4844 |
MciRec.ItemCode = CommonMotions.cnvInt(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.ItemCode]); // 工種キー |
| 4845 | 4845 |
MciRec.DisplayOrder = CommonMotions.cnvInt(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.DisplayOrder]); // 表示順 |
| 4846 |
MciRec.ItemName = CommonMotions.cnvString(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.ItemName]); // 名称 |
|
| 4847 |
MciRec.SubitemsFlg = CommonMotions.cnvInt(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.SubitemsFlg]); // 下位項目フラグ |
|
| 4846 |
MciRec.ItemName = CommonMotions.cnvString(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.ItemName]); // 名称 |
|
| 4847 |
// 下位項目フラグデータ存在のチェック |
|
| 4848 |
if (SmallRec.PageCount == 3) { Debug.WriteLine(""); }
|
|
| 4849 |
object wrkObj = objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.SubitemsFlg]; |
|
| 4850 |
if (CommonMotions.cnvString(wrkObj).Length < 1) |
|
| 4851 |
{
|
|
| 4852 |
MciRec.SubitemsFlg = SmallRec.InputFlg == (int)CommonDefine.DirectInput.Input |
|
| 4853 |
? (int)ConstructionItemMaster.SubitemsFlgDef.None : (int)ConstructionItemMaster.SubitemsFlgDef.Exists; |
|
| 4854 |
} |
|
| 4855 |
else |
|
| 4856 |
{
|
|
| 4857 |
MciRec.SubitemsFlg = CommonMotions.cnvInt(wrkObj); |
|
| 4858 |
} |
|
| 4859 |
|
|
| 4848 | 4860 |
MciRec.MyExpensesFlg = CommonMotions.cnvInt(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.MyExpensesFlg]); // 自社経費フラグ |
| 4849 | 4861 |
MciRec.DeleteFlg = CommonMotions.cnvInt(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.DeleteFlg]); // 削除フラグ |
| 4850 | 4862 |
MciRec.EntryDate = CommonMotions.cnvDate(objRec[EstimateCnt + (int)IOMConstructionItem.NameColumn.EntryDate]); // 登録日付 |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
|---|---|---|
| 322 | 322 |
{(int)MessageBoardData.LinkTypeDef.ConstructionInfo," 部署引継・担当者選任" },
|
| 323 | 323 |
{(int)MessageBoardData.LinkTypeDef.MaterialInfo," 資 材 管 理" },
|
| 324 | 324 |
{(int)MessageBoardData.LinkTypeDef.ProcessApproval," 工 事 承 認" },
|
| 325 |
{(int)MessageBoardData.LinkTypeDef.PaymentEntry," 入 金 確認" } };
|
|
| 325 |
{(int)MessageBoardData.LinkTypeDef.PaymentEntry," 入 金 確 認" } };
|
|
| 326 | 326 |
#endregion |
| 327 | 327 |
|
| 328 | 328 |
#region 行動予定グリッドセル定義 |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
|---|---|---|
| 5197 | 5197 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 5198 | 5198 |
|
| 5199 | 5199 |
dgv.SuspendLayout(); |
| 5200 |
// 工事委検索全データ対象無 |
|
| 5201 |
if (!m_AllData) |
|
| 5202 |
{
|
|
| 5200 | 5203 |
// 工事検索時は検索画面の値をセットする |
| 5201 |
if (m_bConstrSearchFlg) |
|
| 5202 |
{
|
|
| 5203 |
numUDNonOrder.ValueChanged -= new EventHandler(numUDNonOrder_ValueChanged); |
|
| 5204 |
numUDNonOrder.Value = m_Period; |
|
| 5205 |
numUDNonOrder.ValueChanged += new EventHandler(numUDNonOrder_ValueChanged); |
|
| 5204 |
if (m_bConstrSearchFlg) |
|
| 5205 |
{
|
|
| 5206 |
numUDNonOrder.ValueChanged -= new EventHandler(numUDNonOrder_ValueChanged); |
|
| 5207 |
numUDNonOrder.Value = m_Period; |
|
| 5208 |
numUDNonOrder.ValueChanged += new EventHandler(numUDNonOrder_ValueChanged); |
|
| 5209 |
} |
|
| 5206 | 5210 |
} |
| 5207 | 5211 |
|
| 5208 | 5212 |
dgv.Rows.Clear(); |
| ... | ... | |
| 5335 | 5339 |
} |
| 5336 | 5340 |
finally |
| 5337 | 5341 |
{
|
| 5342 |
m_AllData = false; |
|
| 5338 | 5343 |
// 読込時データカウント取得 |
| 5339 | 5344 |
if (CommonDefine.s_MaxInitLineCount > dgv.RowCount) |
| 5340 | 5345 |
dgv.RowCount += (CommonDefine.s_MaxInitLineCount - dgv.RowCount); |
| ... | ... | |
| 5370 | 5375 |
//strSQL += CreateListSQLFluctuation(); |
| 5371 | 5376 |
strSQL.Append(" WHERE (");
|
| 5372 | 5377 |
strSQL.Append(CreateListSQL(stat)); |
| 5373 |
if (CommonMotions.BasePeriodYear()) |
|
| 5378 |
// 工事委検索全データ対象無 |
|
| 5379 |
if (!m_AllData) |
|
| 5374 | 5380 |
{
|
| 5375 |
strSQL.AppendFormat(" And CONSTRUCTIONPERIOD = {0}", numUDNonOrder.Value);
|
|
| 5381 |
if (CommonMotions.BasePeriodYear()) |
|
| 5382 |
{
|
|
| 5383 |
strSQL.AppendFormat(" And CONSTRUCTIONPERIOD = {0}", numUDNonOrder.Value);
|
|
| 5384 |
} |
|
| 5385 |
else |
|
| 5386 |
{
|
|
| 5387 |
strSQL.AppendFormat(" And ConstructionYear = {0}", numUDNonOrder.Value);
|
|
| 5388 |
} |
|
| 5376 | 5389 |
} |
| 5377 |
else |
|
| 5378 |
{
|
|
| 5379 |
strSQL.AppendFormat(" And ConstructionYear = {0}", numUDNonOrder.Value);
|
|
| 5380 |
} |
|
| 5381 |
|
|
| 5382 | 5390 |
return strSQL.ToString(); |
| 5383 | 5391 |
} |
| 5384 | 5392 |
catch (Exception ex) |
| ... | ... | |
| 5419 | 5427 |
DataGridViewEX dgv = dgvCompletionOfConstruction; |
| 5420 | 5428 |
try |
| 5421 | 5429 |
{
|
| 5422 |
// 工事検索時は検索画面の値をセットする
|
|
| 5423 |
if (m_bConstrSearchFlg)
|
|
| 5430 |
// 工事委検索全データ対象無
|
|
| 5431 |
if (!m_AllData)
|
|
| 5424 | 5432 |
{
|
| 5425 |
numUDCompletion.ValueChanged -= new EventHandler(numUDCompletion_ValueChanged); |
|
| 5426 |
numUDCompletion.Value = m_Period; |
|
| 5427 |
numUDCompletion.ValueChanged += new EventHandler(numUDCompletion_ValueChanged); |
|
| 5433 |
// 工事検索時は検索画面の値をセットする |
|
| 5434 |
if (m_bConstrSearchFlg) |
|
| 5435 |
{
|
|
| 5436 |
numUDCompletion.ValueChanged -= new EventHandler(numUDCompletion_ValueChanged); |
|
| 5437 |
numUDCompletion.Value = m_Period; |
|
| 5438 |
numUDCompletion.ValueChanged += new EventHandler(numUDCompletion_ValueChanged); |
|
| 5439 |
|
|
| 5440 |
} |
|
| 5428 | 5441 |
} |
| 5429 | 5442 |
|
| 5430 | 5443 |
dgv.Rows.Clear(); |
| ... | ... | |
| 5550 | 5563 |
} |
| 5551 | 5564 |
finally |
| 5552 | 5565 |
{
|
| 5566 |
m_AllData = false; |
|
| 5567 |
|
|
| 5553 | 5568 |
// 読込時データカウント取得 |
| 5554 | 5569 |
if (CommonDefine.s_MaxInitLineCount > dgv.RowCount) |
| 5555 | 5570 |
dgv.RowCount += (CommonDefine.s_MaxInitLineCount - dgv.RowCount); |
| ... | ... | |
| 5722 | 5737 |
strSQL.Append(CreateListSQL(stat, false, strArias)); |
| 5723 | 5738 |
|
| 5724 | 5739 |
//strSQL += string.Format(" And TO_DATE('{0}', 'yyyy/dd/mm') <= ConstructionCompletionDate", StartDate.ToShortDateString());
|
| 5725 |
if (CommonMotions.BasePeriodYear()) |
|
| 5726 |
strSQL.AppendFormat(" And A.CONSTRUCTIONPERIOD = {0}", numUDCompletion.Value);
|
|
| 5727 |
else |
|
| 5728 |
strSQL.AppendFormat(" And A.ConstructionYear = {0}", numUDCompletion.Value);
|
|
| 5740 |
// 工事委検索全データ対象無 |
|
| 5741 |
if (!m_AllData) |
|
| 5742 |
{
|
|
| 5743 |
if (CommonMotions.BasePeriodYear()) |
|
| 5744 |
strSQL.AppendFormat(" And A.CONSTRUCTIONPERIOD = {0}", numUDCompletion.Value);
|
|
| 5745 |
else |
|
| 5746 |
strSQL.AppendFormat(" And A.ConstructionYear = {0}", numUDCompletion.Value);
|
|
| 5747 |
} |
|
| 5729 | 5748 |
|
| 5730 | 5749 |
return strSQL.ToString(); |
| 5731 | 5750 |
} |
| ... | ... | |
| 8302 | 8321 |
#endregion |
| 8303 | 8322 |
|
| 8304 | 8323 |
#region 工事検索 |
| 8324 |
#region 全データ対象 |
|
| 8325 |
/// <summary> |
|
| 8326 |
/// 全データ対象 |
|
| 8327 |
/// </summary> |
|
| 8328 |
private bool m_AllData = false; |
|
| 8329 |
#endregion |
|
| 8305 | 8330 |
#region 営業期 |
| 8306 | 8331 |
/// <summary> |
| 8307 | 8332 |
/// 工事検索営業期 |
| ... | ... | |
| 8397 | 8422 |
// 終了状態確認 |
| 8398 | 8423 |
if (frm.EndStatus == DialogResult.Cancel) return; |
| 8399 | 8424 |
|
| 8425 |
// 全データ対象 |
|
| 8426 |
m_AllData = frm.AllData; |
|
| 8400 | 8427 |
// 営業期 |
| 8401 | 8428 |
m_Period = frm.Period; |
| 8402 | 8429 |
// 見積年月 |
他の形式にエクスポート: Unified diff