リビジョン 254
注文書データ申請時対象データ確認機能バグ修正
不要IOクラス削除
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 65;
|
|
| 17 |
public static int s_SystemVersion = 66;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
|---|---|---|
| 1190 | 1190 |
frm.ConstructionCode = CurrentPara.IntExecParameter[0]; |
| 1191 | 1191 |
if (CurrentPara.IntExecParameter.Count > 1) frm.OrderNo = CurrentPara.IntExecParameter[2]; |
| 1192 | 1192 |
|
| 1193 |
if (CurrentPara.ArrayParameter.Count > 0) |
|
| 1194 |
{
|
|
| 1195 |
ArrayList wrkArry = CurrentPara.ArrayParameter[0]; |
|
| 1196 |
frm.DetailList.Clear(); |
|
| 1197 |
foreach (object[] objCur in wrkArry) |
|
| 1198 |
{
|
|
| 1199 |
frm.DetailList.Add(objCur); |
|
| 1200 |
} |
|
| 1201 |
} |
|
| 1202 |
|
|
| 1193 | 1203 |
// 直接表示フラグのセット |
| 1194 | 1204 |
if (CurrentPara.BoolExecParameter.Count > 0) |
| 1195 | 1205 |
{
|
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPointingOutComment.cs | ||
|---|---|---|
| 1 |
using System; |
|
| 2 |
using System.Collections.Generic; |
|
| 3 |
using System.Linq; |
|
| 4 |
using System.Text; |
|
| 5 |
using System.Data; |
|
| 6 |
using System.Collections; |
|
| 7 |
|
|
| 8 |
using log4net; |
|
| 9 |
using MySql.Data.MySqlClient; // Data Provider for MySql |
|
| 10 |
|
|
| 11 |
using ProcessManagement.DB.MySql; |
|
| 12 |
using ProcessManagement.DB.Core; |
|
| 13 |
using ProcessManagement.DataModel; |
|
| 14 |
using ProcessManagement.Common; |
|
| 15 |
|
|
| 16 |
namespace ProcessManagement.DB.IOAccess |
|
| 17 |
{
|
|
| 18 |
/// <summary> |
|
| 19 |
/// 指摘事項データＤＢアクセス |
|
| 20 |
/// </summary> |
|
| 21 |
public class IOPointingOutComment : MySqlProcess |
|
| 22 |
{
|
|
| 23 |
#region 定義部 |
|
| 24 |
/// <summary> |
|
| 25 |
/// log4netログを使用する |
|
| 26 |
/// </summary> |
|
| 27 |
private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
|
| 28 |
#endregion |
|
| 29 |
|
|
| 30 |
#region 定数 |
|
| 31 |
/// <summary> |
|
| 32 |
/// 指摘事項データフィールド並び |
|
| 33 |
/// </summary> |
|
| 34 |
public enum PointingOutCommentColumn |
|
| 35 |
{
|
|
| 36 |
ConstructionCode, |
|
| 37 |
ProcessNo, |
|
| 38 |
SeqNo, |
|
| 39 |
PageCount, |
|
| 40 |
PersonCode, |
|
| 41 |
DrowColor, |
|
| 42 |
CommentMessage, |
|
| 43 |
StartPointX, |
|
| 44 |
StartPointY, |
|
| 45 |
CurrentPointX, |
|
| 46 |
CurrentPointY, |
|
| 47 |
CurrentWidth, |
|
| 48 |
CurrentHeight, |
|
| 49 |
EntryDate, |
|
| 50 |
UpdateDate, |
|
| 51 |
} |
|
| 52 |
#endregion |
|
| 53 |
|
|
| 54 |
#region コンストラクタ |
|
| 55 |
/// <summary> |
|
| 56 |
/// コンストラクタ |
|
| 57 |
/// </summary> |
|
| 58 |
/// <param name="ConnectionString"></param> |
|
| 59 |
public IOPointingOutComment() |
|
| 60 |
: base(DBCommon.Instance.DBConnectString) |
|
| 61 |
{
|
|
| 62 |
} |
|
| 63 |
|
|
| 64 |
#endregion |
|
| 65 |
|
|
| 66 |
#region SELECT SQL作成 |
|
| 67 |
/// <summary> |
|
| 68 |
/// SQL作成 |
|
| 69 |
/// </summary> |
|
| 70 |
private string CreateSelectSQL() |
|
| 71 |
{
|
|
| 72 |
string strcmd = "SELECT"; |
|
| 73 |
|
|
| 74 |
strcmd += " ConstructionCode"; |
|
| 75 |
strcmd += ",ProcessNo"; |
|
| 76 |
strcmd += ",SeqNo"; |
|
| 77 |
strcmd += ",PageCount"; |
|
| 78 |
strcmd += ",PersonCode"; |
|
| 79 |
strcmd += ",DrowColor"; |
|
| 80 |
strcmd += ",CommentMessage"; |
|
| 81 |
strcmd += ",StartPointX"; |
|
| 82 |
strcmd += ",StartPointY"; |
|
| 83 |
strcmd += ",CurrentPointX"; |
|
| 84 |
strcmd += ",CurrentPointY"; |
|
| 85 |
strcmd += ",CurrentWidth"; |
|
| 86 |
strcmd += ",CurrentHeight"; |
|
| 87 |
strcmd += ", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')"; |
|
| 88 |
strcmd += ", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')"; |
|
| 89 |
strcmd += " From PointingOutComment"; |
|
| 90 |
|
|
| 91 |
return strcmd; |
|
| 92 |
} |
|
| 93 |
#endregion |
|
| 94 |
|
|
| 95 |
#region 複数データ読込み処理 |
|
| 96 |
public bool SelectAction(string AddSQLString, ref List<PointingOutComment> data, bool bConnect = true) |
|
| 97 |
{
|
|
| 98 |
// インターフェース |
|
| 99 |
string strcmd = ""; |
|
| 100 |
ArrayList arData = new ArrayList(); |
|
| 101 |
|
|
| 102 |
try |
|
| 103 |
{
|
|
| 104 |
// SQL作成 |
|
| 105 |
strcmd = CreateSelectSQL() + AddSQLString; |
|
| 106 |
|
|
| 107 |
// SQL実行 |
|
| 108 |
if (!ExecuteReader(strcmd, ref arData, bConnect)) return false; |
|
| 109 |
|
|
| 110 |
// データセット |
|
| 111 |
foreach (object[] objwrk in arData) |
|
| 112 |
{
|
|
| 113 |
PointingOutComment work = new PointingOutComment(); |
|
| 114 |
Reader2Struct(objwrk, ref work); |
|
| 115 |
data.Add(work); |
|
| 116 |
} |
|
| 117 |
|
|
| 118 |
return true; |
|
| 119 |
} |
|
| 120 |
catch (Exception ex) |
|
| 121 |
{
|
|
| 122 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 123 |
return false; |
|
| 124 |
} |
|
| 125 |
} |
|
| 126 |
#endregion |
|
| 127 |
|
|
| 128 |
#region 1件データ読込処理 |
|
| 129 |
public bool SelectAction(string AddSQLString, ref PointingOutComment data, bool bConnect = true) |
|
| 130 |
{
|
|
| 131 |
// インターフェース |
|
| 132 |
string strcmd = ""; |
|
| 133 |
ArrayList arData = new ArrayList(); |
|
| 134 |
|
|
| 135 |
try |
|
| 136 |
{
|
|
| 137 |
// SQL作成 |
|
| 138 |
strcmd = CreateSelectSQL() + AddSQLString; |
|
| 139 |
|
|
| 140 |
// SQL実行 |
|
| 141 |
if (!ExecuteReader(strcmd, ref arData, bConnect)) return false; |
|
| 142 |
if (arData.Count == 0) return false; |
|
| 143 |
|
|
| 144 |
// データセット |
|
| 145 |
foreach (object[] objwrk in arData) |
|
| 146 |
{
|
|
| 147 |
Reader2Struct(objwrk, ref data); |
|
| 148 |
break; |
|
| 149 |
} |
|
| 150 |
|
|
| 151 |
return true; |
|
| 152 |
} |
|
| 153 |
catch (Exception ex) |
|
| 154 |
{
|
|
| 155 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 156 |
return false; |
|
| 157 |
} |
|
| 158 |
} |
|
| 159 |
#endregion |
|
| 160 |
|
|
| 161 |
#region データ追加処理 |
|
| 162 |
/// <summary> |
|
| 163 |
/// 指摘事項データ追加 |
|
| 164 |
/// </summary> |
|
| 165 |
/// <param name="data">指摘事項データデータ</param> |
|
| 166 |
/// <returns>true：成功 false：失敗</returns> |
|
| 167 |
public bool InsertAction(PointingOutComment data, bool bConnect = true) |
|
| 168 |
{
|
|
| 169 |
string strcmd = ""; |
|
| 170 |
try |
|
| 171 |
{
|
|
| 172 |
strcmd = "INSERT INTO PointingOutComment"; |
|
| 173 |
|
|
| 174 |
strcmd += " VALUES (";
|
|
| 175 |
|
|
| 176 |
strcmd += string.Format(" {0}", data.ConstructionCode);
|
|
| 177 |
strcmd += string.Format(", {0}", data.ProcessNo);
|
|
| 178 |
strcmd += string.Format(", {0}", data.SeqNo);
|
|
| 179 |
strcmd += string.Format(", {0}", data.PageCount);
|
|
| 180 |
strcmd += string.Format(", {0}", data.PersonCode);
|
|
| 181 |
strcmd += string.Format(",'{0}'", data.DrowColor);
|
|
| 182 |
strcmd += string.Format(",'{0}'", data.CommentMessage);
|
|
| 183 |
strcmd += string.Format(", {0}", data.StartPointX);
|
|
| 184 |
strcmd += string.Format(", {0}", data.StartPointY);
|
|
| 185 |
strcmd += string.Format(", {0}", data.CurrentPointX);
|
|
| 186 |
strcmd += string.Format(", {0}", data.CurrentPointY);
|
|
| 187 |
strcmd += string.Format(", {0}", data.CurrentWidth);
|
|
| 188 |
strcmd += string.Format(", {0}", data.CurrentHeight);
|
|
| 189 |
|
|
| 190 |
strcmd += ", NOW()"; |
|
| 191 |
strcmd += ", NOW()"; |
|
| 192 |
strcmd += ")"; |
|
| 193 |
|
|
| 194 |
if (!ExecuteNonQuery(strcmd, bConnect)) return false; |
|
| 195 |
|
|
| 196 |
return true; |
|
| 197 |
} |
|
| 198 |
catch (Exception ex) |
|
| 199 |
{
|
|
| 200 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 201 |
return false; |
|
| 202 |
} |
|
| 203 |
} |
|
| 204 |
/// <summary> |
|
| 205 |
/// 指摘事項データ追加 |
|
| 206 |
/// </summary> |
|
| 207 |
/// <param name="data">指摘事項データデータ</param> |
|
| 208 |
/// <returns>true：成功 false：失敗</returns> |
|
| 209 |
public bool InsertAction(List<PointingOutComment> data, bool bConnect = true) |
|
| 210 |
{
|
|
| 211 |
string strcmd = ""; |
|
| 212 |
try |
|
| 213 |
{
|
|
| 214 |
foreach (PointingOutComment work in data) |
|
| 215 |
{
|
|
| 216 |
if (!InsertAction(work, bConnect)) return false; |
|
| 217 |
} |
|
| 218 |
return true; |
|
| 219 |
} |
|
| 220 |
catch (Exception ex) |
|
| 221 |
{
|
|
| 222 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 223 |
return false; |
|
| 224 |
} |
|
| 225 |
} |
|
| 226 |
#endregion |
|
| 227 |
|
|
| 228 |
#region データ更新処理 |
|
| 229 |
/// <summary> |
|
| 230 |
/// 指摘事項データ更新 |
|
| 231 |
/// </summary> |
|
| 232 |
/// <param name="AddSQLString">更新条件SQL文字列</param> |
|
| 233 |
/// <param name="data">指摘事項データデータ</param> |
|
| 234 |
/// <returns>true：成功 false：失敗</returns> |
|
| 235 |
public bool UpdateAction(string AddSQLString, PointingOutComment data, bool bConnect = true) |
|
| 236 |
{
|
|
| 237 |
string strcmd = ""; |
|
| 238 |
try |
|
| 239 |
{
|
|
| 240 |
|
|
| 241 |
strcmd = "UPDATE PointingOutComment"; |
|
| 242 |
|
|
| 243 |
strcmd += " SET"; |
|
| 244 |
|
|
| 245 |
strcmd += string.Format(" ConstructionCode = {0}", data.ConstructionCode);
|
|
| 246 |
strcmd += string.Format(",ProcessNo = {0}", data.ProcessNo);
|
|
| 247 |
strcmd += string.Format(",SeqNo = {0}", data.SeqNo);
|
|
| 248 |
strcmd += string.Format(",PageCount = {0}", data.PageCount);
|
|
| 249 |
strcmd += string.Format(",PersonCode = {0}", data.PersonCode);
|
|
| 250 |
strcmd += string.Format(",DrowColor = '{0}'", data.DrowColor);
|
|
| 251 |
strcmd += string.Format(",CommentMessage = '{0}'", data.CommentMessage);
|
|
| 252 |
strcmd += string.Format(",StartPointX = {0}", data.StartPointX);
|
|
| 253 |
strcmd += string.Format(",StartPointY = {0}", data.StartPointY);
|
|
| 254 |
strcmd += string.Format(",CurrentPointX = {0}", data.CurrentPointX);
|
|
| 255 |
strcmd += string.Format(",CurrentPointY = {0}", data.CurrentPointY);
|
|
| 256 |
strcmd += string.Format(",CurrentWidth = {0}", data.CurrentWidth);
|
|
| 257 |
strcmd += string.Format(",CurrentHeight = {0}", data.CurrentHeight);
|
|
| 258 |
|
|
| 259 |
strcmd += ", UpdateDate = NOW()"; |
|
| 260 |
strcmd += AddSQLString; |
|
| 261 |
|
|
| 262 |
if (!ExecuteNonQuery(strcmd, bConnect)) return false; |
|
| 263 |
|
|
| 264 |
return true; |
|
| 265 |
} |
|
| 266 |
catch (Exception ex) |
|
| 267 |
{
|
|
| 268 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 269 |
return false; |
|
| 270 |
} |
|
| 271 |
} |
|
| 272 |
#endregion |
|
| 273 |
|
|
| 274 |
#region データ削除処理 |
|
| 275 |
/// <summary> |
|
| 276 |
/// 指摘事項データ削除 |
|
| 277 |
/// </summary> |
|
| 278 |
/// <param name="AddSQLString">削除条件SQL文字列</param> |
|
| 279 |
/// <param name="data">指摘事項データデータ</param> |
|
| 280 |
/// <returns>true：成功 false：失敗</returns> |
|
| 281 |
public bool DeleteAction(string AddSQLString, bool bConnect = true) |
|
| 282 |
{
|
|
| 283 |
// インターフェース |
|
| 284 |
string strcmd = ""; |
|
| 285 |
try |
|
| 286 |
{
|
|
| 287 |
strcmd = string.Format("{0}{1}", "DELETE FROM PointingOutComment", AddSQLString);
|
|
| 288 |
|
|
| 289 |
if (!ExecuteNonQuery(strcmd, bConnect)) return false; |
|
| 290 |
|
|
| 291 |
return true; |
|
| 292 |
} |
|
| 293 |
catch (Exception ex) |
|
| 294 |
{
|
|
| 295 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 296 |
return false; |
|
| 297 |
} |
|
| 298 |
} |
|
| 299 |
#endregion |
|
| 300 |
|
|
| 301 |
#region 読込みオブジェクトセット処理 |
|
| 302 |
/// <summary> |
|
| 303 |
/// 構造体へセットする |
|
| 304 |
/// </summary> |
|
| 305 |
/// <param name="wrk">構造体</param> |
|
| 306 |
public void Reader2Struct(object[] objwrk, ref PointingOutComment wrk) |
|
| 307 |
{
|
|
| 308 |
try |
|
| 309 |
{
|
|
| 310 |
// データ取得 |
|
| 311 |
wrk.ConstructionCode = int.Parse(objwrk[(int)PointingOutCommentColumn.ConstructionCode].ToString()); |
|
| 312 |
wrk.ProcessNo = int.Parse(objwrk[(int)PointingOutCommentColumn.ProcessNo].ToString()); |
|
| 313 |
wrk.SeqNo = int.Parse(objwrk[(int)PointingOutCommentColumn.SeqNo].ToString()); |
|
| 314 |
wrk.PageCount = int.Parse(objwrk[(int)PointingOutCommentColumn.PageCount].ToString()); |
|
| 315 |
wrk.PersonCode = int.Parse(objwrk[(int)PointingOutCommentColumn.PersonCode].ToString()); |
|
| 316 |
wrk.DrowColor = objwrk[(int)PointingOutCommentColumn.DrowColor].ToString(); |
|
| 317 |
wrk.CommentMessage = objwrk[(int)PointingOutCommentColumn.CommentMessage].ToString(); |
|
| 318 |
wrk.StartPointX = int.Parse(objwrk[(int)PointingOutCommentColumn.StartPointX].ToString()); |
|
| 319 |
wrk.StartPointY = int.Parse(objwrk[(int)PointingOutCommentColumn.StartPointY].ToString()); |
|
| 320 |
wrk.CurrentPointX = int.Parse(objwrk[(int)PointingOutCommentColumn.CurrentPointX].ToString()); |
|
| 321 |
wrk.CurrentPointY = int.Parse(objwrk[(int)PointingOutCommentColumn.CurrentPointY].ToString()); |
|
| 322 |
wrk.CurrentWidth = int.Parse(objwrk[(int)PointingOutCommentColumn.CurrentWidth].ToString()); |
|
| 323 |
wrk.CurrentHeight = int.Parse(objwrk[(int)PointingOutCommentColumn.CurrentHeight].ToString()); |
|
| 324 |
|
|
| 325 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)PointingOutCommentColumn.EntryDate].ToString()); |
|
| 326 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)PointingOutCommentColumn.UpdateDate].ToString()); |
|
| 327 |
} |
|
| 328 |
catch (MySqlException myex) |
|
| 329 |
{
|
|
| 330 |
logger.ErrorFormat("ＭｙＳＱＬエラー：{0}：{1}", CommonMotions.GetMethodName(), myex.Message);
|
|
| 331 |
} |
|
| 332 |
catch (Exception ex) |
|
| 333 |
{
|
|
| 334 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(2), ex.Message);
|
|
| 335 |
} |
|
| 336 |
} |
|
| 337 |
|
|
| 338 |
|
|
| 339 |
#endregion |
|
| 340 |
|
|
| 341 |
#region 順序の最大値を取得 |
|
| 342 |
/// <summary> |
|
| 343 |
/// 順序の最大値を取得する |
|
| 344 |
/// </summary> |
|
| 345 |
/// <param name="AddSQLString"></param> |
|
| 346 |
/// <param name="bConnect"></param> |
|
| 347 |
/// <returns></returns> |
|
| 348 |
public int SelectMaxConstructionCodeCount(string AddSQLString, bool bConnect = true) |
|
| 349 |
{
|
|
| 350 |
// インターフェース |
|
| 351 |
string strcmd = ""; |
|
| 352 |
ArrayList arData = new ArrayList(); |
|
| 353 |
int iRet = 0; |
|
| 354 |
try |
|
| 355 |
{
|
|
| 356 |
// SQL作成 |
|
| 357 |
strcmd = "SELECT IFNULL(MAX(SeqNo), 0) FROM PointingOutComment" + AddSQLString; |
|
| 358 |
|
|
| 359 |
// SQL実行 |
|
| 360 |
if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet; |
|
| 361 |
|
|
| 362 |
// データセット |
|
| 363 |
foreach (object[] objwrk in arData) |
|
| 364 |
{
|
|
| 365 |
if (objwrk[0].ToString().Equals("null"))
|
|
| 366 |
iRet = 0; |
|
| 367 |
else |
|
| 368 |
iRet = int.Parse(objwrk[0].ToString()); |
|
| 369 |
} |
|
| 370 |
|
|
| 371 |
} |
|
| 372 |
catch (Exception ex) |
|
| 373 |
{
|
|
| 374 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
|
|
| 375 |
} |
|
| 376 |
return iRet; |
|
| 377 |
} |
|
| 378 |
#endregion |
|
| 379 |
|
|
| 380 |
#region 指摘事項データの検索キー文字列を作成 |
|
| 381 |
/// <summary> |
|
| 382 |
/// 主キー検索の文字列を返す |
|
| 383 |
/// </summary> |
|
| 384 |
/// <param name="ComponentCode"></param> |
|
| 385 |
/// <param name="DetailNo"></param> |
|
| 386 |
/// <returns></returns> |
|
| 387 |
public string CreatePrimarykeyString(int ConstructionCode, int ProcessNo = 0, int SeqNo = 0) |
|
| 388 |
{
|
|
| 389 |
string strWork = ""; |
|
| 390 |
try |
|
| 391 |
{
|
|
| 392 |
strWork = string.Format(" Where ConstructionCode = {0}", ConstructionCode);
|
|
| 393 |
if (ProcessNo != 0) |
|
| 394 |
strWork = string.Format(" And ProcessNo = {0}", ProcessNo);
|
|
| 395 |
if (SeqNo != 0) |
|
| 396 |
strWork = string.Format(" And SeqNo = {0}", SeqNo);
|
|
| 397 |
} |
|
| 398 |
catch (Exception ex) |
|
| 399 |
{
|
|
| 400 |
logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strWork);
|
|
| 401 |
} |
|
| 402 |
|
|
| 403 |
return strWork; |
|
| 404 |
} |
|
| 405 |
#endregion |
|
| 406 |
} |
|
| 407 |
} |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
|---|---|---|
| 703 | 703 |
/// <param name="e"></param> |
| 704 | 704 |
private void btnTargetData_Click(object sender, EventArgs e) |
| 705 | 705 |
{
|
| 706 |
int iNextProcessNo = 0; |
|
| 707 |
// ----- ???????Z?b?g |
|
| 708 |
switch (m_ApprovalCode) |
|
| 709 |
{
|
|
| 710 |
case (int)ClsExcute.ApprovalListNo.EstimateApproval: // 1:??Z????????F |
|
| 711 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateInput; |
|
| 712 |
break; |
|
| 713 |
case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval: // 2:??Z?\?Z?????F |
|
| 714 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateBudget; |
|
| 715 |
break; |
|
| 716 |
case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval: // 3:?H???\?Z?????F |
|
| 717 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionBudget; |
|
| 718 |
break; |
|
| 719 |
case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval: // 4:?????????F |
|
| 720 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry; |
|
| 721 |
break; |
|
| 722 |
case (int)ClsExcute.ApprovalListNo.OrderBillingApproval: // 5:???????F |
|
| 723 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestInput; |
|
| 724 |
break; |
|
| 725 |
case (int)ClsExcute.ApprovalListNo.DRConstructionApproval: // 6:?H??????F |
|
| 726 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.DRConstruction; |
|
| 727 |
break; |
|
| 728 |
case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval: // 7:?c???^???F |
|
| 729 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.Proceedings; |
|
| 730 |
break; |
|
| 731 |
case (int)ClsExcute.ApprovalListNo.SafetyPatrol: // 13:???S?p?g???[?? |
|
| 732 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SafetyPatrol; |
|
| 733 |
break; |
|
| 734 |
} |
|
| 735 |
if (iNextProcessNo == 0) return; |
|
| 706 |
// ????o?????p?????[?^?Z?b?g |
|
| 707 |
DispTargetData(); |
|
| 736 | 708 |
|
| 737 |
// ----- ?N???v???Z?X??? |
|
| 738 |
int NowPoint = ClsExcute.NextProcess(iNextProcessNo); |
|
| 739 |
// ----- ?H??????Z?b?g |
|
| 740 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionCode); |
|
| 741 |
// ???F?@?\??? |
|
| 742 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ApprovalCode); |
|
| 743 |
// ??t??? |
|
| 744 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_OrderNo); |
|
| 745 |
|
|
| 746 |
// ----- ???????Z?b?g |
|
| 747 |
switch (m_ApprovalCode) |
|
| 748 |
{
|
|
| 749 |
case (int)ClsExcute.ApprovalListNo.EstimateApproval: // 1:??Z????????F |
|
| 750 |
case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval: // 2:??Z?\?Z?????F |
|
| 751 |
case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval: // 3:?H???\?Z?????F |
|
| 752 |
case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval: // 7:?c???^???F |
|
| 753 |
break; |
|
| 754 |
case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval: // 4:?????????F |
|
| 755 |
case (int)ClsExcute.ApprovalListNo.OrderBillingApproval: // 5:???????F |
|
| 756 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); // ----- ????\???t???O |
|
| 757 |
break; |
|
| 758 |
case (int)ClsExcute.ApprovalListNo.DRConstructionApproval: // 6:?H??????F |
|
| 759 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PetitionPerson); |
|
| 760 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); // ----- ?V?K???t???O |
|
| 761 |
break; |
|
| 762 |
default: |
|
| 763 |
break; |
|
| 764 |
} |
|
| 765 |
|
|
| 766 | 709 |
m_bTargetFlg = true; |
| 767 | 710 |
m_bEndFlg = true; |
| 768 | 711 |
this.Close(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
|---|---|---|
| 1049 | 1049 |
} |
| 1050 | 1050 |
#endregion |
| 1051 | 1051 |
|
| 1052 |
#region 次呼出処理パラメータセット(対象データを見る) |
|
| 1053 |
/// <summary> |
|
| 1054 |
/// 次呼出処理パラメータセット(対象データを見る) |
|
| 1055 |
/// </summary> |
|
| 1056 |
private void DispTargetData() |
|
| 1057 |
{
|
|
| 1058 |
try |
|
| 1059 |
{
|
|
| 1060 |
int iNextProcessNo = 0; |
|
| 1061 |
// ----- 次処理セット |
|
| 1062 |
switch (m_ApprovalCode) |
|
| 1063 |
{
|
|
| 1064 |
case (int)ClsExcute.ApprovalListNo.EstimateApproval: // 1:積算見積書承認 |
|
| 1065 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateInput; |
|
| 1066 |
break; |
|
| 1067 |
case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval: // 2:積算予算書承認 |
|
| 1068 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateBudget; |
|
| 1069 |
break; |
|
| 1070 |
case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval: // 3:工事予算書承認 |
|
| 1071 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionBudget; |
|
| 1072 |
break; |
|
| 1073 |
case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval: // 4:注文書承認 |
|
| 1074 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry; |
|
| 1075 |
break; |
|
| 1076 |
case (int)ClsExcute.ApprovalListNo.OrderBillingApproval: // 5:請求承認 |
|
| 1077 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestInput; |
|
| 1078 |
break; |
|
| 1079 |
case (int)ClsExcute.ApprovalListNo.DRConstructionApproval: // 6:工事日報承認 |
|
| 1080 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.DRConstruction; |
|
| 1081 |
break; |
|
| 1082 |
case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval: // 7:議事録承認 |
|
| 1083 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.Proceedings; |
|
| 1084 |
break; |
|
| 1085 |
case (int)ClsExcute.ApprovalListNo.SafetyPatrol: // 13:安全パトロール |
|
| 1086 |
iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SafetyPatrol; |
|
| 1087 |
break; |
|
| 1088 |
} |
|
| 1089 |
if (iNextProcessNo == 0) return; |
|
| 1090 |
|
|
| 1091 |
// ----- 起動プロセス設定 |
|
| 1092 |
int NowPoint = ClsExcute.NextProcess(iNextProcessNo); |
|
| 1093 |
// ----- 工事番号セット |
|
| 1094 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionCode); |
|
| 1095 |
// 承認機能番号 |
|
| 1096 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ApprovalCode); |
|
| 1097 |
// 受付番号 |
|
| 1098 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_OrderNo); |
|
| 1099 |
|
|
| 1100 |
// ----- 次処理セット |
|
| 1101 |
switch (m_ApprovalCode) |
|
| 1102 |
{
|
|
| 1103 |
case (int)ClsExcute.ApprovalListNo.EstimateApproval: // 1:積算見積書承認 |
|
| 1104 |
case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval: // 2:積算予算書承認 |
|
| 1105 |
case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval: // 3:工事予算書承認 |
|
| 1106 |
case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval: // 7:議事録承認 |
|
| 1107 |
break; |
|
| 1108 |
case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval: // 4:注文書承認 |
|
| 1109 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); // ----- 直接表示フラグ |
|
| 1110 |
SetPurchaseData(NowPoint); // ----- 対象データセット |
|
| 1111 |
break; |
|
| 1112 |
case (int)ClsExcute.ApprovalListNo.OrderBillingApproval: // 5:請求承認 |
|
| 1113 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); // ----- 直接表示フラグ |
|
| 1114 |
break; |
|
| 1115 |
case (int)ClsExcute.ApprovalListNo.DRConstructionApproval: // 6:工事日報承認 |
|
| 1116 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PetitionPerson); |
|
| 1117 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); // ----- 新規作成フラグ |
|
| 1118 |
break; |
|
| 1119 |
default: |
|
| 1120 |
break; |
|
| 1121 |
} |
|
| 1122 |
} |
|
| 1123 |
catch (Exception ex) |
|
| 1124 |
{
|
|
| 1125 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1126 |
} |
|
| 1127 |
} |
|
| 1128 |
#endregion |
|
| 1129 |
|
|
| 1130 |
#region 注文書申請時の対象データを見る対象データセット |
|
| 1131 |
/// <summary> |
|
| 1132 |
/// 注文書申請時の対象データを見る対象データセット |
|
| 1133 |
/// </summary> |
|
| 1134 |
private void SetPurchaseData(int NowPoint) |
|
| 1135 |
{
|
|
| 1136 |
try |
|
| 1137 |
{
|
|
| 1138 |
ArrayList wrkArr = new ArrayList(); |
|
| 1139 |
|
|
| 1140 |
for (int i = 0; i < m_PurchaseOrderSeqNo.Count; i++) |
|
| 1141 |
{
|
|
| 1142 |
wrkArr.Add(new object[] { m_ConstructionCode, // ConstructionCode
|
|
| 1143 |
"", // FirstString |
|
| 1144 |
"", // SecondString |
|
| 1145 |
0, // CompanyCode |
|
| 1146 |
"", // CompanyName |
|
| 1147 |
0, // ExecutionAmount |
|
| 1148 |
m_ConstructionCode, // SourceCode |
|
| 1149 |
1, // PurchaseOrderflg |
|
| 1150 |
"", // DetailString |
|
| 1151 |
(int)CommonDefine.ApprovalStatus.Petition, // ApprovalStatus |
|
| 1152 |
m_PurchaseOrderSeqNo[i], // PurchaseSeqNo |
|
| 1153 |
0, // LedgerLine |
|
| 1154 |
m_OrderNo, // OrderNo |
|
| 1155 |
DateTime.Now }); // PrintoutDate |
|
| 1156 |
} |
|
| 1157 |
|
|
| 1158 |
if (wrkArr.Count > 0) |
|
| 1159 |
{
|
|
| 1160 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
|
| 1161 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Add(wrkArr); |
|
| 1162 |
} |
|
| 1163 |
} |
|
| 1164 |
catch (Exception ex) |
|
| 1165 |
{
|
|
| 1166 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1167 |
} |
|
| 1168 |
} |
|
| 1169 |
#endregion |
|
| 1170 |
|
|
| 1052 | 1171 |
#region ---------->> 指示連絡コメント処理 |
| 1053 | 1172 |
#region 指示連絡コメント表示処理 |
| 1054 | 1173 |
/// <summary> |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs | ||
|---|---|---|
| 136 | 136 |
IOProcessApprovalDetail AppDetailDB = new IOProcessApprovalDetail(); |
| 137 | 137 |
try |
| 138 | 138 |
{
|
| 139 |
// 初期時に既にデータリストがある場合は承認申請よりの表示 |
|
| 140 |
if (m_DetailList.Count > 0) return; |
|
| 139 | 141 |
|
| 140 | 142 |
// 一覧リストを作成する |
| 141 | 143 |
StringBuilder strSQL = new StringBuilder(); |
| branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj | ||
|---|---|---|
| 461 | 461 |
<Compile Include="DB\IOAccess\IOMSuppliers.cs" /> |
| 462 | 462 |
<Compile Include="DB\IOAccess\IOPurchaseOrderDetail.cs" /> |
| 463 | 463 |
<Compile Include="DB\IOAccess\IOPurchaseOrderDate.cs" /> |
| 464 |
<Compile Include="DB\IOAccess\IOPointingOutComment.cs" /> |
|
| 465 | 464 |
<Compile Include="DB\IOAccess\IOInputSearchLogData.cs" /> |
| 466 | 465 |
<Compile Include="DB\IOAccess\IOActionScheduleData.cs" /> |
| 467 | 466 |
<Compile Include="DB\IOAccess\DBCommonMotions.cs" /> |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.65")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.65")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.66")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.66")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff