リビジョン 172
GroupBoxExクラスバグ修正
マジックナンバー修正(一部)
branches/src/ProcessManagement/ProcessManagement/Forms/CustomControls/GroupBoxEx.cs | ||
---|---|---|
53 | 53 |
Size tTextSize = TextRenderer.MeasureText(this.Text, this.Font); |
54 | 54 |
|
55 | 55 |
// グループボックスの領域を取得 |
56 |
Rectangle tBorderRect = e.ClipRectangle; |
|
56 |
// e.ClipRectangleは再描画しなければいけない部分を示します。 |
|
57 |
// 正しくはGroupBox自体の大きさを基準にして処理する必要があります。 |
|
58 |
Rectangle tBorderRect = new Rectangle(0, 0, this.Width, this.Height); |
|
57 | 59 |
|
58 | 60 |
// テキストを考慮(グループボックス枠線がテキスト(高さ)の真ん中に来るように)して枠を描画 |
59 | 61 |
tBorderRect.Y += tTextSize.Height / 2; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs | ||
---|---|---|
667 | 667 |
sql += " FROM"; |
668 | 668 |
sql += " ConstructionLink Link"; |
669 | 669 |
sql += " INNER JOIN RequestHead ReqHead ON Link.FluctuationCode = ReqHead.ReqConstructionCode"; |
670 |
sql += string.Format(" WHERE Link.ConstructionCode = {0} AND Link.LinkType = 1", m_ConstructionCode); |
|
670 |
sql += string.Format(" WHERE Link.ConstructionCode = {0} AND Link.LinkType = {1}", |
|
671 |
m_ConstructionCode, |
|
672 |
(int)CommonDefine.LinkDataType.JoinType); |
|
671 | 673 |
|
672 | 674 |
ArrayList ar = new ArrayList(); |
673 | 675 |
|
... | ... | |
695 | 697 |
sql += " FROM"; |
696 | 698 |
sql += " ConstructionLink Link"; |
697 | 699 |
sql += " INNER JOIN RequestHead ReqHead ON Link.ConstructionCode = ReqHead.ReqConstructionCode"; |
698 |
sql += string.Format(" WHERE Link.FluctuationCode = {0} AND Link.LinkType = 1", m_ConstructionCode); |
|
700 |
sql += string.Format(" WHERE Link.FluctuationCode = {0} AND Link.LinkType = {1}", |
|
701 |
m_ConstructionCode, |
|
702 |
(int)CommonDefine.LinkDataType.JoinType); |
|
699 | 703 |
|
700 | 704 |
ArrayList ar = new ArrayList(); |
701 | 705 |
|
... | ... | |
1099 | 1103 |
else |
1100 | 1104 |
{ |
1101 | 1105 |
// リンク種別が結合子の工事で検索 |
1102 |
GetConstructionLink(m_ConstructionCode, 1, ref lstMainConstructionCode);
|
|
1106 |
GetConstructionLink(m_ConstructionCode, (int)CommonDefine.LinkDataType.JoinType, ref lstMainConstructionCode);
|
|
1103 | 1107 |
} |
1104 | 1108 |
|
1105 | 1109 |
List<RequestData> lstDataWork = new List<RequestData>(); |
... | ... | |
1161 | 1165 |
Dictionary<int, RequestDataDetail> dicDetailWork = new Dictionary<int, RequestDataDetail>(); |
1162 | 1166 |
|
1163 | 1167 |
List<int> lstConstructionCode = new List<int>(); |
1164 |
GetConstructionLink(nMainConstructonCode, 0, ref lstConstructionCode);
|
|
1168 |
GetConstructionLink(nMainConstructonCode, (int)CommonDefine.LinkDataType.FluctuationType, ref lstConstructionCode);
|
|
1165 | 1169 |
|
1166 | 1170 |
if (bNewMainConstruction == false) |
1167 | 1171 |
{ |
... | ... | |
1358 | 1362 |
Dictionary<int, RequestData> dicData = new Dictionary<int, RequestData>(); |
1359 | 1363 |
|
1360 | 1364 |
// 結合フラグが結合(親)以外の場合 |
1361 |
if (m_BaseConstructionBaseInfo.JoinFlg != 1)
|
|
1365 |
if (m_BaseConstructionBaseInfo.JoinFlg != (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
|
|
1362 | 1366 |
{ |
1363 | 1367 |
// 単独、結合(子)は、請求工事=本工事 |
1364 | 1368 |
lstConstructionCode.Add(m_ConstructionCode); |
... | ... | |
1367 | 1371 |
else |
1368 | 1372 |
{ |
1369 | 1373 |
// リンク種別が結合子の工事で検索 |
1370 |
GetConstructionLink(m_ConstructionCode, 1, ref lstConstructionCode);
|
|
1374 |
GetConstructionLink(m_ConstructionCode, (int)CommonDefine.LinkDataType.JoinType, ref lstConstructionCode);
|
|
1371 | 1375 |
} |
1372 | 1376 |
|
1373 | 1377 |
foreach (int nConstructionCode in lstConstructionCode) |
... | ... | |
1430 | 1434 |
lstDetail.Add(data); |
1431 | 1435 |
|
1432 | 1436 |
// 増減工事の取得 |
1433 |
GetConstructionLink(nMainConstructionCode, 0, ref lstWork);
|
|
1437 |
GetConstructionLink(nMainConstructionCode, (int)CommonDefine.LinkDataType.FluctuationType, ref lstWork);
|
|
1434 | 1438 |
|
1435 | 1439 |
foreach (int nConstructionCode in lstWork) |
1436 | 1440 |
{ |
他の形式にエクスポート: Unified diff