プロジェクト

全般

プロフィール

リビジョン 128

堀内7年以上前に追加

ログインタイトル修正
メニュー起動追加
部署。台帳まとめ一覧経過給与取得SQL修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
2058 2058

  
2059 2059
                //// ?o????^?v?Z
2060 2060
                //int RetSalary = CommonMotions.cnvRound(WorkingDay * daylySalary);
2061
                int RetSalary = 0;
2062 2061

  
2063
                string strSQL = "SELECT * FROM";
2062
                //string strSQL = "SELECT * FROM";
2063
                string strSQL = "SELECT SUM(SALARY) FROM";
2064

  
2064 2065
                strSQL += " (SELECT AX.DT,";
2065
                strSQL += string.Format(" ROUND((A.MONTHLYSALARY * {0})/ {1}),", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
2066
                //strSQL += string.Format(" ROUND((A.MONTHLYSALARY * {0})/ {1}),", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
2067
                strSQL += string.Format(" ROUND((A.MONTHLYSALARY * {0})/ {1}) SALARY,", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
2068
                
2066 2069
                strSQL += " row_number() OVER(PARTITION BY AX.DT ORDER BY A.STARTDATE DESC) row_num";
2067 2070
                strSQL += " FROM PERSONSALARYMASTER A,";
2068 2071
                strSQL += " (SELECT TO_CHAR((st + ROWNUM - 1), 'YYYY/MM/DD') DT";
......
2075 2078
                ArrayList ArData = new ArrayList();
2076 2079
                SalDB.ExecuteReader(strSQL, ref ArData);
2077 2080

  
2081
                // ?o????^?v?Z
2082
                int RetSalary = 0;
2078 2083
                foreach (object[] objRec in ArData)
2079 2084
                {
2080
                    RetSalary += CommonMotions.cnvInt(objRec[1]);
2085
                    RetSalary += CommonMotions.cnvInt(objRec[0]);
2081 2086
                }
2082 2087

  
2083 2088
                return RetSalary;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
1829 1829

  
1830 1830
                //// ?o????^?v?Z
1831 1831
                //int RetSalary =CommonMotions.cnvRound(WorkingDay * daylySalary);
1832
                int RetSalary = 0;
1833 1832

  
1834
                string strSQL = "SELECT * FROM";
1833
                //string strSQL = "SELECT * FROM";
1834
                string strSQL = "SELECT SUM(SALARY) FROM";
1835
                
1835 1836
                strSQL += " (SELECT AX.DT,";
1836
                strSQL += string.Format(" ROUND((A.MONTHLYSALARY * {0})/ {1}),", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
1837
                //strSQL += string.Format(" ROUND((A.MONTHLYSALARY * {0})/ {1}),", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
1838
                strSQL += string.Format(" ROUND((A.MONTHLYSALARY * {0})/ {1}) SALARY,", CommonDefine.s_SalaryCorrection, CommonDefine.s_ManHourUnitMonth);
1839

  
1837 1840
                strSQL += " row_number() OVER(PARTITION BY AX.DT ORDER BY A.STARTDATE DESC) row_num";
1838 1841
                strSQL += " FROM PERSONSALARYMASTER A,";
1839 1842
                strSQL += " (SELECT TO_CHAR((st + ROWNUM - 1), 'YYYY/MM/DD') DT";
......
1846 1849
                ArrayList ArData = new ArrayList();
1847 1850
                SalDB.ExecuteReader(strSQL, ref ArData);
1848 1851

  
1852
                // ?o????^?v?Z
1853
                int RetSalary = 0;
1849 1854
                foreach (object[] objRec in ArData)
1850 1855
                {
1851
                    RetSalary += CommonMotions.cnvInt(objRec[1]);
1856
                    RetSalary += CommonMotions.cnvInt(objRec[0]);
1852 1857
                }
1853 1858

  
1854 1859
                return RetSalary;
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.cs
270 270
            {
271 271
                // ------ ファイル情報取得
272 272
                m_VersionInfo = FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
273

  
273 274
                // タイトルの表示
274
                // タイトルの表示
275
                lblTitle.AutoSize = true;
275 276
                lblTitle.Text = "";
276 277
                for (int i = 0; i < m_VersionInfo.ProductName.Length; i++)
277 278
                {
......
281 282

  
282 283
                lblTitle.Text += " ロ グ イ ン";
283 284

  
285
                Point TitlePoint = lblTitle.Location;
286
                Size TitleSize = lblTitle.Size;
287
                
288
                lblTitle.AutoSize = false;
289
                TitleSize.Height += 10;
290
                TitleSize.Width += 20;
291
                lblTitle.Size = TitleSize;
292
                TitlePoint.X -= 10;
293
                lblTitle.Location = TitlePoint;
294

  
284 295
                // コンボボックス初期処理
285 296
                SetPersonInChargeCombBox();
286 297

  
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.designer.cs
73 73
            // 
74 74
            // lblTitle
75 75
            // 
76
            this.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top;
77
            this.lblTitle.AutoSize = true;
76 78
            this.lblTitle.BackColor = System.Drawing.Color.Black;
77 79
            this.lblTitle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
78 80
            this.lblTitle.Font = new System.Drawing.Font("AR丸ゴシック体E", 14.25F);
79 81
            this.lblTitle.ForeColor = System.Drawing.Color.White;
80
            this.lblTitle.Location = new System.Drawing.Point(190, 6);
82
            this.lblTitle.Location = new System.Drawing.Point(195, 6);
81 83
            this.lblTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
82 84
            this.lblTitle.Name = "lblTitle";
83
            this.lblTitle.Size = new System.Drawing.Size(400, 22);
85
            this.lblTitle.Size = new System.Drawing.Size(391, 21);
84 86
            this.lblTitle.TabIndex = 7;
85 87
            this.lblTitle.Text = "現 場 監 督 秘 書 ロ グ イ ン";
86 88
            this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
88 90
            // label2
89 91
            // 
90 92
            this.label2.AutoSize = true;
91
            this.label2.Location = new System.Drawing.Point(196, 37);
93
            this.label2.Location = new System.Drawing.Point(196, 50);
92 94
            this.label2.Name = "label2";
93 95
            this.label2.Size = new System.Drawing.Size(75, 15);
94 96
            this.label2.TabIndex = 8;
......
98 100
            // 
99 101
            this.cmbUserList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
100 102
            this.cmbUserList.FormattingEnabled = true;
101
            this.cmbUserList.Location = new System.Drawing.Point(278, 34);
103
            this.cmbUserList.Location = new System.Drawing.Point(278, 46);
102 104
            this.cmbUserList.Name = "cmbUserList";
103 105
            this.cmbUserList.Size = new System.Drawing.Size(224, 23);
104 106
            this.cmbUserList.TabIndex = 9;
......
106 108
            // txtPassWord
107 109
            // 
108 110
            this.txtPassWord.ImeMode = System.Windows.Forms.ImeMode.On;
109
            this.txtPassWord.Location = new System.Drawing.Point(278, 66);
111
            this.txtPassWord.Location = new System.Drawing.Point(278, 80);
110 112
            this.txtPassWord.Name = "txtPassWord";
111 113
            this.txtPassWord.Size = new System.Drawing.Size(224, 22);
112 114
            this.txtPassWord.TabIndex = 10;
......
115 117
            // label3
116 118
            // 
117 119
            this.label3.AutoSize = true;
118
            this.label3.Location = new System.Drawing.Point(179, 69);
120
            this.label3.Location = new System.Drawing.Point(179, 84);
119 121
            this.label3.Name = "label3";
120 122
            this.label3.Size = new System.Drawing.Size(92, 15);
121 123
            this.label3.TabIndex = 8;
......
138 140
            this.lblSlogan.BackColor = System.Drawing.Color.Transparent;
139 141
            this.lblSlogan.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
140 142
            this.lblSlogan.Font = new System.Drawing.Font("MS 明朝", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
141
            this.lblSlogan.Location = new System.Drawing.Point(100, 111);
143
            this.lblSlogan.Location = new System.Drawing.Point(100, 120);
142 144
            this.lblSlogan.Name = "lblSlogan";
143 145
            this.lblSlogan.Size = new System.Drawing.Size(580, 60);
144 146
            this.lblSlogan.TabIndex = 12;
trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
1393 1393
  </ItemGroup>
1394 1394
  <ItemGroup>
1395 1395
    <Folder Include="DB\SqlServerCompact\" />
1396
    <Folder Include="Forms\SystemFrm\" />
1397 1396
    <Folder Include="Utility\" />
1398 1397
  </ItemGroup>
1399 1398
  <ItemGroup>
trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("0.0.0.0")]
36
[assembly: AssemblyFileVersion("0.9.9.26")]
35
[assembly: AssemblyVersion("1.0.0.27")]
36
[assembly: AssemblyFileVersion("1.0.0.27")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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