リビジョン 226
部署まとめ不具合修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 50;
|
|
| 17 |
public static int s_SystemVersion = 51;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
|---|---|---|
| 1676 | 1676 |
{
|
| 1677 | 1677 |
try |
| 1678 | 1678 |
{
|
| 1679 |
if (StartDate == DateTime.MinValue)
|
|
| 1679 |
if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 1680 | 1680 |
{
|
| 1681 |
StartDate = HireStartDate; |
|
| 1682 |
} |
|
| 1683 |
else if (dtDefaultStart < StartDate) |
|
| 1684 |
{
|
|
| 1681 | 1685 |
StartDate = dtDefaultStart; |
| 1682 | 1686 |
} |
| 1683 |
else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 1687 |
else if (StartDate == DateTime.MaxValue)
|
|
| 1684 | 1688 |
{
|
| 1685 |
StartDate = HireStartDate;
|
|
| 1689 |
StartDate = dtDefaultStart;
|
|
| 1686 | 1690 |
} |
| 1687 |
else if (dtDefaultStart < StartDate)
|
|
| 1691 |
else |
|
| 1688 | 1692 |
{
|
| 1689 | 1693 |
StartDate = dtDefaultStart; |
| 1690 | 1694 |
} |
| ... | ... | |
| 1692 | 1696 |
// ?????????????????????O?????????? |
| 1693 | 1697 |
if (CompDate.Date > DateTime.Today.Date) return; |
| 1694 | 1698 |
|
| 1695 |
if (CompDate == DateTime.MinValue) |
|
| 1696 |
{
|
|
| 1697 |
CompDate = dtDefaultEnd; |
|
| 1698 |
} |
|
| 1699 |
else if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod) |
|
| 1699 |
if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod) |
|
| 1700 | 1700 |
{ // ?O????O?????
|
| 1701 | 1701 |
CompDate = dtDefaultEnd; |
| 1702 | 1702 |
} |
| ... | ... | |
| 1705 | 1705 |
{ // ??????????????I????????????
|
| 1706 | 1706 |
CompDate = HireCompDate; |
| 1707 | 1707 |
} |
| 1708 |
else if (CompDate == DateTime.MinValue) |
|
| 1709 |
{
|
|
| 1710 |
CompDate = dtDefaultEnd; |
|
| 1711 |
} |
|
| 1708 | 1712 |
else |
| 1709 | 1713 |
{ // ??O?????
|
| 1710 | 1714 |
CompDate = DateTime.Today.Date; |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
|---|---|---|
| 398 | 398 |
{
|
| 399 | 399 |
try |
| 400 | 400 |
{
|
| 401 |
if (StartDate == DateTime.MinValue)
|
|
| 401 |
if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 402 | 402 |
{
|
| 403 |
StartDate = HireStartDate; |
|
| 404 |
} |
|
| 405 |
else if (dtDefaultStart < StartDate) |
|
| 406 |
{
|
|
| 403 | 407 |
StartDate = dtDefaultStart; |
| 404 | 408 |
} |
| 405 |
else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
|
|
| 409 |
else if (StartDate == DateTime.MaxValue)
|
|
| 406 | 410 |
{
|
| 407 |
StartDate = HireStartDate;
|
|
| 411 |
StartDate = dtDefaultStart;
|
|
| 408 | 412 |
} |
| 409 |
else if (dtDefaultStart < StartDate)
|
|
| 413 |
else |
|
| 410 | 414 |
{
|
| 411 | 415 |
StartDate = dtDefaultStart; |
| 412 | 416 |
} |
| 413 | 417 |
|
| 418 |
|
|
| 414 | 419 |
// ?????????????????????O?????????? |
| 415 | 420 |
if (CompDate.Date > DateTime.Today.Date) return; |
| 416 | 421 |
|
| 417 |
if (CompDate == DateTime.MinValue) |
|
| 418 |
{
|
|
| 419 |
CompDate = dtDefaultEnd; |
|
| 420 |
} |
|
| 421 |
else if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod) |
|
| 422 |
if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod) |
|
| 422 | 423 |
{ // ?O????O?????
|
| 423 | 424 |
CompDate = dtDefaultEnd; |
| 424 | 425 |
} |
| ... | ... | |
| 427 | 428 |
{ // ??????????????I????????????
|
| 428 | 429 |
CompDate = HireCompDate; |
| 429 | 430 |
} |
| 431 |
else if (CompDate == DateTime.MinValue) |
|
| 432 |
{
|
|
| 433 |
CompDate = dtDefaultEnd; |
|
| 434 |
} |
|
| 430 | 435 |
else |
| 431 | 436 |
{ // ??O?????
|
| 432 | 437 |
CompDate = DateTime.Today.Date; |
| ... | ... | |
| 1219 | 1224 |
} |
| 1220 | 1225 |
|
| 1221 | 1226 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1222 |
//if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
|
| 1227 |
if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
|
| 1223 | 1228 |
|
| 1224 | 1229 |
ArrayList arList = new ArrayList(); |
| 1225 | 1230 |
if (!LedgerlDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
| ... | ... | |
| 1340 | 1345 |
|
| 1341 | 1346 |
// ----- ?o????^?\???i?w?b?_?[??\???j |
| 1342 | 1347 |
SetPayrollData(PersonCDArray, dtDefaultStart, dtDefaultEnd, |
| 1343 |
dtStartArray, dtCompArray, |
|
| 1344 |
SalaryArray, dtMaxCompArray, |
|
| 1348 |
dtStartArray, dtMaxCompArray, |
|
| 1345 | 1349 |
dtHireStDayArray, dtHireEdDayArray, SalaryDB); |
| 1346 | 1350 |
|
| 1347 | 1351 |
// ProgressBar??l???X???? |
| ... | ... | |
| 1724 | 1728 |
/// ??????o????^??\?????? |
| 1725 | 1729 |
/// </summary> |
| 1726 | 1730 |
private void SetPayrollData(List<int> PersonCDArray, DateTime dtDefaultStart, DateTime dtDefaultEnd, |
| 1727 |
List<DateTime> dtStartArray, List<DateTime> dtCompArray, |
|
| 1728 |
List<int> SalaryArray, List<DateTime> dtMaxCompArray, |
|
| 1731 |
List<DateTime> dtStartArray, List<DateTime> dtMaxCompArray, |
|
| 1729 | 1732 |
List<DateTime> dtHireStDayArray, List<DateTime> dtHireEdDayArray, |
| 1730 | 1733 |
IOMPersonInCharge SalaryDB) |
| 1731 | 1734 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.50")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.50")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.51")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.51")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff