プロジェクト

全般

プロフィール

リビジョン 233

堀内7年以上前に追加

管理マスタ・担当者マスタ項目追加
工事情報:請求・入金情報表示処理追加中
会社休日マスタ:営業期表示
出勤日報距離等マスタより取得に変更
請求まとめ入力協力会社コード表示のカラムフォント・幅、登録時メッセージ変更

差分を表示:

branches/ddl/20170712_SQL.txt
1
DROP TABLE IF EXISTS personinchargemaster_OLD;
2
CREATE TABLE personinchargemaster_OLD As Select * from personinchargemaster;
3

  
4
drop index PersonInChargeMaster_Index1 on personinchargemaster;
5
drop index PersonInChargeMaster_Index2 on personinchargemaster;
6

  
7
drop table if exists personinchargemaster cascade;
8

  
9
create table personinchargemaster (
10
  PersonCode decimal(8,0) unsigned not null comment '?S????R?[?h'
11
  , DisplayOrder decimal(8,0) unsigned not null comment '?\????'
12
  , PersonName varchar(60) not null comment '?S?????'
13
  , StartDate date not null comment '?g?p?J?n?N????'
14
  , EndDate date comment '?g?p?I???N????'
15
  , PassWord varchar(16) comment '?p?X???[?h'
16
  , SecurityManagement decimal(1,0) not null comment '?@????'
17
  , SecCode decimal(2,0) unsigned not null comment '???????'
18
  , MsgBackColor varchar(8) comment '???b?Z?[?W?w?i?F'
19
  , DisplayString varchar(20) comment '?\???E???????'
20
  , DepartmentCode decimal(5,0) unsigned comment '?????R?[?h'
21
  , MonthlySalary decimal(11,0) not null comment '???????z'
22
  , YearSalary decimal(12,0) not null comment '?N????z'
23
  , Qualification varchar(120) comment '???i?????'
24
  , SealPrintName varchar(5) comment '???\????'
25
  , EmployeeClassFlg decimal(1,0) not null comment '?????'
26
  , LedgerFlg decimal(1,0) not null comment '???v?Z???t???O'
27
  , CommutingDistance decimal(5,2) not null comment '??????'
28
  , CommuteCosts decimal(5,0) not null comment '??????'
29
  , DeleteFlg decimal(1,0) not null comment '???t???O'
30
  , EntryDate datetime not null comment '?o?^???t'
31
  , UpdateDate datetime not null comment '?X?V???t'
32
  , constraint personinchargemaster_PKC primary key (PersonCode)
33
) comment '?S????}?X?^' ;
34

  
35
create index PersonInChargeMaster_Index1
36
  on personinchargemaster(StartDate);
37

  
38
create index PersonInChargeMaster_Index2
39
  on personinchargemaster(DepartmentCode);
40

  
41
Insert INTO personinchargemaster
42
SELECT
43
  PersonCode
44
  , DisplayOrder
45
  , PersonName
46
  , StartDate
47
  , EndDate
48
  , PassWord
49
  , SecurityManagement
50
  , SecCode
51
  , MsgBackColor
52
  , DisplayString
53
  , DepartmentCode
54
  , MonthlySalary
55
  , YearSalary
56
  , Qualification
57
  , SealPrintName
58
  , EmployeeClassFlg
59
  , LedgerFlg
60
  , 0
61
  , 0
62
  , DeleteFlg
63
  , EntryDate
64
  , UpdateDate
65
FROM personinchargemaster_OLD
66
;
67
commit;
68

  
69
DROP TABLE IF EXISTS SystemMaster_OLD;
70
CREATE TABLE SystemMaster_OLD As Select * from SystemMaster;
71
DROP TABLE IF EXISTS SystemMaster;
72

  
73
-- ????}?X?^
74
CREATE TABLE SystemMaster
75
(
76
  SystemCode decimal(3,0) unsigned not null comment '???R?[?h'
77
  , CompanyName1 varchar(60) not null comment '?????P'
78
  , CompanyName2 varchar(60) comment '?????Q'
79
  , CEOName varchar(60) not null comment '??\?????'
80
  , CEOPositionName varchar(60) comment '??\???E??'
81
  , ZipCode varchar(8) not null comment '?X????'
82
  , Address1 varchar(60) not null comment '?Z???P'
83
  , Address2 varchar(60) comment '?Z??2'
84
  , Address3 varchar(60) comment '?Z??3'
85
  , PhoneNumber varchar(13) not null comment '?d?b???'
86
  , FaxNumber varchar(13) comment 'FAX???'
87
  , HomePageURL varchar(120) comment '?z?[???y?[?WURL'
88
  , ConstructionExpenses decimal(4,2) not null comment '?H?????o??'
89
  , OfficeExpenses decimal(4,2) not null comment '???????o??'
90
  , OperatingExpenses decimal(4,2) not null comment '?c??o??'
91
  , ConsumptionTax decimal(4,2) not null comment '?????'
92
  , CooperationRate decimal(4,2) not null comment '???????'
93
  , StatutoryWelfareRate decimal(4,2) not null comment '?@???????'
94
  , FuelPrice decimal(5,2) NOT NULL COMMENT '?R???L???P??'
95
  , AreaDistance decimal(5,2) NOT NULL COMMENT '????u????????'
96
  , ExcelSavePath varchar(120) comment 'Excel????p?X'
97
  , BusinessPeriod smallint(6) not null comment '????c?????'
98
  , ConstructionYear smallint(6) not null comment '????H???N?x'
99
  , BusinessBeginningDate varchar(5) not null comment '?c????????'
100
  , ConstructionBeginningDate varchar(5) not null comment '?H???N?x?????'
101
  , ConstructionNoBase decimal(1,0) not null comment '?H????????l'
102
  , SloganString1 varchar(100) comment '?W??1'
103
  , SloganString2 varchar(100) comment '?W??2'
104
  , SloganString3 varchar(100) comment '?W??3'
105
  , EntryDate datetime not null comment '?o?^???t'
106
  , UpdateDate datetime not null comment '?X?V???t'
107
  , constraint systemmaster_PKC primary key (SystemCode)
108
) COMMENT = '????}?X?^';
109

  
110
Insert INTO SystemMaster
111
SELECT
112
  SystemCode
113
  , CompanyName1
114
  , CompanyName2
115
  , CEOName
116
  , CEOPositionName
117
  , ZipCode
118
  , Address1
119
  , Address2
120
  , Address3
121
  , PhoneNumber
122
  , FaxNumber
123
  , HomePageURL
124
  , ConstructionExpenses
125
  , OfficeExpenses
126
  , OperatingExpenses
127
  , ConsumptionTax
128
  , CooperationRate
129
  , StatutoryWelfareRate
130
  , 0
131
  , 0
132
  , ExcelSavePath
133
  , BusinessPeriod
134
  , ConstructionYear
135
  , BusinessBeginningDate
136
  , ConstructionBeginningDate
137
  , ConstructionNoBase
138
  , SloganString1
139
  , SloganString2
140
  , SloganString3
141
  , EntryDate
142
  , UpdateDate
143
FROM SystemMaster_OLD
144
;
145
commit;
146

  
147
insert 
148
into approvalmaster( 
149
  SELECT
150
    11
151
    , DepartmentCode
152
    , SeqNo
153
    , DisplayOrder
154
    , ApprovalPerson
155
    , ApprovalAuthority
156
    , EntryDate
157
    , UpdateDate 
158
  FROM
159
    approvalmaster 
160
  where
161
    ApprovalCode = 99
162
); 
163

  
164
insert 
165
into approvalmaster( 
166
  SELECT
167
    12
168
    , DepartmentCode
169
    , SeqNo
170
    , DisplayOrder
171
    , ApprovalPerson
172
    , ApprovalAuthority
173
    , EntryDate
174
    , UpdateDate 
175
  FROM
176
    approvalmaster 
177
  where
178
    ApprovalCode = 99
179
); 
180

  
181
delete 
182
from
183
  approvalmaster 
184
where
185
  ApprovalCode >= 98; 
186

  
187
commit; 
188

  
branches/ddl/ProcessManagement.sql
1654 1654
  , SealPrintName varchar(5) comment '印鑑表示名'
1655 1655
  , EmployeeClassFlg decimal(1,0) not null comment '社員区分'
1656 1656
  , LedgerFlg decimal(1,0) not null comment '台帳計算対象フラグ'
1657
  , CommutingDistance decimal(5,2) not null comment '通勤距離'
1658
  , CommuteCosts decimal(5,0) not null comment '通勤交通費'
1657 1659
  , DeleteFlg decimal(1,0) not null comment '削除フラグ'
1658 1660
  , EntryDate datetime not null comment '登録日付'
1659 1661
  , UpdateDate datetime not null comment '更新日付'
......
2275 2277
  , ConsumptionTax decimal(4,2) not null comment '消費税'
2276 2278
  , CooperationRate decimal(4,2) not null comment '協力金比率'
2277 2279
  , StatutoryWelfareRate decimal(4,2) not null comment '法定福利費比率'
2280
  , FuelPrice decimal(5,2) NOT NULL COMMENT '燃料キロ単価'
2281
  , AreaDistance decimal(5,2) NOT NULL COMMENT '資材置場移動距離'
2278 2282
  , ExcelSavePath varchar(120) comment 'Excel保存パス'
2279 2283
  , BusinessPeriod smallint(6) not null comment '現在営業期数'
2280 2284
  , ConstructionYear smallint(6) not null comment '現在工事年度'
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 54;
17
        public static int s_SystemVersion = 55;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMPersonInCharge.cs
51 51
            SealPrintName,
52 52
            EmployeeClassFlg,
53 53
            LedgerFlg,
54
            CommutingDistance,
55
            CommuteCosts,
54 56
            DeleteFlg,
55 57
            EntryDate,
56 58
            UpdateDate,
......
78 80
        /// <returns>true:成功 false:失敗</returns>
79 81
        private string CreateSelectSQL()
80 82
        {
81
            string strcmd = "SELECT";
82
            strcmd += "  PersonCode";
83
            strcmd += ", DisplayOrder";
84
            strcmd += ", PersonName";
83
            StringBuilder strcmd = new StringBuilder();
84
            strcmd.Append("SELECT");
85
            strcmd.Append("  PersonCode");
86
            strcmd.Append(", DisplayOrder");
87
            strcmd.Append(", PersonName");
85 88

  
86
            strcmd += ", DATE_FORMAT(StartDate, '%Y/%m/%d')";
87
            strcmd += ", DATE_FORMAT(EndDate, '%Y/%m/%d')";
88
            strcmd += ", PassWord";
89
            strcmd += ", SecurityManagement";
90
            strcmd += ", SecCode";
91
            strcmd += ", MsgBackColor";
92
            strcmd += ", DisplayString";
93
            strcmd += ", DepartmentCode";
94
            strcmd += ", MonthlySalary";
95
            strcmd += ", YearSalary";
96
            strcmd += ", Qualification";
97
            strcmd += ", SealPrintName";
98
            strcmd += ", EmployeeClassFlg";
99
            strcmd += ", LedgerFlg";
89
            strcmd.Append(", DATE_FORMAT(StartDate, '%Y/%m/%d')");
90
            strcmd.Append(", DATE_FORMAT(EndDate, '%Y/%m/%d')");
91
            strcmd.Append(", PassWord");
92
            strcmd.Append(", SecurityManagement");
93
            strcmd.Append(", SecCode");
94
            strcmd.Append(", MsgBackColor");
95
            strcmd.Append(", DisplayString");
96
            strcmd.Append(", DepartmentCode");
97
            strcmd.Append(", MonthlySalary");
98
            strcmd.Append(", YearSalary");
99
            strcmd.Append(", Qualification");
100
            strcmd.Append(", SealPrintName");
101
            strcmd.Append(", EmployeeClassFlg");
102
            strcmd.Append(", LedgerFlg");
103
            strcmd.Append(", CommutingDistance");
104
            strcmd.Append(", CommuteCosts");
105
            strcmd.Append(", DeleteFlg");
106
            strcmd.Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
107
            strcmd.Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
108
            strcmd.Append(" FROM PersonInChargeMaster");
100 109

  
101
            strcmd += ", DeleteFlg";
102
            strcmd += ", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')";
103
            strcmd += ", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')";
104
            strcmd += " FROM PersonInChargeMaster";
105

  
106
            return strcmd;
110
            return strcmd.ToString();
107 111
        }
108 112
        #endregion
109 113

  
......
118 122
        public bool SelectAction(string AddSQLString, ref List<PersonInChargeMaster> data, bool bConnect = true)
119 123
        {
120 124
            // インターフェース
121
            string strcmd = "";
125
            StringBuilder strcmd = new StringBuilder();;
122 126
            ArrayList arData = new ArrayList();
123 127

  
124 128
            try
125 129
            {
126 130
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
127
                strcmd = CreateSelectSQL() + AddSQLString;
131
                strcmd.Append(CreateSelectSQL());
132
                strcmd.Append(AddSQLString);
128 133

  
129 134
                // SQL実行
130
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
135
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
131 136

  
132 137
                // データセット
133 138
                foreach (object[] objwrk in arData)
......
141 146
            }
142 147
            catch (Exception ex)
143 148
            {
144
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
149
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
145 150
                return false;
146 151
            }
147 152
        }
......
158 163
        public bool SelectAction(string AddSQLString, ref PersonInChargeMaster data, bool bConnect = true)
159 164
        {
160 165
            // インターフェース
161
            string strcmd = "";
166
            StringBuilder strcmd = new StringBuilder();;
162 167
            ArrayList arData = new ArrayList();
163 168

  
164 169
            try
165 170
            {
166 171
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
167
                strcmd = CreateSelectSQL() + AddSQLString;
172
                strcmd.Append(CreateSelectSQL());
173
                strcmd.Append(AddSQLString);
168 174

  
169 175
                // SQL実行
170
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
176
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
171 177
                if (arData.Count == 0) return false;
172 178

  
173 179
                // データセット
......
178 184
            }
179 185
            catch (Exception ex)
180 186
            {
181
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
187
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
182 188
                return false;
183 189
            }
184 190
        }
......
192 198
        /// <returns>true:成功 false:失敗</returns>
193 199
        public bool InsertAction(List<PersonInChargeMaster> data, bool bConnect = true)
194 200
        {
195
            string strcmd = "";
201
            StringBuilder strcmd = new StringBuilder();;
196 202
            try
197 203
            {
198 204
                bool bColFirst = true;
199
                strcmd = "INSERT INTO PersonInChargeMaster";
200
                strcmd += " (";
205
                strcmd.Append("INSERT INTO PersonInChargeMaster");
206
                strcmd.Append(" (");
201 207
                foreach (var gender in Enum.GetValues(typeof(ColumnCnt)))
202 208
                {
203
                    if (!bColFirst) strcmd += ", ";
204
                    strcmd += gender.ToString();
209
                    if (!bColFirst) strcmd.Append(", ");
210
                    strcmd.Append(gender.ToString());
205 211
                    bColFirst = false;
206 212
                }
207
                strcmd += ") VALUES";
213
                strcmd.Append(") VALUES");
208 214

  
209 215
                bool bDataFirst = true;
210 216
                foreach (PersonInChargeMaster work in data)
211 217
                {
212
                    if (bDataFirst) strcmd += " (";
213
                    else strcmd += ", (";
218
                    if (bDataFirst) strcmd.Append(" (");
219
                    else strcmd.Append(", (");
214 220

  
215
                    strcmd += string.Format("  {0}", work.PersonCode);
216
                    strcmd += string.Format(", {0}", work.DisplayOrder);
217
                    strcmd += string.Format(", '{0}'", work.PersonName);
218
                    strcmd += string.Format(", STR_TO_DATE('{0}' ,'%Y/%m/%d')", work.StartDate.ToShortDateString());
219
                    strcmd += string.Format(", STR_TO_DATE('{0}' ,'%Y/%m/%d')", work.EndDate.ToShortDateString());
220
                    strcmd += string.Format(", '{0}'", work.PassWord);
221
                    strcmd += string.Format(", {0}", work.SecurityManagement);
222
                    strcmd += string.Format(", {0}", work.SecCode);
223
                    strcmd += string.Format(", '{0}'", work.MsgBackColor);
224
                    strcmd += string.Format(", '{0}'", work.DisplayString);
225
                    strcmd += string.Format(", {0}", work.DepartmentCode);
226
                    strcmd += string.Format(", {0}", work.MonthlySalary);
227
                    strcmd += string.Format(", {0}", work.YearSalary);
228
                    strcmd += string.Format(", '{0}'", work.Qualification);
229
                    strcmd += string.Format(", '{0}'", work.SealPrintName);
230
                    strcmd += string.Format(", {0}", work.EmployeeClassFlg);
231
                    strcmd += string.Format(", {0}", work.LedgerFlg);
232
                    strcmd += string.Format(", {0}", work.DeleteFlg);
221
                    strcmd.AppendFormat("  {0}", work.PersonCode);
222
                    strcmd.AppendFormat(", {0}", work.DisplayOrder);
223
                    strcmd.AppendFormat(", '{0}'", work.PersonName);
224
                    strcmd.AppendFormat(", STR_TO_DATE('{0}' ,'%Y/%m/%d')", work.StartDate.ToShortDateString());
225
                    strcmd.AppendFormat(", STR_TO_DATE('{0}' ,'%Y/%m/%d')", work.EndDate.ToShortDateString());
226
                    strcmd.AppendFormat(", '{0}'", work.PassWord);
227
                    strcmd.AppendFormat(", {0}", work.SecurityManagement);
228
                    strcmd.AppendFormat(", {0}", work.SecCode);
229
                    strcmd.AppendFormat(", '{0}'", work.MsgBackColor);
230
                    strcmd.AppendFormat(", '{0}'", work.DisplayString);
231
                    strcmd.AppendFormat(", {0}", work.DepartmentCode);
232
                    strcmd.AppendFormat(", {0}", work.MonthlySalary);
233
                    strcmd.AppendFormat(", {0}", work.YearSalary);
234
                    strcmd.AppendFormat(", '{0}'", work.Qualification);
235
                    strcmd.AppendFormat(", '{0}'", work.SealPrintName);
236
                    strcmd.AppendFormat(", {0}", work.EmployeeClassFlg);
237
                    strcmd.AppendFormat(", {0}", work.LedgerFlg);
238
                    strcmd.AppendFormat(", {0}", work.CommutingDistance);
239
                    strcmd.AppendFormat(", {0}", work.CommuteCosts);
240
                    strcmd.AppendFormat(", {0}", work.DeleteFlg);
233 241

  
234
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
235
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
236
                    strcmd += ")";
242
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
243
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
244
                    strcmd.Append(")");
237 245

  
238 246
                    bDataFirst = false;
239 247
                }
240 248

  
241
                if (!ExecuteNonQuery(strcmd, false)) return false;
249
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
242 250

  
243 251
                return true;
244 252
            }
245 253
            catch (Exception ex)
246 254
            {
247
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
255
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
248 256
                return false;
249 257
            }
250 258
        }
......
259 267
        /// <returns>true:成功 false:失敗</returns>
260 268
        public bool UpdateAction(string AddSQLString, PersonInChargeMaster data, bool bConnect = true)
261 269
        {
262
            string strcmd = "";
270
            StringBuilder strcmd = new StringBuilder();;
263 271
            try
264 272
            {
265 273

  
266
                strcmd = "UPDATE PersonInChargeMaster";
274
                strcmd.Append("UPDATE PersonInChargeMaster");
267 275

  
268
                strcmd += " SET";
276
                strcmd.Append(" SET");
269 277

  
270
                strcmd += string.Format("  PersonCode = {0}", data.PersonCode.ToString());
271
                strcmd += string.Format(", DisplayOrder = {0}", data.DisplayOrder.ToString());
272
                strcmd += string.Format(", PersonName = '{0}'", data.PersonName);
273
                strcmd += string.Format(", StartDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.StartDate.ToShortDateString());
274
                strcmd += string.Format(", EndDate = STR_TO_DATE('{0}','%Y/%m/%d')",data.EndDate.ToShortDateString());
275
                strcmd += string.Format(", PassWord = '{0}'", data.PassWord);
276
                strcmd += string.Format(", SecurityManagement = {0}", data.SecurityManagement.ToString());
277
                strcmd += string.Format(", SecCode = {0}", data.SecCode.ToString());
278
                strcmd += string.Format(", MsgBackColor = '{0}'", data.MsgBackColor);
279
                strcmd += string.Format(", DisplayString = '{0}'", data.DisplayString);
280
                strcmd += string.Format(", DepartmentCode = {0}", data.DepartmentCode.ToString());
281
                strcmd += string.Format(", MonthlySalary = {0}", data.MonthlySalary.ToString());
282
                strcmd += string.Format(", YearSalary = {0}", data.YearSalary.ToString());
283
                strcmd += string.Format(", Qualification = '{0}'", data.Qualification);
284
                strcmd += string.Format(", SealPrintName = '{0}'", data.SealPrintName);
285
                strcmd += string.Format(", EmployeeClassFlg = {0}", data.EmployeeClassFlg.ToString());
286
                strcmd += string.Format(", LedgerFlg = {0}", data.LedgerFlg);
278
                strcmd.AppendFormat("  PersonCode = {0}", data.PersonCode.ToString());
279
                strcmd.AppendFormat(", DisplayOrder = {0}", data.DisplayOrder.ToString());
280
                strcmd.AppendFormat(", PersonName = '{0}'", data.PersonName);
281
                strcmd.AppendFormat(", StartDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.StartDate.ToShortDateString());
282
                strcmd.AppendFormat(", EndDate = STR_TO_DATE('{0}','%Y/%m/%d')",data.EndDate.ToShortDateString());
283
                strcmd.AppendFormat(", PassWord = '{0}'", data.PassWord);
284
                strcmd.AppendFormat(", SecurityManagement = {0}", data.SecurityManagement.ToString());
285
                strcmd.AppendFormat(", SecCode = {0}", data.SecCode.ToString());
286
                strcmd.AppendFormat(", MsgBackColor = '{0}'", data.MsgBackColor);
287
                strcmd.AppendFormat(", DisplayString = '{0}'", data.DisplayString);
288
                strcmd.AppendFormat(", DepartmentCode = {0}", data.DepartmentCode.ToString());
289
                strcmd.AppendFormat(", MonthlySalary = {0}", data.MonthlySalary.ToString());
290
                strcmd.AppendFormat(", YearSalary = {0}", data.YearSalary.ToString());
291
                strcmd.AppendFormat(", Qualification = '{0}'", data.Qualification);
292
                strcmd.AppendFormat(", SealPrintName = '{0}'", data.SealPrintName);
293
                strcmd.AppendFormat(", EmployeeClassFlg = {0}", data.EmployeeClassFlg.ToString());
294
                strcmd.AppendFormat(", LedgerFlg = {0}", data.LedgerFlg);
295
                strcmd.AppendFormat(", CommutingDistance = {0}", data.CommutingDistance);
296
                strcmd.AppendFormat(", CommuteCosts = {0}", data.CommuteCosts);
287 297
                
288
                strcmd += string.Format(", DeleteFlg = {0}", data.DeleteFlg);
289
                strcmd += ", UpdateDate = NOW()";
290
                strcmd += AddSQLString;
298
                strcmd.AppendFormat(", DeleteFlg = {0}", data.DeleteFlg);
299
                strcmd.Append(", UpdateDate = NOW()");
300
                strcmd.Append(AddSQLString);
291 301

  
292
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
302
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
293 303

  
294 304
                return true;
295 305
            }
296 306
            catch (Exception ex)
297 307
            {
298
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
308
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
299 309
                return false;
300 310
            }
301 311
        }
......
311 321
        public bool DeleteAction(string AddSQLString, bool bConnect = true)
312 322
        {
313 323
            // インターフェース
314
            string strcmd = "";
324
            StringBuilder strcmd = new StringBuilder();;
315 325
            try
316 326
            {
317
                strcmd = string.Format("{0}{1}", "DELETE FROM PersonInChargeMaster", AddSQLString);
327
                strcmd.AppendFormat("{0}{1}", "DELETE FROM PersonInChargeMaster", AddSQLString);
318 328

  
319
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
329
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
320 330

  
321 331
                return true;
322 332
            }
323 333
            catch (Exception ex)
324 334
            {
325
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
335
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
326 336
                return false;
327 337
            }
328 338
        }
......
339 349
        /// <returns></returns>
340 350
        public bool UpdateFeild(int PersonCode, int FeildNo, object value, bool bConnect = true)
341 351
        {
342
            string strcmd = "";
352
            StringBuilder strcmd = new StringBuilder();;
343 353
            try
344 354
            {
345
                strcmd = "UPDATE PersonInChargeMaster";
355
                strcmd.Append("UPDATE PersonInChargeMaster");
346 356

  
347
                strcmd += " SET";
357
                strcmd.Append(" SET");
348 358
                switch (FeildNo)
349 359
                {
350 360
                    case (int)ColumnCnt.PersonCode:
351
                        strcmd += string.Format(" PersonCode = {0}", ((int)value).ToString());
361
                        strcmd.AppendFormat(" PersonCode = {0}", ((int)value).ToString());
352 362
                        break;
353 363
                    case (int)ColumnCnt.DisplayOrder:
354
                        strcmd += string.Format(" DisplayOrder = {0}", ((int)value).ToString());
364
                        strcmd.AppendFormat(" DisplayOrder = {0}", ((int)value).ToString());
355 365
                        break;
356 366
                    case (int)ColumnCnt.PersonName:
357
                        strcmd += string.Format(" PersonName = '{0}'", value.ToString());
367
                        strcmd.AppendFormat(" PersonName = '{0}'", value.ToString());
358 368
                        break;
359 369
                    case (int)ColumnCnt.StartDate:
360
                        strcmd += string.Format(" StartDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
370
                        strcmd.AppendFormat(" StartDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
361 371
                        break;
362 372
                    case (int)ColumnCnt.EndDate:
363
                        strcmd += string.Format(" EndDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
373
                        strcmd.AppendFormat(" EndDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
364 374
                        break;
365 375
                    case (int)ColumnCnt.PassWord:
366
                        strcmd += string.Format(" PassWord = '{0}'", value.ToString());
376
                        strcmd.AppendFormat(" PassWord = '{0}'", value.ToString());
367 377
                        break;
368 378
                    case (int)ColumnCnt.SecurityManagement:
369
                        strcmd += string.Format(" SecurityManagement = {0}", ((int)value).ToString());
379
                        strcmd.AppendFormat(" SecurityManagement = {0}", ((int)value).ToString());
370 380
                        break;
371 381
                    case (int)ColumnCnt.SecCode:
372
                        strcmd += string.Format(" SecCode = {0}", ((int)value).ToString());
382
                        strcmd.AppendFormat(" SecCode = {0}", ((int)value).ToString());
373 383
                        break;
374 384
                    case (int)ColumnCnt.MsgBackColor:
375
                        strcmd += string.Format(" MsgBackColor = '{0}'", value.ToString());
385
                        strcmd.AppendFormat(" MsgBackColor = '{0}'", value.ToString());
376 386
                        break;
377 387
                    case (int)ColumnCnt.DisplayString:
378
                        strcmd += string.Format(" DisplayString = '{0}'", value.ToString());
388
                        strcmd.AppendFormat(" DisplayString = '{0}'", value.ToString());
379 389
                        break;
380 390
                    case (int)ColumnCnt.DepartmentCode:
381
                        strcmd += string.Format(" DepartmentCode = {0}", ((int)value).ToString());
391
                        strcmd.AppendFormat(" DepartmentCode = {0}", ((int)value).ToString());
382 392
                        break;
383 393
                    case (int)ColumnCnt.MonthlySalary:
384
                        strcmd += string.Format(" MonthlySalary = {0}", ((double)value).ToString());
394
                        strcmd.AppendFormat(" MonthlySalary = {0}", ((double)value).ToString());
385 395
                        break;
386 396
                    case (int)ColumnCnt.YearSalary:
387
                        strcmd += string.Format(" YearSalary = {0}", ((double)value).ToString());
397
                        strcmd.AppendFormat(" YearSalary = {0}", ((double)value).ToString());
388 398
                        break;
389 399
                    case (int)ColumnCnt.Qualification:
390
                        strcmd += string.Format(" Qualification = '{0}'", value.ToString());
400
                        strcmd.AppendFormat(" Qualification = '{0}'", value.ToString());
391 401
                        break;
392 402
                    case (int)ColumnCnt.SealPrintName:
393
                        strcmd += string.Format(" SealPrintName = '{0}'", value.ToString());
403
                        strcmd.AppendFormat(" SealPrintName = '{0}'", value.ToString());
394 404
                        break;
395 405
                    case (int)ColumnCnt.EmployeeClassFlg:
396
                        strcmd += string.Format(" EmployeeClassFlg = {0}", ((int)value).ToString());
406
                        strcmd.AppendFormat(" EmployeeClassFlg = {0}", ((int)value).ToString());
397 407
                        break;
398 408
                    case (int)ColumnCnt.LedgerFlg:
399
                        strcmd += string.Format(" LedgerFlg = {0}", ((int)value).ToString());
409
                        strcmd.AppendFormat(" LedgerFlg = {0}", ((int)value).ToString());
400 410
                        break;
411
                    case (int)ColumnCnt.CommutingDistance:
412
                        strcmd.AppendFormat(" CommutingDistance = {0}", ((double)value).ToString());
413
                        break;
414
                    case (int)ColumnCnt.CommuteCosts:
415
                        strcmd.AppendFormat(" CommuteCosts = {0}", ((int)value).ToString());
416
                        break;
401 417
                    case (int)ColumnCnt.DeleteFlg:
402
                        strcmd += string.Format(" DeleteFlg = {0}", ((int)value).ToString());
418
                        strcmd.AppendFormat(" DeleteFlg = {0}", ((int)value).ToString());
403 419
                        break;
404 420
                }
405 421

  
406
                strcmd += ", UpdateDate = NOW()";
407
                strcmd += CreatePrimarykeyString(PersonCode);
422
                strcmd.Append(", UpdateDate = NOW()");
423
                strcmd.Append(CreatePrimarykeyString(PersonCode));
408 424

  
409
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
425
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
410 426

  
411 427
                return true;
412 428
            }
413 429
            catch (Exception ex)
414 430
            {
415
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
431
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
416 432
                return false;
417 433
            }
418 434
        }
......
446 462
                wrk.SealPrintName = objwrk[(int)ColumnCnt.SealPrintName].ToString();
447 463
                wrk.EmployeeClassFlg = int.Parse(objwrk[(int)ColumnCnt.EmployeeClassFlg].ToString());
448 464
                wrk.LedgerFlg = int.Parse(objwrk[(int)ColumnCnt.LedgerFlg].ToString());
465
                wrk.CommutingDistance = double.Parse(objwrk[(int)ColumnCnt.CommutingDistance].ToString());
466
                wrk.CommuteCosts = int.Parse(objwrk[(int)ColumnCnt.CommuteCosts].ToString());
449 467

  
450 468
                wrk.DeleteFlg = int.Parse(objwrk[(int)ColumnCnt.DeleteFlg].ToString());
451 469
                wrk.EntryDate = DateTime.Parse(objwrk[(int)ColumnCnt.EntryDate].ToString());
......
489 507

  
490 508
            wrk.EmployeeClassFlg = 0;               // 社員区分
491 509
            wrk.LedgerFlg = 0;                      // 台帳計算対象フラグ
510
            wrk.CommutingDistance = 0;	            // 通勤距離
511
            wrk.CommuteCosts = 0;	                // 通勤交通費(公認分)
492 512

  
493 513
            wrk.DeleteFlg = 0;                      // 削除フラグ
494 514
            wrk.EntryDate = DateTime.MinValue;      // 登録日付
......
506 526
        public int SelectMaxPersonCodeCount(string AddSQLString, bool bConnect = true)
507 527
        {
508 528
            // インターフェース
509
            string strcmd = "";
529
            StringBuilder strcmd = new StringBuilder();;
510 530
            ArrayList arData = new ArrayList();
511 531
            int iRet = 0;
512 532
            try
513 533
            {
514 534
                // SQL作成
515
                strcmd = "SELECT IFNULL(MAX(PersonCode), 0) FROM PersonInChargeMaster" + AddSQLString;
535
                strcmd.AppendFormat("SELECT IFNULL(MAX(PersonCode), 0) FROM PersonInChargeMaster{0}", AddSQLString);
516 536

  
517 537
                // SQL実行
518
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
538
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
519 539

  
520 540
                // データセット
521 541
                foreach (object[] objwrk in arData)
......
528 548
            }
529 549
            catch (Exception ex)
530 550
            {
531
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
551
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
532 552
            }
533 553

  
534 554
            return iRet;
......
545 565
        public int SelectMaxDisplayCount(string AddSQLString, bool bConnect = true)
546 566
        {
547 567
            // インターフェース
548
            string strcmd = "";
568
            StringBuilder strcmd = new StringBuilder();;
549 569
            ArrayList arData = new ArrayList();
550 570
            int iRet = 0;
551 571
            try
552 572
            {
553 573
                // SQL作成
554
                strcmd = "SELECT IFNULL(MAX(DisplayOrder), 0) FROM PersonInChargeMaster" + AddSQLString;
574
                strcmd.AppendFormat("SELECT IFNULL(MAX(DisplayOrder), 0) FROM PersonInChargeMaster{0}", AddSQLString);
555 575

  
556 576
                // SQL実行
557
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
577
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
558 578

  
559 579
                // データセット
560 580
                foreach (object[] objwrk in arData)
......
567 587
            }
568 588
            catch (Exception ex)
569 589
            {
570
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
590
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
571 591
            }
572 592

  
573 593
            return iRet;
......
582 602
        /// <returns>Where文字列</returns>
583 603
        public string CreatePrimarykeyString(int PersonCode)
584 604
        {
585
            string strWork = "";
605
            StringBuilder strWork = new StringBuilder();
586 606
            try
587 607
            {
588
                strWork = string.Format(" Where PersonCode = {0}", PersonCode);
608
                strWork.AppendFormat(" Where PersonCode = {0}", PersonCode);
589 609
            }
590 610
            catch (Exception ex)
591 611
            {
592
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strWork);
612
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
593 613
            }
594 614

  
595
            return strWork;
615
            return strWork.ToString();
596 616
        }
597 617
        #endregion
598 618
    }
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSystem.cs
52 52
            CONSUMPTIONTAX,
53 53
            COOPERATIONRATE,
54 54
            STATUTORYWELFARERATE,
55
            FuelPrice,
56
            AreaDistance,
55 57
            EXCELSAVEPATH,
56 58
            BUSINESSPERIOD,
57 59
            ConstructionYear,
......
88 90
        private string CreateSelectSQL()
89 91
        {
90 92
            // SQL作成
91
            string strcmd = "SELECT";
92
            strcmd += " SystemCode";
93
            strcmd += ", CompanyName1";
94
            strcmd += ", CompanyName2";
95
            strcmd += ", CEOName";
96
            strcmd += ", CEOPositionName";
97
            strcmd += ", ZipCode";
98
            strcmd += ", Address1";
99
            strcmd += ", Address2";
100
            strcmd += ", Address3";
101
            strcmd += ", PhoneNumber";
102
            strcmd += ", FaxNumber";
103
            strcmd += ", HomePageURL";
104
            strcmd += ", ConstructionExpenses";
105
            strcmd += ", OfficeExpenses";
106
            strcmd += ", OperatingExpenses";
107
            strcmd += ", ConsumptionTax";
108
            strcmd += ", CooperationRate";
109
            strcmd += ", StatutoryWelfareRate";
110
            strcmd += ", ExcelSavePath";
111
            strcmd += ", BusinessPeriod";
112
            strcmd += ", ConstructionYear";
113
            strcmd += ", BusinessBeginningDate";
114
            strcmd += ", ConstructionBeginningDate";
115
            strcmd += ", ConstructionNoBase";
116
            strcmd += ", SloganString1";
117
            strcmd += ", SloganString2";
118
            strcmd += ", SloganString3";
119
            strcmd += " ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')";
120
            strcmd += " ,DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')";
121
            strcmd += " FROM SystemMaster";
93
            StringBuilder strcmd = new StringBuilder();
94
            strcmd.Append("SELECT");
95
            strcmd.Append(" SystemCode");
96
            strcmd.Append(", CompanyName1");
97
            strcmd.Append(", CompanyName2");
98
            strcmd.Append(", CEOName");
99
            strcmd.Append(", CEOPositionName");
100
            strcmd.Append(", ZipCode");
101
            strcmd.Append(", Address1");
102
            strcmd.Append(", Address2");
103
            strcmd.Append(", Address3");
104
            strcmd.Append(", PhoneNumber");
105
            strcmd.Append(", FaxNumber");
106
            strcmd.Append(", HomePageURL");
107
            strcmd.Append(", ConstructionExpenses");
108
            strcmd.Append(", OfficeExpenses");
109
            strcmd.Append(", OperatingExpenses");
110
            strcmd.Append(", ConsumptionTax");
111
            strcmd.Append(", CooperationRate");
112
            strcmd.Append(", StatutoryWelfareRate");
113
            strcmd.Append(", FuelPrice");
114
            strcmd.Append(", AreaDistance");
115
            strcmd.Append(", ExcelSavePath");
116
            strcmd.Append(", BusinessPeriod");
117
            strcmd.Append(", ConstructionYear");
118
            strcmd.Append(", BusinessBeginningDate");
119
            strcmd.Append(", ConstructionBeginningDate");
120
            strcmd.Append(", ConstructionNoBase");
121
            strcmd.Append(", SloganString1");
122
            strcmd.Append(", SloganString2");
123
            strcmd.Append(", SloganString3");
124
            strcmd.Append(" ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
125
            strcmd.Append(" ,DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
126
            strcmd.Append(" FROM SystemMaster");
122 127

  
123
            return strcmd;
128
            return strcmd.ToString();
124 129
        }
125 130
        #endregion
126 131

  
......
135 140
        public bool SelectAction(string AddSQLString, ref List<SystemMaster> data, bool bConnect = true)
136 141
        {
137 142
            // インターフェース
138
            string strcmd = "";
143
            StringBuilder strcmd = new StringBuilder();
139 144
            ArrayList arData = new ArrayList();
140 145

  
141 146
            try
142 147
            {
143 148
                // SQL作成
144
                strcmd = CreateSelectSQL() + AddSQLString;
149
                strcmd.Append(CreateSelectSQL());
150
                strcmd.Append(AddSQLString);
145 151

  
146 152
                // SQL実行
147
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
153
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
148 154

  
149 155
                // データセット
150 156
                foreach (object[] objwrk in arData)
......
158 164
            }
159 165
            catch (Exception ex)
160 166
            {
161
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
167
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
162 168
                return false;
163 169
            }
164 170
        }
......
175 181
        public bool SelectAction(string AddSQLString, ref SystemMaster data, bool bConnect = true)
176 182
        {
177 183
            // インターフェース
178
            string strcmd = "";
184
            StringBuilder strcmd = new StringBuilder();
179 185
            ArrayList arData = new ArrayList();
180 186

  
181 187
            try
182 188
            {
183 189
                // SQL作成
184
                strcmd = CreateSelectSQL() + AddSQLString;
190
                strcmd.Append(CreateSelectSQL());
191
                strcmd.Append(AddSQLString);
185 192

  
186 193
                // SQL実行
187
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
194
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
188 195
                if (arData.Count == 0) return false;
189 196
                // データセット
190 197
                foreach (object[] objwrk in arData)
......
197 204
            }
198 205
            catch (Exception ex)
199 206
            {
200
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
207
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
201 208
                return false;
202 209
            }
203 210
        }
......
211 218
        /// <returns>true:成功 false:失敗</returns>
212 219
        public bool InsertAction(List<SystemMaster> data, bool bConnect = true)
213 220
        {
214
            string strcmd = "";
221
            StringBuilder strcmd = new StringBuilder();
215 222
            try
216 223
            {
217 224
                bool bColFirst = true;
218
                strcmd = "INSERT INTO SystemMaster";
219
                strcmd += " (";
225
                strcmd.Append("INSERT INTO SystemMaster");
226
                strcmd.Append(" (");
220 227
                foreach (var gender in Enum.GetValues(typeof(SystemColumn)))
221 228
                {
222
                    if (!bColFirst) strcmd += ", ";
223
                    strcmd += gender.ToString();
229
                    if (!bColFirst) strcmd.Append(", ");
230
                    strcmd.Append(gender.ToString());
224 231
                    bColFirst = false;
225 232
                }
226
                strcmd += ") VALUES";
233
                strcmd.Append(") VALUES");
227 234

  
228 235
                bool bDataFirst = true;
229 236
                foreach (SystemMaster work in data)
230 237
                {
231
                    if (bDataFirst) strcmd += " (";
232
                    else strcmd += ", (";
238
                    if (bDataFirst) strcmd.Append(" (");
239
                    else strcmd.Append(", (");
233 240

  
234
                    strcmd += string.Format("  {0}", work.SystemCode);
235
                    strcmd += string.Format(",'{0}'", work.CompanyName1);
236
                    strcmd += string.Format(",'{0}'", work.CompanyName2);
237
                    strcmd += string.Format(",'{0}'", work.CEOName);
238
                    strcmd += string.Format(",'{0}'", work.CEOPositionName);
239
                    strcmd += string.Format(",'{0}'", work.ZipCode);
240
                    strcmd += string.Format(",'{0}'", work.Address1);
241
                    strcmd += string.Format(",'{0}'", work.Address2);
242
                    strcmd += string.Format(",'{0}'", work.Address3);
243
                    strcmd += string.Format(",'{0}'", work.PhoneNumber);
244
                    strcmd += string.Format(",'{0}'", work.FaxNumber);
245
                    strcmd += string.Format(",'{0}'", work.HomePageURL);
246
                    strcmd += string.Format(", {0}", work.ConstructionExpenses);
247
                    strcmd += string.Format(", {0}", work.OfficeExpenses);
248
                    strcmd += string.Format(", {0}", work.OperatingExpenses);
249
                    strcmd += string.Format(", {0}", work.ConsumptionTax);
250
                    strcmd += string.Format(", {0}", work.CooperationRate);
251
                    strcmd += string.Format(", {0}", work.StatutoryWelfareRate);
252
                    strcmd += string.Format(",'{0}'", work.ExcelSavePath);
241
                    strcmd.AppendFormat("  {0}", work.SystemCode);
242
                    strcmd.AppendFormat(",'{0}'", work.CompanyName1);
243
                    strcmd.AppendFormat(",'{0}'", work.CompanyName2);
244
                    strcmd.AppendFormat(",'{0}'", work.CEOName);
245
                    strcmd.AppendFormat(",'{0}'", work.CEOPositionName);
246
                    strcmd.AppendFormat(",'{0}'", work.ZipCode);
247
                    strcmd.AppendFormat(",'{0}'", work.Address1);
248
                    strcmd.AppendFormat(",'{0}'", work.Address2);
249
                    strcmd.AppendFormat(",'{0}'", work.Address3);
250
                    strcmd.AppendFormat(",'{0}'", work.PhoneNumber);
251
                    strcmd.AppendFormat(",'{0}'", work.FaxNumber);
252
                    strcmd.AppendFormat(",'{0}'", work.HomePageURL);
253
                    strcmd.AppendFormat(", {0}", work.ConstructionExpenses);
254
                    strcmd.AppendFormat(", {0}", work.OfficeExpenses);
255
                    strcmd.AppendFormat(", {0}", work.OperatingExpenses);
256
                    strcmd.AppendFormat(", {0}", work.ConsumptionTax);
257
                    strcmd.AppendFormat(", {0}", work.CooperationRate);
258
                    strcmd.AppendFormat(", {0}", work.StatutoryWelfareRate);
259
                    strcmd.AppendFormat(", {0}", work.FuelPrice);
260
                    strcmd.AppendFormat(", {0}", work.AreaDistance);
261
                    strcmd.AppendFormat(",'{0}'", work.ExcelSavePath);
253 262

  
254
                    strcmd += string.Format(", {0}", work.BusinessPeriod);
255
                    strcmd += string.Format(", {0}", work.ConstructionYear);
256
                    strcmd += string.Format(",'{0}'", work.BusinessBeginningDate);
257
                    strcmd += string.Format(",'{0}'", work.ConstructionBeginningDate);
258
                    strcmd += string.Format(", {0}", work.ConstructionNoBase);
263
                    strcmd.AppendFormat(", {0}", work.BusinessPeriod);
264
                    strcmd.AppendFormat(", {0}", work.ConstructionYear);
265
                    strcmd.AppendFormat(",'{0}'", work.BusinessBeginningDate);
266
                    strcmd.AppendFormat(",'{0}'", work.ConstructionBeginningDate);
267
                    strcmd.AppendFormat(", {0}", work.ConstructionNoBase);
259 268

  
260
                    strcmd += string.Format(",'{0}'", work.SloganString1);
261
                    strcmd += string.Format(",'{0}'", work.SloganString2);
262
                    strcmd += string.Format(",'{0}'", work.SloganString3);
269
                    strcmd.AppendFormat(",'{0}'", work.SloganString1);
270
                    strcmd.AppendFormat(",'{0}'", work.SloganString2);
271
                    strcmd.AppendFormat(",'{0}'", work.SloganString3);
263 272

  
264
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
265
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
266
                    strcmd += ")";
273
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
274
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
275
                    strcmd.Append(")");
267 276

  
268 277
                    bDataFirst = false;
269 278
                }
270 279

  
271
                if (!ExecuteNonQuery(strcmd, false)) return false;
280
                if (!ExecuteNonQuery(strcmd.ToString(), false)) return false;
272 281
             
273 282
                return true;
274 283
            }
275 284
            catch (Exception ex)
276 285
            {
277
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
286
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
278 287
                return false;
279 288
            }
280 289
        }
......
289 298
        /// <returns>true:成功 false:失敗</returns>
290 299
        public bool UpdateAction(string AddSQLString, SystemMaster data, bool bConnect = true)
291 300
        {
292
            string strcmd = "";
301
            StringBuilder strcmd = new StringBuilder();
293 302
            try
294 303
            {
295 304

  
296
                strcmd = "UPDATE SystemMaster";
305
                strcmd.Append("UPDATE SystemMaster");
297 306

  
298
                strcmd += " SET";
307
                strcmd.Append(" SET");
299 308

  
300
                strcmd += string.Format("  SystemCode = {0}", data.SystemCode);
301
                strcmd += string.Format(", CompanyName1 = '{0}'", data.CompanyName1);
302
                strcmd += string.Format(", CompanyName2 = '{0}'", data.CompanyName2);
303
                strcmd += string.Format(", CEOName = '{0}'", data.CEOName);
304
                strcmd += string.Format(", CEOPositionName = '{0}'", data.CEOPositionName);
305
                strcmd += string.Format(", ZipCode = '{0}'", data.ZipCode);
306
                strcmd += string.Format(", Address1 = '{0}'", data.Address1);
307
                strcmd += string.Format(", Address2 = '{0}'", data.Address2);
308
                strcmd += string.Format(", Address3 = '{0}'", data.Address3);
309
                strcmd += string.Format(", PhoneNumber = '{0}'", data.PhoneNumber);
310
                strcmd += string.Format(", FaxNumber = '{0}'", data.FaxNumber);
311
                strcmd += string.Format(", HomePageURL = '{0}'", data.HomePageURL);
312
                strcmd += string.Format(", ConstructionExpenses = {0}", data.ConstructionExpenses);
313
                strcmd += string.Format(", OfficeExpenses = {0}", data.OfficeExpenses);
314
                strcmd += string.Format(", OperatingExpenses = {0}", data.OperatingExpenses);
315
                strcmd += string.Format(", ConsumptionTax = {0}", data.ConsumptionTax);
316
                strcmd += string.Format(", CooperationRate = {0}", data.CooperationRate);
317
                strcmd += string.Format(", StatutoryWelfareRate = {0}", data.StatutoryWelfareRate);
318
                strcmd += string.Format(", ExcelSavePath = '{0}'", data.ExcelSavePath);
309
                strcmd.AppendFormat("  SystemCode = {0}", data.SystemCode);
310
                strcmd.AppendFormat(", CompanyName1 = '{0}'", data.CompanyName1);
311
                strcmd.AppendFormat(", CompanyName2 = '{0}'", data.CompanyName2);
312
                strcmd.AppendFormat(", CEOName = '{0}'", data.CEOName);
313
                strcmd.AppendFormat(", CEOPositionName = '{0}'", data.CEOPositionName);
314
                strcmd.AppendFormat(", ZipCode = '{0}'", data.ZipCode);
315
                strcmd.AppendFormat(", Address1 = '{0}'", data.Address1);
316
                strcmd.AppendFormat(", Address2 = '{0}'", data.Address2);
317
                strcmd.AppendFormat(", Address3 = '{0}'", data.Address3);
318
                strcmd.AppendFormat(", PhoneNumber = '{0}'", data.PhoneNumber);
319
                strcmd.AppendFormat(", FaxNumber = '{0}'", data.FaxNumber);
320
                strcmd.AppendFormat(", HomePageURL = '{0}'", data.HomePageURL);
321
                strcmd.AppendFormat(", ConstructionExpenses = {0}", data.ConstructionExpenses);
322
                strcmd.AppendFormat(", OfficeExpenses = {0}", data.OfficeExpenses);
323
                strcmd.AppendFormat(", OperatingExpenses = {0}", data.OperatingExpenses);
324
                strcmd.AppendFormat(", ConsumptionTax = {0}", data.ConsumptionTax);
325
                strcmd.AppendFormat(", CooperationRate = {0}", data.CooperationRate);
326
                strcmd.AppendFormat(", StatutoryWelfareRate = {0}", data.StatutoryWelfareRate);
327
                strcmd.AppendFormat(", FuelPrice = {0}", data.FuelPrice);
328
                strcmd.AppendFormat(", AreaDistance = {0}", data.AreaDistance);
329
                strcmd.AppendFormat(", ExcelSavePath = '{0}'", data.ExcelSavePath);
319 330

  
320
                strcmd += string.Format(", BusinessPeriod = {0}", data.BusinessPeriod);
321
                strcmd += string.Format(", ConstructionYear = {0}", data.ConstructionYear);
322
                strcmd += string.Format(", BusinessBeginningDate = '{0}'", data.BusinessBeginningDate);
323
                strcmd += string.Format(", ConstructionBeginningDate = '{0}'", data.ConstructionBeginningDate);
324
                strcmd += string.Format(", ConstructionNoBase = {0}", data.ConstructionNoBase);
331
                strcmd.AppendFormat(", BusinessPeriod = {0}", data.BusinessPeriod);
332
                strcmd.AppendFormat(", ConstructionYear = {0}", data.ConstructionYear);
333
                strcmd.AppendFormat(", BusinessBeginningDate = '{0}'", data.BusinessBeginningDate);
334
                strcmd.AppendFormat(", ConstructionBeginningDate = '{0}'", data.ConstructionBeginningDate);
335
                strcmd.AppendFormat(", ConstructionNoBase = {0}", data.ConstructionNoBase);
325 336

  
326
                strcmd += string.Format(", SloganString1 = '{0}'", data.SloganString1);
327
                strcmd += string.Format(", SloganString2 = '{0}'", data.SloganString2);
328
                strcmd += string.Format(", SloganString3 = '{0}'", data.SloganString3);
337
                strcmd.AppendFormat(", SloganString1 = '{0}'", data.SloganString1);
338
                strcmd.AppendFormat(", SloganString2 = '{0}'", data.SloganString2);
339
                strcmd.AppendFormat(", SloganString3 = '{0}'", data.SloganString3);
329 340

  
330
                strcmd += ", UpdateDate = NOW()";
331
                strcmd += AddSQLString;
341
                strcmd.Append(", UpdateDate = NOW()");
342
                strcmd.Append(AddSQLString);
332 343

  
333
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
344
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
334 345

  
335 346
                return true;
336 347
            }
337 348
            catch (Exception ex)
338 349
            {
339
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
350
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
340 351
                return false;
341 352
            }
342 353
        }
......
352 363
        public bool DeleteAction(string AddSQLString, bool bConnect = true)
353 364
        {
354 365
            // インターフェース
355
            string strcmd = "";
366
            StringBuilder strcmd = new StringBuilder();
356 367
            try
357 368
            {
358
                strcmd = string.Format("{0}{1}", "DELETE FROM SystemMaster", AddSQLString);
369
                strcmd.AppendFormat("DELETE FROM SystemMaster{0}", AddSQLString);
359 370

  
360
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
371
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
361 372

  
362 373
                return true;
363 374
            }
364 375
            catch (Exception ex)
365 376
            {
366
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
377
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
367 378
                return false;
368 379
            }
369 380
        }
......
397 408
                wrk.ConsumptionTax = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.CONSUMPTIONTAX]);
398 409
                wrk.CooperationRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.COOPERATIONRATE]);
399 410
                wrk.StatutoryWelfareRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.STATUTORYWELFARERATE]);
411
                wrk.FuelPrice = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.FuelPrice]);
412
                wrk.AreaDistance = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.AreaDistance]);
400 413
                wrk.ExcelSavePath = objwrk[(int)SystemColumn.EXCELSAVEPATH].ToString();
401 414

  
402 415
                wrk.BusinessPeriod = int.Parse(objwrk[(int)SystemColumn.BUSINESSPERIOD].ToString());
......
433 446
        public int SelectMaxSystemCodeCount(string AddSQLString, bool bConnect = true)
434 447
        {
435 448
            // インターフェース
436
            string strcmd = "";
449
            StringBuilder strcmd = new StringBuilder();
437 450
            ArrayList arData = new ArrayList();
438 451
            int iRet = 0;
439 452
            try
440 453
            {
441 454
                // SQL作成
442
                strcmd = "SELECT IFNULL(MAX(SystemCode), 0) FROM SytemMaster" + AddSQLString;
455
                strcmd.AppendFormat("SELECT IFNULL(MAX(SystemCode), 0) FROM SytemMaster{0}", AddSQLString);
443 456

  
444 457
                // SQL実行
445
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
458
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
446 459

  
447 460
                // データセット
448 461
                foreach (object[] objwrk in arData)
......
455 468
            }
456 469
            catch (Exception ex)
457 470
            {
458
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
471
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
459 472
            }
460 473

  
461 474
            return iRet;
branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs
101 101
            /// </summary>
102 102
            SalesComment,
103 103
            /// <summary>
104
            /// 一括請求コメント
104
            /// 請求コメント
105 105
            /// </summary>
106 106
            BillingComment,
107
            /// <summary>
108
            /// 入金コメント
109
            /// </summary>
110
            PaymentComment,
107 111
        }
