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

リビジョン 115

部署別台帳一覧／工事台帳まとめ、退職者担当工事表示修正
工事台帳担当者変更時、台帳明細データ予算・実行金額設定無へ変更

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

                     DetailRec.SecondString = string.Empty;                                      // ?H?????e
                     DetailRec.CompanyType = (int)CommonDefine.CodeDataType.Person;              // ??????R?[?h?^?C?v
                     DetailRec.CompanyCode = ConstructorCode;                                    // ??????R?[?h
                     DetailRec.ExecutionAmount = ExecutionAmount;                                // ???s???z
                     DetailRec.AmountConfigRate = AmountConfigRate;                              // ???z?\????
                     //DetailRec.ExecutionAmount = ExecutionAmount;                                // ???s???z
                     //DetailRec.AmountConfigRate = AmountConfigRate;                              // ???z?\????
                     DetailRec.SalaryFlg = (int)CommonDefine.SalaryDevision.All;                 // ???^?U????
                     DetailRec.SalaryDays = workingCount;                                        // ???^?U??????

                     CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
                     dtStart = new DateTime(iYear, month, day);
                     dtEnd = dtStart.AddYears(1).AddDays(-1);     // ?I????{1?N?|1??
                     // ????????????????t?????v?Z????
                     if (CommonMotions.cnvInt(numUDConstPro.Value) == CommonMotions.SystemMasterData.BusinessPeriod) dtEnd = DateTime.Today;
+                }
                 catch (Exception ex)
+                {
-...
                 /// ??p?J?n???t
                 /// </summary>
                 HireStartDays,
                 /// <summary>
                 /// ??p?I?????t
                 /// </summary>
                 HireCompDays,
+            }
             #endregion
-...
             /// <returns>?f?[?^????</returns>
             private int GetPersonInDepartment(ref List<int> PersonCodeList, ref List<DateTime> dtStartList,
                                                 ref List<DateTime> dtCompList, ref List<DateTime> dtMaxComp,
                                                 ref List<int> MonthSalaryList, ref List<DateTime> dtHireStDays)
                                                 ref List<int> MonthSalaryList, ref List<DateTime> dtHireStDays, ref List<DateTime> dtHireEdDays)
+            {
                 IOMPersonInCharge PersonDB = new IOMPersonInCharge();
                 try
-...
                     strSQL += " MAX(E.CONSTRUCTIONPERIODEND) I3, MAX(E.CONSTRUCTIONPERIODEND2) I4,";
                     strSQL += " SUM(C.EXECUTIONAMOUNT) M5, SUM(D.EXECUTIONAMOUNT) S5, SUM(E.EXECUTIONAMOUNT) I5,";
                     strSQL += " COUNT(C.EXECUTIONAMOUNT) M6, COUNT(D.EXECUTIONAMOUNT) S6, COUNT(E.EXECUTIONAMOUNT) I6,";
                     strSQL += " P.STARTDATE";
                     strSQL += " P.STARTDATE, P.ENDDATE";
                     strSQL += " FROM PERSONINCHARGEMASTER P";
                     // ?H???S?????f?[?^??
-...
                     strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) AS TMP )";
                     // 16???????t?H?[????_?????????????
                     if (numUDConstPro.Value < 17 && DepartmentCode == 9)
+                    {
+                    }
                     else
+                    {
                         strSQL += string.Format(" AND P.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
+                    }
                     // ?????R?[?h?I?????????????????????????
                     if (DepartmentCode != 0) strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
                     if (PersonCode != 0) strSQL += string.Format(" AND P.PERSONCODE = {0}", PersonCode);
                     strSQL += " GROUP BY P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE";
                     strSQL += " GROUP BY P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE, P.ENDDATE";
                     strSQL += " ORDER BY P.DISPLAYORDER";
                     ArrayList arList = new ArrayList();
-...
                         // ???z???^????????
                         int Salary = CommonMotions.cnvInt(objRec[(int)GetPersonTerm.MonthlySalary]);
                         // ??p?J?n??????????
                         DateTime dtHireDay = CommonMotions.cnvDate(objRec[(int)GetPersonTerm.HireStartDays]);
                         // ??p?J?n?E?I????????????
                         DateTime dtHireStDay = CommonMotions.cnvDate(objRec[(int)GetPersonTerm.HireStartDays]);
                         DateTime dtHireEdDay = CommonMotions.cnvDate(objRec[(int)GetPersonTerm.HireCompDays]);
                         PersonCodeList.Add(Person);     // ?S????R?[?h
                         dtStartList.Add(stDate);        // ?J?n??
                         dtCompList.Add(edDate);         // ?I????
                         dtMaxComp.Add(maxDate);         // ???I????
                         MonthSalaryList.Add(Salary);    // ???^???z
                         dtHireStDays.Add(dtHireDay);    // ??p?J?n??
                         dtHireStDays.Add(dtHireStDay);  // ??p?J?n??
                         dtHireEdDays.Add(dtHireEdDay);  // ??p?I????
+                    }
                     return arList.Count;
+                }
-...
                     List<DateTime> dtMaxCompArray = new List<DateTime>();
                     List<int> SalaryArray = new List<int>();
                     List<DateTime> dtHireStDays = new List<DateTime>();
                     GetPersonInDepartment(ref PersonCDArray, ref dtStartArray, ref dtCompArray, ref dtMaxCompArray, ref SalaryArray, ref dtHireStDays);
                     List<DateTime> dtHireEdDays = new List<DateTime>();
                     GetPersonInDepartment(ref PersonCDArray,
                                             ref dtStartArray, ref dtCompArray,
                                             ref dtMaxCompArray, ref SalaryArray,
                                             ref dtHireStDays, ref dtHireEdDays);
                     // ProgressBar??l???X????
                     prgber.Value++;
                     prgber.Update();
                     // ?f?t?H???g?J?n?E?I??????????
                     DateTime dtDefaultStart = DateTime.MinValue;
                     DateTime dtDefaultEnd = DateTime.MinValue;
                     CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
                     // ----- ?o????^?\???i?w?b?_?[??\???j
                     SetPayrollData(PersonCDArray, dtStartArray, dtCompArray, SalaryArray, dtMaxCompArray, dtHireStDays);
                     SetPayrollData(PersonCDArray, dtDefaultStart, dtDefaultEnd,
                                     dtStartArray, dtCompArray,
                                     SalaryArray, dtMaxCompArray,
                                     dtHireStDays, dtHireEdDays);
                     // ----- ?o???\??????
                     int Expenses = SetOtherCost(PersonCDArray, dtStartArray, dtCompArray);
-...
             /// <param name="dtStartArray"></param>
             /// <param name="dtCompArray"></param>
             /// <param name="SalaryArray"></param>
             private void SetPayrollData(List<int> PersonCDArray, List<DateTime> dtStartArray,
                                         List<DateTime> dtCompArray, List<int> SalaryArray,
                                         List<DateTime> dtMaxCompArray, List<DateTime> dtHireStDayArray)
             private void SetPayrollData(List<int> PersonCDArray, DateTime dtDefaultStart, DateTime dtDefaultEnd,
                                         List<DateTime> dtStartArray, List<DateTime> dtCompArray,
                                         List<int> SalaryArray, List<DateTime> dtMaxCompArray,
                                         List<DateTime> dtHireStDayArray, List<DateTime> dtHireEdDayArray)
+            {
                 try
+                {
                     //Debug.WriteLine("---------------------");
                     // ?????R?[?h??
                     int DepartmentCode = GetDepartmentCode();
                     // ??????????E??????????
                     DateTime dtDefaultStart = DateTime.MinValue;
                     DateTime dtDefaultEnd = DateTime.MinValue;
                     CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
                     DateTime dtCurDefaultStart = dtDefaultStart;
                     DateTime dtCurDefaultEnd = dtDefaultEnd;
                     int TotalSalary = 0;        // ???^????
                     int OnSalary = 0;           // ?U?????^???z??
-...
                     // ???^???W?v????
                     for (int i = 0; i < PersonCDArray.Count; i++)
+                    {
                         // ??????????E??????????
                         dtCurDefaultStart = dtDefaultStart;
                         dtCurDefaultEnd = dtDefaultEnd;
                         // ???????????????J?n???????????
                         if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
+                        {
                             dtCurDefaultStart = dtHireStDayArray[i];
+                        }
                         // ??????????????I????????????
                         if (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
+                        {
                             dtCurDefaultEnd = dtHireEdDayArray[i];
+                        }
                         // ?J?n????
                         dtStart = dtStartArray[i];
                         // ?f?[?^?????????????????Z?b?g????
                         if (dtStart == DateTime.MaxValue)
+                        {
                             if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
                                 dtStart = dtHireStDayArray[i];
                             else
                                 dtStart = dtDefaultStart;
                             dtStart = dtCurDefaultStart;
+                        }
                         else if (dtDefaultStart < dtStart)
                         {   // ?J?n?????????????????O??f?[?^???????????`?F?b?N????
                             dtStart = dtDefaultStart;
                         else if (dtCurDefaultStart < dtStart)
                         {   // ?J?n?????????????????????Z?b?g????
                             dtStart = dtCurDefaultStart;
+                        }
                         // ?I??????
                         dtEnd = dtCompArray[i];
                         if (dtEnd == DateTime.MinValue) dtEnd = dtDefaultEnd;
                         // ??????
                         dtMax = dtMaxCompArray[i];
                         if (dtMax == DateTime.MinValue) dtMax = dtDefaultEnd;
                         if (dtMax == DateTime.MinValue) dtMax = dtCurDefaultEnd;
                         // ???????????????????
                         if (dtMax < DateTime.Today.Date)
+                        {
                             if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
                             {   // ?O????O?????
                                 dtMax = dtCurDefaultEnd;
+                            }
                             else if (dtHireEdDayArray[i] != DateTime.MinValue && dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
                             {   // ??????????????I????????????
                                 dtMax = dtCurDefaultEnd;
+                            }
                             else
                             {   // ??O?????
                                 dtMax = DateTime.Today.Date;
+                            }
+                        }
                         // ???^????
                         int workSalary = CalcElapsedSalary(dtStart, dtEnd, PersonCDArray[i], SalaryArray[i]);
                         int workSalary = CalcElapsedSalary(dtStart, dtMax, PersonCDArray[i], SalaryArray[i]);
                         // ??v???Z
                         if (workSalary > 0) TotalSalary += workSalary;
                         //Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
                         // ?v?Z?J?n?I????????????
                         if (dtStart < dtDispStart) dtDispStart = dtStart;
                         if (dtDispComplate < dtMax) dtDispComplate = dtMax;
+                    }
                     // ----- ?\??????
                     // ?U?????^???z?E?????v???z?E?e???v???z??
                     ProfitGeneral(ref OnSalary, ref  NetIncome, ref  NonSalary);
-...
             /// <returns></returns>
             private int CalcElapsedSalary(DateTime dtStart, DateTime dtLast, int PersonCode, int Salary)
+            {
                 IOMPersonSalary SalDB = new IOMPersonSalary();
                 try
+                {
                     // ???????????????
                     int WorkingDay = ClsCalendar.CalcPassedDaysCount(dtStart, dtLast);
                     int RetSalary = 0;
                     // ???^??
                     int MonthlyPay = CommonMotions.cnvRound(Salary * CommonDefine.s_SalaryCorrection);
                     string strSQL = "SELECT AX.hiduke,";
                     strSQL += string.Format(" ROUND((AX.salary * {0})/ {1}),", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
                     strSQL += " MAX(AX.StartD) FROM";
                     strSQL += " (SELECT A.d hiduke, B.MonthlySalary salary, B.STARTDATE StartD FROM";
                     // ?????v?Z
                     double daylySalary = CommonMotions.cnvRound(MonthlyPay / CommonDefine.s_ManHourUnitMonth);
                     strSQL += " (SELECT A1.years, A2.month, A3.days, DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) AS d";
                     strSQL += " FROM yearmaster AS A1, monthmaster AS A2, daymaster AS A3";
                     // ?o????^?v?Z
                     int RetSalary = CommonMotions.cnvRound(WorkingDay * daylySalary);
                     strSQL += " WHERE";
                     if (dtStart.Year == dtLast.Year)
+                    {
                         strSQL += string.Format(" (A1.years = {0} AND A2.month IN(", dtStart.Year.ToString("0000"));
                         for (int i = dtStart.Month; i <= dtLast.Month; i++)
+                        {
                             if (i != dtStart.Month) strSQL += ", ";
                             strSQL += string.Format("{0} ", i);
+                        }
                         strSQL += "))";
+                    }
                     else
+                    {
                         strSQL += string.Format(" ((A1.years = {0} AND A2.month IN(", dtStart.Year.ToString("0000"));
                         for (int i = dtStart.Month; i <= 12; i++)
+                        {
                             if (i != dtStart.Month) strSQL += ", ";
                             strSQL += string.Format("{0} ", i);
+                        }
                         strSQL += "))";
                         strSQL += string.Format(" OR (A1.years = {0} AND A2.month IN(", dtLast.Year.ToString("0000"));
                         for (int i = 1; i <= dtLast.Month; i++)
+                        {
                             if (i != 1) strSQL += ", ";
                             strSQL += string.Format("{0} ", i);
+                        }
                         strSQL += ")))";
+                    }
                     strSQL += " AND DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) IS NOT NULL";
                     strSQL += " ORDER BY d) A";
                     strSQL += ", PERSONSALARYMASTER AS B";
                     strSQL += " WHERE B.STARTDATE <= A.d";
                     strSQL += string.Format(" AND B.PERSONCODE = {0}", PersonCode);
                     strSQL += " ORDER BY A.d, B.STARTDATE DESC) AS AX";
                     strSQL += " GROUP BY AX.hiduke";
                     strSQL += " ORDER BY AX.hiduke";
                     ArrayList ArData = new ArrayList();
                     SalDB.ExecuteReader(strSQL, ref ArData);
                     foreach (object[] objRec in ArData)
+                    {
                         RetSalary += CommonMotions.cnvInt(objRec[1]);
+                    }
                     return RetSalary;
+                }
                 catch (Exception ex)
-...
                     logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
                     return 0;
+                }
                 finally
+                {
                     SalDB.close(); SalDB = null;
+                }
+            }
             #endregion

                     CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
                     dtStart = new DateTime(iYear, month, day);
                     dtEnd = dtStart.AddYears(1).AddDays(-1);     // ?I????{1?N?|1??
                     // ????????????????t?????v?Z????
                     if (CommonMotions.cnvInt(numUDConstPro.Value) == CommonMotions.SystemMasterData.BusinessPeriod) dtEnd = DateTime.Today;
+                }
                 catch (Exception ex)
+                {
-...
                 /// ??p?J?n???t
                 /// </summary>
                 HireStartDays,
                 /// <summary>
                 /// ??p?I?????t
                 /// </summary>
                 HireCompDays,
+            }
             #endregion
-...
             private int GetPersonInDepartment(ref List<int> DepartmentList, ref List<int> PersonCode,
                                                 ref List<DateTime> dtStart, ref List<DateTime> dtComp,
                                                 ref List<DateTime> dtMaxComp, ref List<int> MonthSalary,
                                                 ref List<DateTime> dtHireStDays)
                                                 ref List<DateTime> dtHireStDays, ref List<DateTime> dtHireEdDays)
+            {
                 IOMPersonInCharge PersonDB = new IOMPersonInCharge();
                 try
-...
                     strSQL += " MAX(E.CONSTRUCTIONPERIODEND) I3, MAX(E.CONSTRUCTIONPERIODEND2) I4,";
                     strSQL += " SUM(C2.EXECUTIONAMOUNT) M5, SUM(D2.EXECUTIONAMOUNT) S5, SUM(E2.EXECUTIONAMOUNT) I5,";
                     strSQL += " COUNT(C2.EXECUTIONAMOUNT) M6, COUNT(D2.EXECUTIONAMOUNT) S6, COUNT(E2.EXECUTIONAMOUNT) I6,";
                     strSQL += " P.STARTDATE";
                     strSQL += " P.STARTDATE, P.ENDDATE";
                     strSQL += " FROM PERSONINCHARGEMASTER P";
                     // ?H???S?????f?[?^??
-...
                     strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
                     strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) AS TMP )";
                     // 16???????t?H?[????_?????????????
                     if (numUDConstPro.Value <= 16 && DepartmentCode != 9)
+                    {
                         strSQL += string.Format(" AND P.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
+                    }
                     if (DepartmentCode != 0)
                         strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
                     strSQL += " GROUP BY P.DEPARTMENTCODE, P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE";
                     strSQL += " GROUP BY P.DEPARTMENTCODE, P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE, P.ENDDATE";
                     strSQL += " ORDER BY P.DISPLAYORDER";
                     ArrayList arList = new ArrayList();
-...
                         // ???z???^????????
                         int Salary = CommonMotions.cnvInt(objRec[(int)GetPersonTerm.MonthlySalary]);
                         // ??p?J?n??????????
                         DateTime dtHireDay = CommonMotions.cnvDate(objRec[(int)GetPersonTerm.HireStartDays]);
                         // ??p?J?n?E?I????????????
                         DateTime dtHireStDay = CommonMotions.cnvDate(objRec[(int)GetPersonTerm.HireStartDays]);
                         DateTime dtHireEdDay = CommonMotions.cnvDate(objRec[(int)GetPersonTerm.HireCompDays]);
                         DepartmentList.Add(Department);     // ?????R?[?h
                         PersonCode.Add(Person);             // ?S????R?[?h
-...
                         dtComp.Add(edDate);                 // ?I????
                         dtMaxComp.Add(maxDate);             // ???I????
                         MonthSalary.Add(Salary);            // ???^???z
                         dtHireStDays.Add(dtHireDay);        // ??p?J?n??
                         dtHireStDays.Add(dtHireStDay);      // ??p?J?n??
                         dtHireEdDays.Add(dtHireEdDay);      // ??p?I????
+                    }
                     return arList.Count;
+                }
-...
                     List<DateTime> dtMaxCompArray = new List<DateTime>();
                     List<int> SalaryArray = new List<int>();
                     List<DateTime> dtHireStDayArray = new List<DateTime>();
                     GetPersonInDepartment(ref DepInPerArray, ref PersonCDArray, ref dtStartArray, ref dtCompArray, ref dtMaxCompArray, ref SalaryArray, ref dtHireStDayArray);
                     List<DateTime> dtHireEdDayArray = new List<DateTime>();
                     GetPersonInDepartment(ref DepInPerArray, ref PersonCDArray,
                                             ref dtStartArray, ref dtCompArray,
                                             ref dtMaxCompArray, ref SalaryArray,
                                             ref dtHireStDayArray, ref dtHireEdDayArray);
                     // ProgressBar??l???X????
                     prgber.Value++;
-...
                     DateTime dtDefaultEnd = DateTime.MinValue;
                     CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
                     // ----- ?o????^?\???i?w?b?_?[??\???j
                     SetPayrollData(PersonCDArray, dtStartArray, dtCompArray, SalaryArray, dtMaxCompArray, dtHireStDayArray);
                     SetPayrollData(PersonCDArray, dtDefaultStart, dtDefaultEnd,
                                     dtStartArray, dtCompArray,
                                     SalaryArray, dtMaxCompArray,
                                     dtHireStDayArray, dtHireEdDayArray);
                     // ProgressBar??l???X????
                     prgber.Value++;
-...
                     // ----- ?H????????
                     if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
                     // ???????????????E?????f?[?^???????\??????
                     if (DispType== (int)DispDataTypeCode.Department)
+                    {
                         GetType2DeleteData(LedgerDB, ref arData);
+                    }
                     // ??????f?[?^?J?E???g??
                     m_initDataCount = arData.Count;
                     if (arData.Count == 0) return;
-...
                     strSQL += " ,SUM(A.GROSSPROFIT)";
                     strSQL += " ,SUM(A.NETPROFIT)";
                     //strSQL += " FROM CONSTRUCTIONLEDGER A, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER C, DEPARTMENTMASTER D";
                     //strSQL += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                     //strSQL += string.Format(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                     //strSQL += string.Format(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                     //strSQL += string.Format(" AND B.TyingFlg != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
                     //strSQL += " AND B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
                     //strSQL += " AND C.DEPARTMENTCODE = D.DEPARTMENTCODE";
                     strSQL += " FROM PERSONINCHARGEMASTER C";
                     strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO B ON B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
                     strSQL += string.Format(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-...
                     strSQL += " DEPARTMENTMASTER D";
                     strSQL += " WHERE B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
                     strSQL += " AND C.DEPARTMENTCODE = D.DEPARTMENTCODE";
                     //strSQL += " AND C.DELETEFLG = 0";
                     strSQL += " GROUP BY  C.DEPARTMENTCODE, D.DEPARTMENTSTRING, D.DISPLAYORDER";
                     strSQL += " ORDER BY 3 ASC";
-...
                     strSQL += " LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                     strSQL += string.Format(" WHERE C.DEPARTMENTCODE = {0}", DepCode);
                     strSQL += " AND C.DELETEFLG = 0";
                     strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     //strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     strSQL += " GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG";
                     strSQL += " ORDER BY 11, 3 ASC";
-...
+            }
             #endregion
             #region ???????????f?[?^??S?????f?[?^???????????
             /// <summary>
             /// ???????????f?[?^??S?????f?[?^???????????
             /// </summary>
             private void GetType2DeleteData(IOConstructionLedger LedgerDB, ref ArrayList arData)
+            {
                 string strSQL = string.Empty;
                 try
+                {
                     // SQL??A?N?Z?X????????????
                     string strSecurity = string.Empty;
                     CreateSecuritySQL(ref strSecurity);
                     int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
                     int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
                     // ----- ?r?p?k??
                     // ????????f?[?^????
                     strSQL = "SELECT";
                     strSQL += " C.PERSONCODE";
                     strSQL += " ,C.PERSONNAME";
                     strSQL += " ,C.DISPLAYORDER";
                     strSQL += " ,SUM(A.ORDERSDECISIONPRICE)";
                     strSQL += " ,SUM(A.COMPANYEXPENSES)";
                     strSQL += " ,SUM(A.DEPARTMENTEXPENSES)";
                     strSQL += " ,SUM(A.SALESEXPENSES)";
                     strSQL += " ,SUM(A.TOTALPAYMENT)";
                     strSQL += " ,SUM(A.GROSSPROFIT)";
                     strSQL += " ,SUM(A.NETPROFIT)";
                     strSQL += " ,C.EMPLOYEECLASSFLG";
                     strSQL += " FROM PERSONINCHARGEMASTER C";
                     strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO B ON B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
                     strSQL += string.Format(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                     strSQL += string.Format(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                     strSQL += string.Format(" AND B.TyingFlg != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
                     strSQL += ", CONSTRUCTIONLEDGER A";
                     //strSQL += " LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                     strSQL += string.Format(" WHERE C.DEPARTMENTCODE = {0}", DepCode);
                     strSQL += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                     strSQL += " AND C.DELETEFLG != 0";
                     //strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     strSQL += " GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG";
                     strSQL += " ORDER BY 11, 3 ASC";
                     if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
+                }
                 catch (Exception ex)
+                {
                     logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", ex.Message, strSQL);
+                }
+            }
             #endregion
             #region ??????o????^??\??????
             /// <summary>
             /// ??????o????^??\??????
             /// </summary>
             /// <param name="PersonCDArray"></param>
             /// <param name="dtStartArray"></param>
             /// <param name="dtCompArray"></param>
             /// <param name="SalaryArray"></param>
             private void SetPayrollData(List<int> PersonCDArray, List<DateTime> dtStartArray,
                                         List<DateTime> dtCompArray, List<int> SalaryArray,
                                         List<DateTime> dtMaxCompArray, List<DateTime> dtHireStDayArray)
             private void SetPayrollData(List<int> PersonCDArray, DateTime dtDefaultStart, DateTime dtDefaultEnd,
                                         List<DateTime> dtStartArray, List<DateTime> dtCompArray,
                                         List<int> SalaryArray, List<DateTime> dtMaxCompArray,
                                         List<DateTime> dtHireStDayArray, List<DateTime> dtHireEdDayArray)
+            {
                 try
+                {
                     //Debug.WriteLine("---------------------");
                     // ?????R?[?h??
                     int DepartmentCode = GetDepartmentCode();
                     // ??????????E??????????
                     DateTime dtDefaultStart = DateTime.MinValue;
                     DateTime dtDefaultEnd = DateTime.MinValue;
                     CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
                     DateTime dtCurDefaultStart = dtDefaultStart;
                     DateTime dtCurDefaultEnd = dtDefaultEnd;
                     int TotalSalary = 0;        // ???^????
                     int OnSalary = 0;           // ?U?????^???z??
-...
                     // ???^???W?v????
                     for (int i = 0; i < PersonCDArray.Count; i++)
+                    {
                         // ??????????E??????????
                         dtCurDefaultStart = dtDefaultStart;
                         dtCurDefaultEnd = dtDefaultEnd;
                         // ???????????????J?n???????????
                         if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
+                        {
                             dtCurDefaultStart = dtHireStDayArray[i];
+                        }
                         // ??????????????I????????????
                         if (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
+                        {
                             dtCurDefaultEnd = dtHireEdDayArray[i];
+                        }
                         // ?J?n????
                         dtStart = dtStartArray[i];
                         // ?f?[?^?????????????????Z?b?g????
                         if (dtStart == DateTime.MaxValue)
+                        {
                             if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
                                 dtStart = dtHireStDayArray[i];
                             else
                                 dtStart = dtDefaultStart;
                             dtStart = dtCurDefaultStart;
+                        }
                         else if (dtDefaultStart < dtStart)
                         {   // ?J?n?????????????????O??f?[?^???????????`?F?b?N????
                             dtStart = dtDefaultStart;
                         else if (dtCurDefaultStart < dtStart)
                         {   // ?J?n?????????????????????Z?b?g????
                             dtStart = dtCurDefaultStart;
+                        }
                         // ?f?[?^?????????????????Z?b?g????
                         if (dtStart == DateTime.MinValue) dtStart = dtDefaultStart;
                         // ?I??????
                         dtEnd = dtCompArray[i];
                         if (dtEnd == DateTime.MinValue) dtEnd = dtDefaultEnd;
                         // ??????
                         dtMax = dtMaxCompArray[i];
                         if (dtMax == DateTime.MinValue) dtMax = dtDefaultEnd;
                         if (dtMax == DateTime.MinValue) dtMax = dtCurDefaultEnd;
                         // ???????????????????
                         if (dtMax < DateTime.Today.Date)
+                        {
                             if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
                             {   // ?O????O?????
                                 dtMax = dtCurDefaultEnd;
+                            }
                             else if (dtHireEdDayArray[i] != DateTime.MinValue
                                     && (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd))
                             {   // ??????????????I????????????
                                 dtMax = dtCurDefaultEnd;
+                            }
                             else
                             {   // ??O?????
                                 dtMax = DateTime.Today.Date;
+                            }
+                        }
                         // ???^????
                         int workSalary = CalcElapsedSalary(dtStart, dtEnd, PersonCDArray[i], SalaryArray[i]);
                         int workSalary = CalcElapsedSalary(dtStart, dtMax, PersonCDArray[i], SalaryArray[i]);
                         // ??v???Z
                         if (workSalary > 0) TotalSalary += workSalary;
                         // Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
                         // ?v?Z?J?n?I????????????
                         if (dtStart < dtDispStart) dtDispStart = dtStart;
                         if (dtDispComplate < dtMax) dtDispComplate = dtMax;
+                    }
                     // ----- ?\??????
                     // ?U?????^???z?E?????v???z?E?e???v???z??
                     ProfitGeneral(DepartmentCode, 0, ref OnSalary, ref  NetIncome, ref  NonSalary);
-...
             /// <returns></returns>
             private int CalcElapsedSalary(DateTime dtStart, DateTime dtLast, int PersonCode, int Salary)
+            {
                 IOMPersonSalary SalDB = new IOMPersonSalary();
                 try
+                {
                     // ???????????????
                     int WorkingDay = ClsCalendar.CalcPassedDaysCount(dtStart, dtLast);
                     int RetSalary = 0;
                     // ???^??
                     int MonthlyPay = CommonMotions.cnvRound(Salary * CommonDefine.s_SalaryCorrection);
                     string strSQL = "SELECT AX.hiduke,";
                     strSQL += string.Format(" ROUND((AX.salary * {0})/ {1}),", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
                     strSQL += " MAX(AX.StartD) FROM";
                     strSQL += " (SELECT A.d hiduke, B.MonthlySalary salary, B.STARTDATE StartD FROM";
                     // ?????v?Z
                     double daylySalary = CommonMotions.cnvRound(MonthlyPay / CommonDefine.s_ManHourUnitMonth);
                     strSQL += " (SELECT A1.years, A2.month, A3.days, DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) AS d";
                     strSQL += " FROM yearmaster AS A1, monthmaster AS A2, daymaster AS A3";
                     // ?o????^?v?Z
                     int RetSalary =CommonMotions.cnvRound(WorkingDay * daylySalary);
                     strSQL += " WHERE";
                     if (dtStart.Year == dtLast.Year)
+                    {
                         strSQL += string.Format(" (A1.years = {0} AND A2.month IN(", dtStart.Year.ToString("0000"));
                         for (int i = dtStart.Month; i <= dtLast.Month; i++)
+                        {
                             if (i != dtStart.Month) strSQL += ", ";
                             strSQL += string.Format("{0} ", i);
+                        }
                         strSQL += "))";
+                    }
                     else
+                    {
                         strSQL += string.Format(" ((A1.years = {0} AND A2.month IN(", dtStart.Year.ToString("0000"));
                         for (int i = dtStart.Month; i <= 12; i++)
+                        {
                             if (i != dtStart.Month) strSQL += ", ";
                             strSQL += string.Format("{0} ", i);
+                        }
                         strSQL += "))";
                         strSQL += string.Format(" OR (A1.years = {0} AND A2.month IN(", dtLast.Year.ToString("0000"));
                         for (int i = 1; i <= dtLast.Month; i++)
+                        {
                             if (i != 1) strSQL += ", ";
                             strSQL += string.Format("{0} ", i);
+                        }
                         strSQL += ")))";
+                    }
                     strSQL += " AND DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) IS NOT NULL";
                     strSQL += " ORDER BY d) A";
                     strSQL += ", PERSONSALARYMASTER AS B";
                     strSQL += " WHERE B.STARTDATE <= A.d";
                     strSQL += string.Format(" AND B.PERSONCODE = {0}", PersonCode);
                     strSQL += " ORDER BY A.d, B.STARTDATE DESC) AS AX";
                     strSQL += " GROUP BY AX.hiduke";
                     strSQL += " ORDER BY AX.hiduke";
                     ArrayList ArData = new ArrayList();
                     SalDB.ExecuteReader(strSQL, ref ArData);
                     foreach (object[] objRec in ArData)
+                    {
                         RetSalary += CommonMotions.cnvInt(objRec[1]);
+                    }
                     return RetSalary;
+                }
                 catch (Exception ex)
-...
                     logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
                     return 0;
+                }
                 finally
+                {
                     SalDB.close(); SalDB = null;
+                }
+            }
             #endregion

branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
4523	4523	DetailRec.ConstructionCode = LargeList[iy].ConstructionCode;
4524	4524	DetailRec.ComponentCode = LargeList[iy].ComponentCode;
4525	4525	DetailRec.ItemName = LargeList[iy].ItemName;
	4526	DetailRec.SpecName = LargeList[iy].SpecName;
4526	4527	DetailRec.UnitCount = 1.0;
4527	4528	DetailRec.UnitName = "式";
4528	4529	DetailRec.LineTotal = LargeList[iy].PriceValue;

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

プロジェクト

全般

プロフィール

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

リビジョン 115