/ - Diff - 工事管理システム製品化対応 - Redmine

リビジョン 296

結合・増減親工事検索修正・追加
注文書エクセル修正
秘書からの連絡、最高責任者・管理者メッセージ削除追加
工事一覧動作速度改善のため修正
請求まとめ修正中

             /// <summary>
             /// 本体バージョン
             /// </summary>
             public static int s_SystemVersion = 105;
             public static int s_SystemVersion = 107;
             /// <summary>
             /// コピー・環境バージョン

             /// </summary>
             /// <param name="InputCode"></param>
             /// <returns></returns>
             public static int GetParentConstrCode(int InputCode, int InputJoinFlg, int InputTyingFlg)
+            {
                 IOConstructionLink LinkDB = new IOConstructionLink();
                 try
+                {
                     if (InputJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard
                         && InputTyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Standard)
+                    {
                         return InputCode;
+                    }
                     if (InputJoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
                     {   // ----- 結合工事のチェック
                         // 結合工事は結合親工事番号を返す
                         int FuncCnt = 0;
                         ArrayList ParList = new ArrayList();
                         ClsChangeBaseInfoData.GetParentData(InputCode, ref ParList, ref FuncCnt);
                         // データ無はエラー
                         if (ParList.Count == 0) return InputCode;
                         object[] objRec = (object[])ParList[0];
                         return CommonMotions.cnvInt(objRec[0]);
+                    }
                     else
+                    {
                         // 増減工事でない場合はそのまま工事コードを返す
                         if (InputTyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Tying) return InputCode;
+                    }
                     // 増減工事の場合は親コードを検索する
                     string strLink = string.Format(" WHERE FluctuationCode = {0}", InputCode);
                     ConstructionLink LinkRec = new ConstructionLink();
                     if (!LinkDB.SelectAction(strLink, ref LinkRec)) return InputCode;
                     return LinkRec.ConstructionCode;
+                }
                 catch (Exception ex)
+                {
                     logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
                     return InputCode;
+                }
                 finally
+                {
                     LinkDB.close(); LinkDB = null;
+                }
+            }
             #endregion
             #region 増減工事・結合工事の場合は親コードを返す
             /// <summary>
             /// 増減工事・結合工事の場合は親コードを返す
             /// </summary>
             /// <param name="InputCode"></param>
             /// <returns></returns>
             public static int GetParentConstrCode(int InputCode)
+            {
                 IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
-...
                     ConstructionBaseInfo BaseRec = new ConstructionBaseInfo();
                     if (!BaseDB.SelectAction(strBase, ref BaseRec)) return InputCode;
                     // 結合工事のチェック
                     if (BaseRec.JoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
                     if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard
                         && BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Standard)
+                    {
                         return InputCode;
+                    }
                     else if (BaseRec.JoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
                     {   // ----- 結合工事のチェック
                         // 結合工事は結合親工事番号を返す
                         int FuncCnt = 0;
                         ArrayList ParList = new ArrayList();

                                                                 " C.PERSONCODE, C.PERSONNAME, C.DEPARTMENTCODE, C.DEPARTMENTNAME, C.MANDISPORDER, C.DEPDISPORDER,",
                                                                 " D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER"};
             private static string[] s_SQLPart1_1 = new string[] { " FROM CONSTRUCTIONBASEINFO A",
             private static string[] s_SQLPart1_1 = new string[] { ", -1, 0, A.JoinFlg, A.TyingFlg" };
             private static string[] s_SQLPart1_2 = new string[] { ", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0), A.JoinFlg, A.TyingFlg" };
             private static string[] s_SQLPart2 = new string[] { " FROM CONSTRUCTIONBASEINFO A",
                                                                 " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B",
                                                                 " ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE",
                                                                 string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName)};
             private static string[] s_SQLPart2 = new string[] { " LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,",
             private static string[] s_SQLPart3 = new string[] { " LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,",
                                                                 " CB.DEPARTMENTCODE DEPARTMENTCODE, CC.DEPARTMENTSTRING DEPARTMENTNAME,",
                                                                 " CB.DISPLAYORDER MANDISPORDER, CC.DISPLAYORDER DEPDISPORDER",
                                                                 " FROM CONSTRUCTIONBASEINFO CA",
-...
                                                                 " LEFT JOIN DEPARTMENTMASTER CC ON CB.DEPARTMENTCODE = CC.DEPARTMENTCODE",
                                                                 " WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE" };
             private static string[] s_SQLPart3 = new string[] { " LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,",
             private static string[] s_SQLPart3_1 = new string[] { " LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,",
                                                                 " DB.DEPARTMENTCODE DEPARTMENTCODE, DC.DEPARTMENTSTRING DEPARTMENTNAME,",
                                                                 " DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER",
                                                                 " FROM CONSTRUCTIONBASEINFO DA",
-...
                                                                 " LEFT JOIN DEPARTMENTMASTER DC ON DB.DEPARTMENTCODE = DC.DEPARTMENTCODE",
                                                                 " WHERE DA.CONSTRUCTIONPERIOD = {0}) D ON A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE" };
             private static string[] s_SQLPart4 = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}" };
             private static string[] s_SQLPart3_2 = new string[] { " LEFT JOIN processapproval AS App ON",
                                                                 "     App.ConstructionCode = A.ConstructionCode",
                                                                 " AND App.ApprovalCode = {0}",
                                                                 " And App.OrderNo = {0}",
                                                                 " And App.SeqNo = 1"};
             private static string[] s_SQLPart4Tying = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}",
             private static string[] s_SQLPart5 = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}" };
             private static string[] s_SQLPart5Tying = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}",
                                                                     string.Format(" AND A.TYINGFLG != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying) };
             private static string[] s_SQLPart5 = new string[] { " ORDER BY A.CONSTRUCTIONSTATUSFLG ASC, C.DEPDISPORDER ASC, C.MANDISPORDER ASC,",
             private static string[] s_SQLPart6 = new string[] { " ORDER BY A.CONSTRUCTIONSTATUSFLG ASC, C.DEPDISPORDER ASC, C.MANDISPORDER ASC,",
                                                                 " D.DEPDISPORDER ASC, D.MANDISPORDER ASC, A.CONSTRUCTIONCODE DESC" };
             #endregion
-...
                 CONSTDEPDISPORDER,
                 AppStatus,
                 ORDERNO,
                 JOINFLG,
                 TYINGFLG,
+            }
             #endregion
-...
+                {
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(s_SQLPart1_1[0]);
                     // ???t?B?[???h???????????
                     wrkFormat.Append(", 0, 0");
                     wrkFormat.Append(", A.EstimateType, A.RequestedDate, A.EstimatesSubmittedDate");
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart4Tying.Length; i++) wrkFormat.Append(s_SQLPart4Tying[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     for (int i = 0; i < s_SQLPart5Tying.Length; i++) wrkFormat.Append(s_SQLPart5Tying[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-...
                     strSQL.Append(wrkBuff);
                     // ORDER BY ???
                     for (int i = 0; i < s_SQLPart5.Length; i++) strSQL.Append(s_SQLPart5[i]);
                     for (int i = 0; i < s_SQLPart6.Length; i++) strSQL.Append(s_SQLPart6[i]);
+                }
                 catch (Exception ex)
+                {
-...
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", -1, 0");    // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_1[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                     strSQL.AppendFormat(" AND A.ConstructionStatusFlg < {0}", ProgressComplete);
-...
                     strSQL.Append(" UNION ");
                     wrkFormat.Clear();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_2[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
                     wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateApproval);
                     wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(" And App.SeqNo = 1");
                     wrkFormat.Append(s_SQLPart3_2[0]);
                     wrkFormat.Append(s_SQLPart3_2[1]);
                     wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateApproval);
                     wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(s_SQLPart3_2[4]);
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                     strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEDATA C WHERE C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
-...
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(s_SQLPart1_1[0]);
                     wrkFormat.Append(", DATE_FORMAT(A.EstimatesSubmittedDate, '%Y/%m/%d'), 0");    // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL A1");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL App");
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                     strSQL.AppendFormat(" AND (A.CONSTRUCTIONCODE = A1.CONSTRUCTIONCODE And A1.ApprovalCode = {0} And A1.SeqNo = 1", ApprovalCode);
                     strSQL.AppendFormat(" And A1.ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
                     // Left Join???????????????
                     strSQL.Append(" And (");
                     strSQL.Append(s_SQLPart3_2[1]);
                     strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateApproval);
                     strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     strSQL.Append(s_SQLPart3_2[4]);
                     strSQL.AppendFormat(" And App.ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
                     strSQL.Append(") ");
                     // ???????I???????????
                     strSQL.Append(GetDepartmentString());
-...
                     strSQL.Append(wrkBuff.ToString());
                     // ORDER BY ???
                     for (int i = 0; i < s_SQLPart5.Length; i++) strSQL.Append(s_SQLPart5[i]);
                     for (int i = 0; i < s_SQLPart6.Length; i++) strSQL.Append(s_SQLPart6[i]);
+                }
                 catch (Exception ex)
+                {
-...
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", -1, 0");    // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_1[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                     strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEDATA C WHERE C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
-...
                     strSQL.Append(" UNION ");
                     wrkFormat.Clear();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_2[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
                     wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
                     wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(" And App.SeqNo = 1");
                     wrkFormat.Append(s_SQLPart3_2[0]);
                     wrkFormat.Append(s_SQLPart3_2[1]);
                     wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
                     wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(s_SQLPart3_2[4]);
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                     strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEBUDGET A1 WHERE A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
-...
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", -1, 0");    // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_1[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL A1");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL App");
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     wrkFormat.Append(" AND A.CONSTRUCTIONPERSONCODE != 0");
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-...
                     strSQL.AppendFormat(" And {0} <= A.ConstructionStatusFlg", ProgressStart);
                     strSQL.AppendFormat(" And A.ConstructionStatusFlg < {0}", ProgressComplete);
                     strSQL.Append(" And A.ConstructionPersonCode != 0");
                     strSQL.AppendFormat(" AND (A.CONSTRUCTIONCODE = A1.CONSTRUCTIONCODE AND A1.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.EstimateApproval);
                     strSQL.AppendFormat(" AND SEQNO = 1 AND ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
                     // Left Join???????????????
                     strSQL.Append(" And (");
                     strSQL.Append(s_SQLPart3_2[1]);
                     strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateApproval);
                     strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     strSQL.Append(s_SQLPart3_2[4]);
                     strSQL.AppendFormat(" And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
                     strSQL.Append(") ");
                     strSQL.Append(" AND NOT EXISTS (SELECT * FROM CONSTRUCTIONBUDGET C WHERE C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
                     // ???????I???????????
-...
                     strSQL.Append(" UNION ");
                     wrkFormat.Clear();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_2[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
                     wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
                     wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(" And App.SeqNo = 1");
                     wrkFormat.Append(s_SQLPart3_2[0]);
                     wrkFormat.Append(s_SQLPart3_2[1]);
                     wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
                     wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(s_SQLPart3_2[4]);
                     wrkFormat.Append(", constructionbudget E");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     wrkFormat.Append(" AND A.CONSTRUCTIONPERSONCODE != 0");
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-...
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", -1, 0");   // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_1[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL A1");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL App");
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-...
                     strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE");
                     strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice);
                     strSQL.Append(" AND (A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
                     strSQL.AppendFormat(" AND A1.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
                     strSQL.Append(" AND A1.SEQNO = 1");
                     strSQL.AppendFormat(" AND A1.APPROVALSTATUS = {0})", (int)CommonDefine.ApprovalStatus.Approval);
                     // Left Join???????????????
                     strSQL.Append(" And (");
                     strSQL.Append(s_SQLPart3_2[1]);
                     strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
                     strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     strSQL.Append(s_SQLPart3_2[4]);
                     strSQL.AppendFormat(" And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
                     strSQL.Append(") ");
                     strSQL.Append(" OR A.JOINFLG = 1)");
                     // ???????I???????????
-...
                     wrkFormat.Clear();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", ifnull(App.ApprovalStatus, -1)");
                     wrkFormat.Append(", ifnull(App.OrderNo, 0)");
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_2[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(" LEFT JOIN processapproval AS App");
                     wrkFormat.Append(" ON App.ConstructionCode = A.ConstructionCode");
                     wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
                     wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(" And App.SeqNo = 1");
                     wrkFormat.Append(s_SQLPart3_2[0]);
                     wrkFormat.Append(s_SQLPart3_2[1]);
                     wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
                     wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(s_SQLPart3_2[4]);
                     wrkFormat.Append(", PURCHASEORDER A1");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.Append(" UNION (");
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-...
+            {
                 try
+                {
                     // ???????????F???????????
                     int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("?????????F")).Key;
                     // ?Z?L?????e?B???????
                     StringBuilder wrkBuff = new StringBuilder();
                     CreateSecuritySQL(ref wrkBuff);
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", DATE_FORMAT(A2.PRINTOUTDATE, '%Y/%m/%d'), A1.ORDERNO");     // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_2[0]);
                     wrkFormat.Append(", DATE_FORMAT(A2.PRINTOUTDATE, '%Y/%m/%d')");                 // ???t?B?[???h???????????
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL A1, PURCHASEORDER A2");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(", PROCESSAPPROVAL App, PURCHASEORDER A2");
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                     strSQL.Append(" AND EXISTS (SELECT * FROM PURCHASEORDER B1 WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
                     strSQL.AppendFormat(" And (A.ConstructionCode = A1.ConstructionCode And A1.ApprovalCode = {0} And A1.SeqNo = 1 And A1.APPROVALSTATUS = {1})",
                                                                                                     ApprovalCode, (int)CommonDefine.ApprovalStatus.Approval);
                     // Left Join???????????????
                     strSQL.Append(" And (");
                     strSQL.Append(s_SQLPart3_2[1]);
                     strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
                     //strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     strSQL.Append(s_SQLPart3_2[4]);
                     strSQL.AppendFormat(" And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
                     strSQL.Append(") ");
                     strSQL.Append(" AND (A.CONSTRUCTIONCODE = A2.CONSTRUCTIONCODE AND A2.SEQNO = 1)");
                     // ???????I???????????
-...
                     StringBuilder wrkFormat = new StringBuilder();
                     for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
                     wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
                     for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                     wrkFormat.Append(s_SQLPart1_2[0]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                     for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
                     for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
                     wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
                     wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
                     wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(" And App.SeqNo = 1");
                     wrkFormat.Append(s_SQLPart3_2[0]);
                     wrkFormat.Append(s_SQLPart3_2[1]);
                     wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
                     wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                     wrkFormat.Append(s_SQLPart3_2[4]);
                     wrkFormat.Append(", constructionledger AS Ledger");
                     for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
                     for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                     wrkFormat.AppendFormat(" AND ({0} <= A.CONSTRUCTIONSTATUSFLG AND A.CONSTRUCTIONSTATUSFLG <= {1})", nStat1, nStat2);
                     wrkFormat.Append(" AND Ledger.ConstructionCode = A.ConstructionCode");
-...
                     strSQL.Append(wrkBuff);
                     // ORDER BY ???
                     for (int i = 0; i < s_SQLPart5.Length; i++) strSQL.Append(s_SQLPart5[i]);
                     for (int i = 0; i < s_SQLPart6.Length; i++) strSQL.Append(s_SQLPart6[i]);
+                }
                 catch (Exception ex)
+                {
-...
+                {
                     int nConstrCode = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONCODE]);
                     int nOrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]);
                     int nJoinFlg = CommonMotions.cnvInt(objwrk[(int)GetData.JOINFLG]);
                     int nTyingFlg = CommonMotions.cnvInt(objwrk[(int)GetData.TYINGFLG]);
                     int nAppStatus = 0;
                     string strAppStatus = string.Empty;
                     DateTime dtAppStatus = DateTime.MinValue;
                     // ----- ?N?????????????
                     int ParentCode = ClsProcessExist.GetParentConstrCode(nConstrCode);
                     int ParentCode = ClsProcessExist.GetParentConstrCode(nConstrCode, nJoinFlg, nTyingFlg);
                     switch (m_ExecuteFlg)
+                    {
                         case (int)ClsExcute.ProcessExecuteNo.EstimateInput:                     // ??Z?????????

                     sql.Append("  , ifnull(Picm.SealPrintName, '') as TantoNM ");
                     sql.AppendFormat("  , DATE('{0}') as ApprovalDate ", DateTime.MinValue.ToShortDateString());
                     sql.Append("  , 0 as ApprovalEndFlg ");
                     sql.Append("  , Picm.DepartmentCode As AppDepCode");
                     sql.Append("  , ifnull(Cbi.SalesPersonCode, 0) as SalesPersonCode ");
                     sql.Append("  , ifnull(Cbi.ConstructionPersonCode, 0) as ConstructionPersonCode ");
                     sql.Append("  , ifnull(Cbi.ConstrSubPersonCode, 0) as ConstrSubPersonCode ");
                     sql.Append("  , ifnull(Cbi.ConstructionInstructor, 0) as ConstructionInstructor ");
                     sql.Append("  , Picm.DepartmentCode ");
                     sql.Append("  , 0 As ConstrDepCode ");
                     sql.Append("  , 0 As SalesDepCode ");
                     sql.Append("  , 0 As AssistDepCode ");
                     sql.Append("  , 0 As InstrDepCode ");
                     sql.Append("  , case ifnull(DATE(Pod.SendDate), '') ");
                     sql.Append("    when '' then '?~' ");
                     sql.AppendFormat("    when '{0}' then '?~' ", DateTime.MinValue.ToShortDateString());

                     if (data.MessageFlag == (int)MessageBoardData.MessageFlgDef.Secretary)
+                    {
                         btnDataEntry.Visible = false;
                         btnDelete.Visible = false;
                         // ログイン者が管理者・最高責任者ならばメッセージを削除できる
                         int SecRank = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key;
                         if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode || CommonMotions.LoginUserData.SecurityManagement == SecRank)
+                        {
                             btnDelete.Visible = true;
+                        }
                         else
+                        {
                             btnDelete.Visible = false;
+                        }
+                    }
                     // 閲覧履歴表示
-...
+            {
                 IOMessageBoardData mbdDB = new IOMessageBoardData();
                 IOMessageBoardTerget mbtDB = new IOMessageBoardTerget();
                 IOMessageBrowsingHistory mbhDB = new IOMessageBrowsingHistory();
                 try
+                {
                     mbdDB.connect();
                     mbdDB.beginTran();
                     mbdDB.connect(); mbdDB.beginTran();
                     mbtDB.connect(); mbtDB.beginTran();
                     mbhDB.connect(); mbhDB.beginTran();
                     mbtDB.connect();
                     mbtDB.beginTran();
                     List<MessageBoardData> data = new List<MessageBoardData>();
                     string strWhere = mbdDB.CreatePrimarykeyString(m_RecordNumber, m_BranchNumber);
                     if (!mbdDB.SelectAction(strWhere, ref data, false))
-...
+                    {
                         MessageBox.Show("メッセージ削除に失敗しました。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         mbdDB.rollback();
                         mbtDB.rollback();
                         return false;
+                    }
-...
                         return false;
+                    }
                     mbhDB.DeleteAction(strWhere, false);
                     mbdDB.commit();
                     mbtDB.commit();
                     mbhDB.commit();
                     return true;
+                }
-...
+                {
                     mbdDB.close(); mbdDB = null;
                     mbtDB.close(); mbtDB = null;
                     mbhDB.close(); mbhDB = null;
+                }
+            }
             #endregion

     // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
     // 既定値にすることができます:
     // [assembly: AssemblyVersion("1.0.*")]
     [assembly: AssemblyVersion("1.0.1.5")]
     [assembly: AssemblyFileVersion("1.0.1.5")]
     [assembly: AssemblyVersion("1.0.1.7")]
     [assembly: AssemblyFileVersion("1.0.1.7")]
     // Log4netを使用する
     [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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

プロジェクト

全般

プロフィール

工事管理システム製品化対応

リビジョン 296