108 112
        #endregion
109 113

  
branches/src/ProcessManagement/ProcessManagement/DataModel/PersonInChargeMaster.cs
34 34
        private int         m_EmployeeClassFlg = 0;             // 社員区分
35 35
        private int         m_LedgerFlg = 1;                    // 台帳計算対象フラグ
36 36

  
37
        private double      m_CommutingDistance	= 0;            // 通勤距離
38
        private int         m_CommuteCosts = 0;                 // 通勤交通費(公認分)
39

  
40

  
37 41
        private int         m_DeleteFlg = 0;                    // 削除フラグ
38 42
        private DateTime    m_EntryDate = DateTime.MinValue;    // 登録日付
39 43
        private DateTime    m_UpdateDate = DateTime.MinValue;   // 更新日付
......
180 184
            set { m_LedgerFlg = value; }
181 185
        }
182 186
        /// <summary>
187
        /// 通勤距離
188
        /// </summary>
189
        public double CommutingDistance
190
        {
191
            get { return m_CommutingDistance; }
192
            set { m_CommutingDistance = value; }
193
        }
194
        /// <summary>
195
        /// 通勤交通費(公認分)
196
        /// </summary>
197
        public int CommuteCosts
198
        {
199
            get { return m_CommuteCosts; }
200
            set { m_CommuteCosts = value; }
201
        }
202
        /// <summary>
183 203
        /// 削除フラグ
184 204
        /// </summary>
185 205
        public int DeleteFlg
branches/src/ProcessManagement/ProcessManagement/DataModel/SystemMaster.cs
29 29
        private double      m_ConsumptionTax = 0;	            // 消費税
30 30
        private double      m_CooperationRate = 0.5;            // 協力金比率
31 31
        private double      m_StatutoryWelfareRate = 8.0;       // 法定福利費
32

  
32
        private double      m_FuelPrice = 0;                    // 燃料費キロ単価
33
        private double      m_AreaDistance = 0;                 // 資材置場移動距離
34
        
33 35
        private string      m_ExcelSavePath = string.Empty;	    // Excel保存パス
34 36

  
35 37
        private int         m_BusinessPeriod = 0;               // 営業期数
......
196 198
            set { m_StatutoryWelfareRate = value; }
197 199
        }
198 200
        /// <summary>
201
        /// 燃料費キロ単価
202
        /// </summary>
203
        public double FuelPrice
204
        {
205
            get { return m_FuelPrice; }
206
            set { m_FuelPrice = value; }
207
        }
208
        /// <summary>
209
        /// 資材置場移動距離
210
        /// </summary>
211
        public double AreaDistance
212
        {
213
            get { return m_AreaDistance; }
214
            set { m_AreaDistance = value; }
215
        }
216
        /// <summary>
199 217
        /// Excel保存パス
200 218
        /// </summary>
201 219
        public string ExcelSavePath
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
543 543
                RemoveCommentData();
544 544

  
545 545
                // ?\?????f?[?^???t??????Z?b?g????
546
                SetApprovalOrderNo();
546
                SetApprovalOrderNo((int)CommonDefine.ApprovalStatus.Petition);
547 547

  
548
                // ----- ?f?[?^?X?V????
549
                if (!SorceDataUpdate()) return;
550

  
551 548
                // ???????b?Z?[?W
552 549
                CommonMotions.EntryEndMessage("?S????\???f?[?^", "?\??");
553 550

  
......
581 578
                // ???F?f?[?^????C???????
582 579
                string strSQL = pAppDB.CreatePrimarykeyString(m_PersonCode, m_ApprovalCode, m_OrderDate, m_OrderNo);
583 580
                strSQL += " AND SeqNo != 1";
584
                if (!pAppDB.DeleteAction(strSQL, false))
581
                List<PersonApproval> RecList = new List<PersonApproval>();
582
                if (pAppDB.SelectAction(strSQL, ref RecList, false) && RecList.Count != 0)
585 583
                {
586
                    pAppDB.rollback();
587
                    MessageBox.Show("??\??????s????????B", "??\???G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
588
                    return;
584
                    if (!pAppDB.DeleteAction(strSQL, false))
585
                    {
586
                        pAppDB.rollback();
587
                        MessageBox.Show("??\??????s????????B", "??\???G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
588
                        return;
589
                    }
589 590
                }
590 591
                // ?\???f?[?^??\????????
591 592
                if (!pAppDB.UpdateFeild(m_PersonCode,
592 593
                                    m_ApprovalCode,
593 594
                                    m_OrderDate,
594
                                    (int)IOProcessApproval.ColumnName.ApprovalStatus,
595
                                    (int)IOPersonApproval.ColumnName.ApprovalStatus,
595 596
                                    (int)CommonDefine.ApprovalStatus.Petition,
596 597
                                    false))
597 598
                {
......
600 601
                }
601 602

  
602 603
                pAppDB.commit();
604

  
605
                // ----- ?f?[?^?X?V????
606
                if (!SorceDataBuild((int)CommonDefine.ApprovalStatus.Petition)) return;
607

  
603 608
                // ???????b?Z?[?W
604 609
                CommonMotions.EntryEndMessage("?S????\???f?[?^??\??", "??\??");
605 610

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
142 142
                            ClsApprovalPermission.SetPrimaryRecStatus(m_PersonCode, m_ApprovalCode, m_OrderDate, m_OrderNo, (int)CommonDefine.ApprovalStatus.Approval);
143 143

  
144 144
                            // 最終承認が成された後の処理
145
                            UpdateSourceData();
145
                            FinalUpdateSourceData();
146 146
                        }
147 147
                        break;
148 148
                    default:
......
150 150
                        ClsApprovalPermission.SetPrimaryRecStatus(m_PersonCode, m_ApprovalCode, m_OrderDate, m_OrderNo, (int)CommonDefine.ApprovalStatus.NotApproval);
151 151
                        break;
152 152
                }
153
                // ----- データ更新処理
154
                if (!SorceDataBuild(statusCode)) return false;
155

  
153 156
                return true;
154 157
            }
155 158
            catch (Exception ex)
......
807 810
        /// 申請元データに受付番号をセットする
808 811
        /// </summary>
809 812
        /// <returns></returns>
810
        private bool SetApprovalOrderNo()
813
        private bool SetApprovalOrderNo(int AppAction)
811 814
        {
812 815
            IOPersonApproval AppDB = new IOPersonApproval();
813 816
            try
......
836 839
                        strSQL.AppendFormat(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
837 840
                        strSQL.AppendFormat(" AND SEQNO = {0}", m_SearchSeqNo);
838 841
                        break;
842
                    case (int)ClsExcute.ApprovalListNo.FeePayment:              // 手間支払承認
843
                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:        // 業者支払承認
844
                        // 手間・業者支払データ更新・作成処理
845
                        if (!ApprovalFeePayment(AppAction)) return false;
846
                        break;
839 847
                    default:
840 848
                        break;
841 849
                }
......
908 916
        /// 元データの更新処理
909 917
        /// </summary>
910 918
        /// <returns></returns>
911
        private bool SorceDataUpdate()
919
        private bool SorceDataBuild(int AppAction)
912 920
        {
913 921
            try
914 922
            {
......
917 925
                    case (int)ClsExcute.ApprovalListNo.FeePayment:              // 手間支払承認
918 926
                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:        // 業者支払承認
919 927
                        // 手間・業者支払データ更新・作成処理
920
                        if (!ApprovalFeePayment()) return false;
928
                        if (!ApprovalFeePayment(AppAction)) return false;
921 929
                        break;
922 930
                    default:
923 931
                        break;
......
938 946
        /// 手間・業者支払データ更新・作成処理
939 947
        /// </summary>
940 948
        /// <returns></returns>
941
        private bool ApprovalFeePayment()
949
        private bool ApprovalFeePayment(int AppAction)
942 950
        {
943 951
            IOPaymentDataDetail PayDetailDB = new IOPaymentDataDetail();
944 952
            IOPaymentApprovalInfo PayAppDB = new IOPaymentApprovalInfo();
945 953
            try
946 954
            {
947
                // 業者請求明細データ更新
948
                if (!PaymentDataDetailUpdate(PayDetailDB))
955
                // 手間・業者支払承認情報取得
956
                int NowPoint = ClsExcute.GetNowProcessPoint();
957
                List<ArrayList> Arlist = ClsExcute.ProcControlPara[NowPoint].ArrayParameter;
958

  
959
                bool bSuccess = true;
960
                for (int i = 0; i < Arlist.Count; i++)
949 961
                {
950
                    PayDetailDB.rollback();
951
                    PayAppDB.rollback();
952
                    return false;
962
                    ArrayList arData = Arlist[i];
963
                    PaymentApprovalInfo PaIWork = (PaymentApprovalInfo)arData[0];
964

  
965
                    if (AppAction == (int)CommonDefine.ApprovalStatus.Petition)
966
                    {   // 申請時のみ
967
                        // 業者請求明細データ更新
968
                        if (!PaymentDataDetailUpdate(PayDetailDB, PaIWork))
969
                        {
970
                            bSuccess = false;
971
                            break;
972
                        }
973
                    }
974

  
975
                    if (AppAction == (int)CommonDefine.ApprovalStatus.Petition 
976
                        || AppAction == (int)CommonDefine.ApprovalStatus.Approval)
977
                    {
978
                        // 支払承認情報データ作成
979
                        if (!PaymentApprovalInfoCreate(PayAppDB, PaIWork))
980
                        {
981
                            bSuccess = false;
982
                            break;
983
                        }
984
                    }
985
                    else
986
                    {
987
                        // 支払承認情報データ削除
988
                        if (!PaymentApprovalInfoRemove(PayAppDB, PaIWork))
989
                        {
990
                            bSuccess = false;
991
                            break;
992
                        }
993
                    }
953 994
                }
954
                // 支払承認情報データ作成
955
                if (!PaymentApprovalInfoCreate(PayAppDB))
995
                if (!bSuccess)
956 996
                {
957 997
                    PayDetailDB.rollback();
958 998
                    PayAppDB.rollback();
......
974 1014
        }
975 1015
        #endregion
976 1016

  
977
        int nCompanyCode = 0;
978
        int nTargetDate = 0;
979
        int nSeqNo = 0;
980
        int nLineCount = 0;
981 1017
        #region 支払明細データ更新
982 1018
        /// <summary>
983 1019
        /// 支払明細データ更新
984 1020
        /// </summary>
985 1021
        /// <returns></returns>
986
        private bool PaymentDataDetailUpdate(IOPaymentDataDetail PayDetailDB)
1022
        private bool PaymentDataDetailUpdate(IOPaymentDataDetail PayDetailDB, PaymentApprovalInfo PaIWork)
987 1023
        {
988 1024
            try
989 1025
            {
990 1026
                StringBuilder strSQL = new StringBuilder();
991 1027

  
1028
                strSQL.Clear();
992 1029
                strSQL.Append("UPDATE paymentdatadetail SET");
993
                strSQL.AppendFormat(" APPROVALPERSONCODE = {0}", m_PersonCode);         // 承認担当者コード
994
                strSQL.AppendFormat(" ,APPROVALDATE = STR_TO_DATE('{0}','%Y/%m/%d')"
995
                                        , m_OrderDate.ToShortDateString());             // 担当者承認日付
996
                strSQL.Append(" ,APPROVALENDFLG = 1");                                  // 承認完了フラグ
997
                strSQL.Append(PayDetailDB.CreatePrimarykeyString(nCompanyCode, nTargetDate, nSeqNo, nLineCount));
1030
                strSQL.AppendFormat(" APPROVALPERSONCODE = {0}", PaIWork.ApprovalPerson);       // 承認担当者コード
1031
                strSQL.AppendFormat(", APPROVALDATE = STR_TO_DATE('{0}','%Y/%m/%d')"
1032
                                                , DateTime.Now.ToShortDateString());            // 担当者承認日付
1033
                strSQL.Append(", APPROVALENDFLG = 1");                                          // 承認完了フラグ
1034
                strSQL.Append(PayDetailDB.CreatePrimarykeyString(PaIWork.CompanyCode, PaIWork.TargetDate, PaIWork.SeqNo, PaIWork.LineCount));
998 1035

  
999 1036
                if (!PayDetailDB.ExecuteNonQuery(strSQL.ToString(), false)) return false;
1000

  
1001 1037
                return true;
1002 1038
            }
1003 1039
            catch (System.Exception ex)
......
1013 1049
        /// 支払承認情報データ作成
1014 1050
        /// </summary>
1015 1051
        /// <returns></returns>
1016
        private bool PaymentApprovalInfoCreate(IOPaymentApprovalInfo PayAppDB)
1052
        private bool PaymentApprovalInfoCreate(IOPaymentApprovalInfo PayAppDB, PaymentApprovalInfo PaIWork)
1017 1053
        {
1018 1054
            try
1019 1055
            {
1020 1056
                List<PaymentApprovalInfo> InfoList = new List<PaymentApprovalInfo>();
1021
                PaymentApprovalInfo InfoRec = new PaymentApprovalInfo();
1057
                InfoList.Add(PaIWork);
1022 1058

  
1023
                InfoRec.CompanyCode = nCompanyCode;
1024
                InfoRec.TargetDate = nTargetDate;
1025
                InfoRec.SeqNo = nSeqNo;
1026
                InfoRec.LineCount = nLineCount;
1027
                InfoRec.ApprovalNo = m_ApprovalCode;
1028
                InfoRec.ApprovalPerson = 0;
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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