リビジョン 349
工事情報入力：部署セットバグ再度修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 199;
|
|
| 17 |
public static int s_SystemVersion = 200;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs | ||
|---|---|---|
| 1445 | 1445 |
// *-----* ????????{?^????? *-----*
|
| 1446 | 1446 |
|
| 1447 | 1447 |
// ?R???{?{?b?N?X?C?x???g?Z?b?g
|
| 1448 |
SetcmbConstYearEvent(true); |
|
| 1448 | 1449 |
SetCmbDepartmentEvent(true); |
| 1449 | 1450 |
SetCmbPersonEvent(true); |
| 1450 | 1451 |
SetCmbOrdersDivEvent(true); |
| ... | ... | |
| 2001 | 2002 |
// ?????\?????????????? |
| 2002 | 2003 |
if (bInitFlg) return; |
| 2003 | 2004 |
|
| 2004 |
// ?????R???{?{?b?N?X?C?x???g?N???A
|
|
| 2005 |
// ?R???{?{?b?N?X?C?x???g?N???A
|
|
| 2005 | 2006 |
SetCmbDepartmentEvent(false); |
| 2007 |
SetCmbPersonEvent(false); |
|
| 2006 | 2008 |
|
| 2007 | 2009 |
ComboBox combObj = (ComboBox)sender; |
| 2008 | 2010 |
int SelDepCode = CommonMotions.cnvInt(combObj.SelectedValue); |
| ... | ... | |
| 2034 | 2036 |
SetcombBoxPerson(SelDepCode, combObj); |
| 2035 | 2037 |
} |
| 2036 | 2038 |
|
| 2037 |
// ?????R???{?{?b?N?X?C?x???g?Z?b?g
|
|
| 2039 |
// ?R???{?{?b?N?X?C?x???g?Z?b?g
|
|
| 2038 | 2040 |
SetCmbDepartmentEvent(true); |
| 2041 |
SetCmbPersonEvent(true); |
|
| 2039 | 2042 |
} |
| 2040 | 2043 |
#endregion |
| 2041 | 2044 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
|---|---|---|
| 2086 | 2086 |
IOMPersonInCharge picDB = new IOMPersonInCharge(); |
| 2087 | 2087 |
try |
| 2088 | 2088 |
{
|
| 2089 |
comb.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged); |
|
| 2090 | 2089 |
int nBeforeCode = 0; |
| 2091 | 2090 |
if (PersonCode > 0) |
| 2092 | 2091 |
nBeforeCode = PersonCode; |
| 2093 | 2092 |
else |
| 2094 | 2093 |
nBeforeCode = CommonMotions.cnvInt(comb.SelectedValue); |
| 2095 | 2094 |
|
| 2096 |
|
|
| 2097 | 2095 |
comb.DataSource = null; |
| 2098 | 2096 |
comb.Items.Clear(); |
| 2099 | 2097 |
comb.Text = ""; |
| ... | ... | |
| 2141 | 2139 |
finally |
| 2142 | 2140 |
{
|
| 2143 | 2141 |
picDB.close(); picDB = null; |
| 2144 |
comb.SelectedIndexChanged += new EventHandler(cmbPerson_SelectedIndexChanged); |
|
| 2145 | 2142 |
} |
| 2146 | 2143 |
} |
| 2147 | 2144 |
#endregion |
| 2148 | 2145 |
|
| 2149 |
|
|
| 2150 | 2146 |
#region ?S????R???{?{?b?N?X?Z?b?g?????????Z?b?g????
|
| 2151 | 2147 |
/// <summary> |
| 2152 | 2148 |
/// ?S????R???{?{?b?N?X?Z?b?g?????????Z?b?g????
|
| ... | ... | |
| 2652 | 2648 |
{
|
| 2653 | 2649 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 2654 | 2650 |
} |
| 2655 |
finally |
|
| 2656 |
{
|
|
| 2657 |
cmbConstructionPeriod.SelectedIndexChanged += new EventHandler(cmbYear_SelectedIndexChanged); |
|
| 2658 |
} |
|
| 2659 | 2651 |
} |
| 2660 | 2652 |
#endregion |
| 2661 | 2653 |
|
| ... | ... | |
| 3036 | 3028 |
SetDepartmentCombbox(); // ???? |
| 3037 | 3029 |
SetcmbPersonInCharge(); // ?S????R???{?{?b?N?X?Z?b?g
|
| 3038 | 3030 |
|
| 3039 |
SetCmbPersonEvent(true);
|
|
| 3031 |
// ?S???????????Z?b?g
|
|
| 3040 | 3032 |
SavePersonCode(ref SaveCode, false); |
| 3033 |
SetPerosonToDepartment(cmbSalesPerson); |
|
| 3034 |
SetPerosonToDepartment(cmbSalesSubPerson); |
|
| 3035 |
SetPerosonToDepartment(cmbConstrPerson); |
|
| 3036 |
SetPerosonToDepartment(cmbConstrSubPerson); |
|
| 3037 |
SetPerosonToDepartment(cmbConstrInst); |
|
| 3041 | 3038 |
|
| 3039 |
|
|
| 3042 | 3040 |
// ?R???{?{?b?N?X?C?x???g?Z?b?g
|
| 3043 | 3041 |
SetCmbDepartmentEvent(true); |
| 3044 |
|
|
| 3042 |
SetCmbPersonEvent(true); |
|
| 3045 | 3043 |
} |
| 3046 | 3044 |
catch (Exception ex) |
| 3047 | 3045 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.1.199")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.199")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.200")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.200")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff