リビジョン 144
IOクラスのDouble.ParseをCommonMotions.cnvDoubleにすべて変更
部署・台帳まとめ給与計算の不具合修正
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 30;
|
|
17 |
public static int s_SystemVersion = 32;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceDailyData.cs | ||
---|---|---|
400 | 400 |
wrk.AttendanceDate = DateTime.Parse(objwrk[(int)TableColumn.AttendanceDate].ToString()); // 日報作成日 |
401 | 401 |
wrk.SeqNo = int.Parse(objwrk[(int)TableColumn.SeqNo].ToString()); // 明細行番号 |
402 | 402 |
wrk.ActionResult = objwrk[(int)TableColumn.ActionResult].ToString(); // 行動実績 |
403 |
wrk.OvertimeHours = double.Parse(objwrk[(int)TableColumn.OvertimeHours].ToString()); // 残業時間
|
|
403 |
wrk.OvertimeHours = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OvertimeHours]); // 残業時間
|
|
404 | 404 |
wrk.WorkingComment = objwrk[(int)TableColumn.WorkingComment].ToString(); // 当日作業内容 |
405 | 405 |
|
406 | 406 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceData.cs | ||
---|---|---|
416 | 416 |
wrk.AttendanceMonth = DateTime.Parse(objwrk[(int)TableColumn.AttendanceMonth].ToString()); // 出勤管理年月 |
417 | 417 |
wrk.LastDays = int.Parse(objwrk[(int)TableColumn.LastDays].ToString()); // 当月最終日 |
418 | 418 |
wrk.AttendDayCount = int.Parse(objwrk[(int)TableColumn.AttendDayCount].ToString()); // 出勤日数 |
419 |
wrk.TotalOverTimes = double.Parse(objwrk[(int)TableColumn.TotalOverTimes].ToString()); // 残業時間数
|
|
419 |
wrk.TotalOverTimes = CommonMotions.cnvDouble(objwrk[(int)TableColumn.TotalOverTimes]); // 残業時間数
|
|
420 | 420 |
wrk.OrderDate = DateTime.Parse(objwrk[(int)TableColumn.OrderDate].ToString()); // 申請日 |
421 | 421 |
wrk.OrderNo = int.Parse(objwrk[(int)TableColumn.OrderNo].ToString()); // 申請受付番号 |
422 | 422 |
|
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingPaymentSummary.cs | ||
---|---|---|
240 | 240 |
wrk.Payday = DateTime.Parse(objwrk[(int)NameColumn.Payday].ToString()); |
241 | 241 |
wrk.BillingPriceTotal = long.Parse(objwrk[(int)NameColumn.BillingPriceTotal].ToString()); |
242 | 242 |
|
243 |
wrk.ConsumptionTaxRate = double.Parse(objwrk[(int)NameColumn.ConsumptionTaxRate].ToString());
|
|
243 |
wrk.ConsumptionTaxRate = CommonMotions.cnvDouble(objwrk[(int)NameColumn.ConsumptionTaxRate]);
|
|
244 | 244 |
wrk.ConsumptionTaxPrice = long.Parse(objwrk[(int)NameColumn.ConsumptionTaxPrice].ToString()); |
245 | 245 |
|
246 | 246 |
|
247 | 247 |
wrk.HighwPriceStotal = long.Parse(objwrk[(int)NameColumn.HighwPriceStotal].ToString()); |
248 | 248 |
wrk.HardwPriceStotal = long.Parse(objwrk[(int)NameColumn.HardwPriceStotal].ToString()); |
249 | 249 |
wrk.IndsWasteTaxStotal = long.Parse(objwrk[(int)NameColumn.IndsWasteTaxStotal].ToString()); |
250 |
wrk.CnstrPriceRate = double.Parse(objwrk[(int)NameColumn.CnstrPriceRate].ToString());
|
|
250 |
wrk.CnstrPriceRate = CommonMotions.cnvDouble(objwrk[(int)NameColumn.CnstrPriceRate]);
|
|
251 | 251 |
wrk.CnstrPriceStotal = long.Parse(objwrk[(int)NameColumn.HighwPriceStotal].ToString()); |
252 | 252 |
|
253 | 253 |
wrk.BillingPriceTotal = long.Parse(objwrk[(int)NameColumn.BillingPriceTotal].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs | ||
---|---|---|
571 | 571 |
wrk.ConstructionCompletionDate = DateTime.Parse(objwrk[(int)TableColumn.ConstructionCompletionDate].ToString()); |
572 | 572 |
wrk.NonOrderDate = DateTime.Parse(objwrk[(int)TableColumn.NonOrderDate].ToString()); |
573 | 573 |
|
574 |
wrk.OrdersDecisionPrice = double.Parse(objwrk[(int)TableColumn.OrdersDecisionPrice].ToString());
|
|
575 |
wrk.OrdersDecisionPriceInTax = double.Parse(objwrk[(int)TableColumn.OrdersDecisionPriceInTax].ToString());
|
|
574 |
wrk.OrdersDecisionPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OrdersDecisionPrice]);
|
|
575 |
wrk.OrdersDecisionPriceInTax = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OrdersDecisionPriceInTax]);
|
|
576 | 576 |
|
577 | 577 |
wrk.SalesPersonCode = int.Parse(objwrk[(int)TableColumn.SalesPersonCode].ToString()); |
578 | 578 |
wrk.ConstructionPersonCode = int.Parse(objwrk[(int)TableColumn.ConstructionPersonCode].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBudget.cs | ||
---|---|---|
546 | 546 |
|
547 | 547 |
wrk.CreatorCode = int.Parse(objwrk[(int)TableColumn.CreatorCode].ToString()); // 作成者コード |
548 | 548 |
wrk.CreatorName = objwrk[(int)TableColumn.CreatorName].ToString(); // 作成者名 |
549 |
wrk.CreatorCosts = double.Parse(objwrk[(int)TableColumn.CreatorCosts].ToString()); // 作成者給与
|
|
549 |
wrk.CreatorCosts = CommonMotions.cnvDouble(objwrk[(int)TableColumn.CreatorCosts]); // 作成者給与
|
|
550 | 550 |
wrk.AssistantCode = int.Parse(objwrk[(int)TableColumn.AssistantCode].ToString()); // 副担当者コード |
551 | 551 |
wrk.AssistantName = objwrk[(int)TableColumn.AssistantName].ToString(); // 副担当者名 |
552 | 552 |
wrk.AssistantCosts = int.Parse(objwrk[(int)TableColumn.AssistantCosts].ToString()); // 副担当者給与 |
553 | 553 |
wrk.InstructorCode = int.Parse(objwrk[(int)TableColumn.InstructorCode].ToString()); // 工事指導員コード |
554 | 554 |
wrk.InstructorName = objwrk[(int)TableColumn.InstructorName].ToString(); // 工事指導員名 |
555 |
wrk.InstructorCosts = double.Parse(objwrk[(int)TableColumn.InstructorCosts].ToString()); // 工事指導員給与
|
|
555 |
wrk.InstructorCosts = CommonMotions.cnvDouble(objwrk[(int)TableColumn.InstructorCosts]); // 工事指導員給与
|
|
556 | 556 |
wrk.CreateDate = DateTime.Parse(objwrk[(int)TableColumn.CreateDate].ToString()); // 作成日 |
557 |
wrk.ConstructionTimes = double.Parse(objwrk[(int)TableColumn.ConstructionTimes].ToString()); // 工期(単位・月)
|
|
557 |
wrk.ConstructionTimes = CommonMotions.cnvDouble(objwrk[(int)TableColumn.ConstructionTimes]); // 工期(単位・月)
|
|
558 | 558 |
wrk.ConstructionStart = DateTime.Parse(objwrk[(int)TableColumn.ConstructionStart].ToString()); // 契約工期開始 |
559 | 559 |
wrk.ConstructionEnd = DateTime.Parse(objwrk[(int)TableColumn.ConstructionEnd].ToString()); // 契約工期完了 |
560 | 560 |
|
561 |
wrk.InstructorTimes = double.Parse(objwrk[(int)TableColumn.InstructorTimes].ToString()); // 指導員稼働月数
|
|
561 |
wrk.InstructorTimes = CommonMotions.cnvDouble(objwrk[(int)TableColumn.InstructorTimes]); // 指導員稼働月数
|
|
562 | 562 |
|
563 | 563 |
wrk.SalaryFlg = int.Parse(objwrk[(int)TableColumn.SalaryFlg].ToString()); // 給与振分区分 |
564 | 564 |
wrk.SalaryDays = int.Parse(objwrk[(int)TableColumn.SalaryDays].ToString()); // 振分日数 |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBudgetDetail.cs | ||
---|---|---|
464 | 464 |
try |
465 | 465 |
{ |
466 | 466 |
// データ取得 |
467 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号
|
|
467 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
|
468 | 468 |
|
469 | 469 |
wrk.GroupCount = int.Parse(objwrk[(int)TableColumn.GroupCount].ToString()); // グループ番号 |
470 | 470 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号 |
... | ... | |
474 | 474 |
wrk.SecondString = objwrk[(int)TableColumn.SecondString].ToString(); // 工事内容 |
475 | 475 |
wrk.CompanyType = int.Parse(objwrk[(int)TableColumn.CompanyType].ToString()); // 協力会社コードタイプ |
476 | 476 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード |
477 |
wrk.CompanyName = objwrk[(int)TableColumn.CompanyName].ToString(); // 協力会社名称
|
|
478 |
wrk.EstimatePrice = double.Parse(objwrk[(int)TableColumn.EstimatePrice].ToString()); // 見積時金額
|
|
479 |
wrk.NegotiationPrice = double.Parse(objwrk[(int)TableColumn.NegotiationPrice].ToString()); // 交渉時金額
|
|
480 |
wrk.OrderDesiredAmount = double.Parse(objwrk[(int)TableColumn.OrderDesiredAmount].ToString()); // 発注希望金額
|
|
481 |
wrk.ExecutionAmount = double.Parse(objwrk[(int)TableColumn.ExecutionAmount].ToString()); // 実行金額
|
|
482 |
wrk.AmountConfigRate = double.Parse(objwrk[(int)TableColumn.AmountConfigRate].ToString()); // 金額構成率
|
|
483 |
wrk.NegotiateFlg = int.Parse(objwrk[(int)TableColumn.NegotiateFlg].ToString()); // 協力業者交渉フラグ
|
|
477 |
wrk.CompanyName = objwrk[(int)TableColumn.CompanyName].ToString(); // 協力会社名称 |
|
478 |
wrk.EstimatePrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.EstimatePrice]); // 見積時金額
|
|
479 |
wrk.NegotiationPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.NegotiationPrice]); // 交渉時金額
|
|
480 |
wrk.OrderDesiredAmount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OrderDesiredAmount]); // 発注希望金額
|
|
481 |
wrk.ExecutionAmount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.ExecutionAmount]); // 実行金額
|
|
482 |
wrk.AmountConfigRate = CommonMotions.cnvDouble(objwrk[(int)TableColumn.AmountConfigRate]); // 金額構成率
|
|
483 |
wrk.NegotiateFlg = int.Parse(objwrk[(int)TableColumn.NegotiateFlg].ToString()); // 協力業者交渉フラグ |
|
484 | 484 |
|
485 | 485 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
486 | 486 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedger.cs | ||
---|---|---|
513 | 513 |
{ |
514 | 514 |
// データ取得 |
515 | 515 |
|
516 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
|
516 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号
|
|
517 | 517 |
|
518 |
wrk.ConstructionPeriod = int.Parse(objwrk[(int)TableColumn.ConstructionPeriod].ToString()); // 事業期 |
|
519 |
wrk.CreatorCode = int.Parse(objwrk[(int)TableColumn.CreatorCode].ToString()); // 作成者コード |
|
520 |
wrk.CreatorName = objwrk[(int)TableColumn.CreatorName].ToString(); // 作成者名 |
|
521 |
wrk.CreateDate = DateTime.Parse(objwrk[(int)TableColumn.CreateDate].ToString()); // 作成日 |
|
522 |
wrk.ConstructionTimes = double.Parse(objwrk[(int)TableColumn.ConstructionTimes].ToString()); // 工期(単位・月)
|
|
523 |
wrk.ConstructionStart = DateTime.Parse(objwrk[(int)TableColumn.ConstructionStart].ToString()); // 契約工期開始 |
|
524 |
wrk.ConstructionEnd = DateTime.Parse(objwrk[(int)TableColumn.ConstructionEnd].ToString()); // 契約工期完了 |
|
518 |
wrk.ConstructionPeriod = int.Parse(objwrk[(int)TableColumn.ConstructionPeriod].ToString()); // 事業期
|
|
519 |
wrk.CreatorCode = int.Parse(objwrk[(int)TableColumn.CreatorCode].ToString()); // 作成者コード
|
|
520 |
wrk.CreatorName = objwrk[(int)TableColumn.CreatorName].ToString(); // 作成者名
|
|
521 |
wrk.CreateDate = DateTime.Parse(objwrk[(int)TableColumn.CreateDate].ToString()); // 作成日
|
|
522 |
wrk.ConstructionTimes = CommonMotions.cnvDouble(objwrk[(int)TableColumn.ConstructionTimes]); // 工期(単位・月)
|
|
523 |
wrk.ConstructionStart = DateTime.Parse(objwrk[(int)TableColumn.ConstructionStart].ToString()); // 契約工期開始
|
|
524 |
wrk.ConstructionEnd = DateTime.Parse(objwrk[(int)TableColumn.ConstructionEnd].ToString()); // 契約工期完了
|
|
525 | 525 |
|
526 |
wrk.OrdersDecisionPrice = double.Parse(objwrk[(int)TableColumn.OrdersDecisionPrice].ToString()); // 税抜受注決定金額
|
|
527 |
wrk.CompanyExpenses = double.Parse(objwrk[(int)TableColumn.CompanyExpenses].ToString()); // 会社経費合計
|
|
528 |
wrk.DepartmentExpenses = double.Parse(objwrk[(int)TableColumn.DepartmentExpenses].ToString()); // 部署経費合計
|
|
529 |
wrk.SalesExpenses = double.Parse(objwrk[(int)TableColumn.SalesExpenses].ToString()); // 営業経費合計
|
|
530 |
wrk.TotalPayment = double.Parse(objwrk[(int)TableColumn.TotalPayment].ToString()); // 総支払額
|
|
531 |
wrk.GrossProfit = double.Parse(objwrk[(int)TableColumn.GrossProfit].ToString()); // 粗利
|
|
532 |
wrk.Allowance = double.Parse(objwrk[(int)TableColumn.Allowance].ToString()); // 給与
|
|
533 |
wrk.NetProfit = double.Parse(objwrk[(int)TableColumn.NetProfit].ToString()); // 純利益
|
|
534 |
wrk.ComplateFlg = int.Parse(objwrk[(int)TableColumn.ComplateFlg].ToString()); // 入力完了フラグ |
|
535 |
wrk.IntegrationFlg = int.Parse(objwrk[(int)TableColumn.IntegrationFlg].ToString()); // 受注金額積算フラグ |
|
526 |
wrk.OrdersDecisionPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OrdersDecisionPrice]); // 税抜受注決定金額
|
|
527 |
wrk.CompanyExpenses = CommonMotions.cnvDouble(objwrk[(int)TableColumn.CompanyExpenses]); // 会社経費合計
|
|
528 |
wrk.DepartmentExpenses = CommonMotions.cnvDouble(objwrk[(int)TableColumn.DepartmentExpenses]); // 部署経費合計
|
|
529 |
wrk.SalesExpenses = CommonMotions.cnvDouble(objwrk[(int)TableColumn.SalesExpenses]); // 営業経費合計
|
|
530 |
wrk.TotalPayment = CommonMotions.cnvDouble(objwrk[(int)TableColumn.TotalPayment]); // 総支払額
|
|
531 |
wrk.GrossProfit = CommonMotions.cnvDouble(objwrk[(int)TableColumn.GrossProfit]); // 粗利
|
|
532 |
wrk.Allowance = CommonMotions.cnvDouble(objwrk[(int)TableColumn.Allowance]); // 給与
|
|
533 |
wrk.NetProfit = CommonMotions.cnvDouble(objwrk[(int)TableColumn.NetProfit]); // 純利益
|
|
534 |
wrk.ComplateFlg = int.Parse(objwrk[(int)TableColumn.ComplateFlg].ToString()); // 入力完了フラグ
|
|
535 |
wrk.IntegrationFlg = int.Parse(objwrk[(int)TableColumn.IntegrationFlg].ToString()); // 受注金額積算フラグ
|
|
536 | 536 |
|
537 | 537 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
538 | 538 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerDetail.cs | ||
---|---|---|
428 | 428 |
try |
429 | 429 |
{ |
430 | 430 |
// データ取得 |
431 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号
|
|
431 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
|
432 | 432 |
|
433 | 433 |
wrk.GroupCount = int.Parse(objwrk[(int)TableColumn.GroupCount].ToString()); // グループ番号 |
434 | 434 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号 |
... | ... | |
438 | 438 |
wrk.SecondString = objwrk[(int)TableColumn.SecondString].ToString(); // 工事内容 |
439 | 439 |
wrk.CompanyType = int.Parse(objwrk[(int)TableColumn.CompanyType].ToString()); // 協力会社コードタイプ |
440 | 440 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード |
441 |
wrk.CompanyName = objwrk[(int)TableColumn.CompanyName].ToString(); // 協力会社名称
|
|
442 |
wrk.EstimatePrice = double.Parse(objwrk[(int)TableColumn.EstimatePrice].ToString()); // 予算(見積)金額
|
|
443 |
wrk.ExecutionAmount = double.Parse(objwrk[(int)TableColumn.ExecutionAmount].ToString()); // 実行金額
|
|
444 |
wrk.AmountConfigRate = double.Parse(objwrk[(int)TableColumn.AmountConfigRate].ToString()); // 金額構成率
|
|
445 |
wrk.PaymentBurden = double.Parse(objwrk[(int)TableColumn.PaymentBurden].ToString()); // 支払補填額
|
|
441 |
wrk.CompanyName = objwrk[(int)TableColumn.CompanyName].ToString(); // 協力会社名称 |
|
442 |
wrk.EstimatePrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.EstimatePrice]); // 予算(見積)金額
|
|
443 |
wrk.ExecutionAmount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.ExecutionAmount]); // 実行金額
|
|
444 |
wrk.AmountConfigRate = CommonMotions.cnvDouble(objwrk[(int)TableColumn.AmountConfigRate]); // 金額構成率
|
|
445 |
wrk.PaymentBurden = CommonMotions.cnvDouble(objwrk[(int)TableColumn.PaymentBurden]); // 支払補填額
|
|
446 | 446 |
|
447 | 447 |
wrk.FixDataFlg = int.Parse(objwrk[(int)TableColumn.FixDataFlg].ToString()); // 固定データフラグ |
448 | 448 |
wrk.IndependentFlg = int.Parse(objwrk[(int)TableColumn.IndependentFlg].ToString()); // 独立データフラグ |
... | ... | |
453 | 453 |
wrk.OperatingFlg = int.Parse(objwrk[(int)TableColumn.OperatingFlg].ToString()); // 担当中フラグ |
454 | 454 |
wrk.SourceCode = int.Parse(objwrk[(int)TableColumn.SourceCode].ToString()); // 元工事番号 |
455 | 455 |
wrk.JoinTitleFlg = int.Parse(objwrk[(int)TableColumn.JoinTitleFlg].ToString()); // 工事名称タイトルフラグ |
456 |
wrk.SalaryOnRegist = double.Parse(objwrk[(int)TableColumn.SalaryOnRegist].ToString()); // 登録時月額給与
|
|
456 |
wrk.SalaryOnRegist = CommonMotions.cnvDouble(objwrk[(int)TableColumn.SalaryOnRegist]); // 登録時月額給与
|
|
457 | 457 |
wrk.PurchaseOrderFlg = int.Parse(objwrk[(int)TableColumn.PurchaseOrderFlg].ToString()); // 注文書発行フラグ |
458 | 458 |
|
459 | 459 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerExcute.cs | ||
---|---|---|
411 | 411 |
try |
412 | 412 |
{ |
413 | 413 |
// データ取得 |
414 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号
|
|
414 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
|
415 | 415 |
|
416 | 416 |
wrk.GroupCount = int.Parse(objwrk[(int)TableColumn.GroupCount].ToString()); // グループ番号 |
417 | 417 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号 |
418 |
wrk.ColumnCount = int.Parse(objwrk[(int)TableColumn.ColumnCount].ToString()); // 列番号
|
|
419 |
wrk.PaymentAmount = double.Parse(objwrk[(int)TableColumn.PaymentAmount].ToString()); // 支払金額
|
|
420 |
wrk.TargetMonth = DateTime.Parse(objwrk[(int)TableColumn.TargetMonth].ToString()); // 対象年月
|
|
418 |
wrk.ColumnCount = int.Parse(objwrk[(int)TableColumn.ColumnCount].ToString()); // 列番号 |
|
419 |
wrk.PaymentAmount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.PaymentAmount]); // 支払金額
|
|
420 |
wrk.TargetMonth = DateTime.Parse(objwrk[(int)TableColumn.TargetMonth].ToString()); // 対象年月 |
|
421 | 421 |
|
422 | 422 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
423 | 423 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOCostDataOfPerson.cs | ||
---|---|---|
378 | 378 |
wrk.SuppliersName = objwrk[(int)TableColumn.SuppliersName].ToString(); // 支払先名称 |
379 | 379 |
wrk.PaymentContent = objwrk[(int)TableColumn.PaymentContent].ToString(); // 支払内容 |
380 | 380 |
wrk.PaymentType = int.Parse(objwrk[(int)TableColumn.PaymentType].ToString()); // 支払方法フラグ |
381 |
wrk.EntryPrice = double.Parse(objwrk[(int)TableColumn.EntryPrice].ToString()); // 金額(税抜)
|
|
382 |
wrk.EntryPriceInTax = double.Parse(objwrk[(int)TableColumn.EntryPriceInTax].ToString()); // 金額(税込)
|
|
381 |
wrk.EntryPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.EntryPrice]); // 金額(税抜)
|
|
382 |
wrk.EntryPriceInTax = CommonMotions.cnvDouble(objwrk[(int)TableColumn.EntryPriceInTax]); // 金額(税込)
|
|
383 | 383 |
wrk.SlipNumber = objwrk[(int)TableColumn.SlipNumber].ToString(); // 伝票番号 |
384 | 384 |
wrk.ComplateFlg = int.Parse(objwrk[(int)TableColumn.ComplateFlg].ToString()); // 引込済みフラグ |
385 | 385 |
wrk.ApprovalFlg = int.Parse(objwrk[(int)TableColumn.ApprovalFlg].ToString()); // 承認フラグ |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IODailyDataDetail.cs | ||
---|---|---|
457 | 457 |
wrk.SeqNo = int.Parse(objwrk[(int)TableColumn.SeqNo].ToString()); // 明細行番号 |
458 | 458 |
wrk.JobCategoryCode = int.Parse(objwrk[(int)TableColumn.JobCategoryCode].ToString()); // 職種キー |
459 | 459 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード |
460 |
wrk.TodayHeadCount = double.Parse(objwrk[(int)TableColumn.TodayHeadCount].ToString()); // 当日人員数
|
|
461 |
wrk.TotalHeadCount = double.Parse(objwrk[(int)TableColumn.TotalHeadCount].ToString()); // 累計人員数
|
|
460 |
wrk.TodayHeadCount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.TodayHeadCount]); // 当日人員数
|
|
461 |
wrk.TotalHeadCount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.TotalHeadCount]); // 累計人員数
|
|
462 | 462 |
wrk.TodayWork = objwrk[(int)TableColumn.TodayWork].ToString(); // 当日作業内容 |
463 | 463 |
wrk.NextdayWork = objwrk[(int)TableColumn.NextdayWork].ToString(); // 翌日作業内容 |
464 |
wrk.NextdayHeadCount = double.Parse(objwrk[(int)TableColumn.NextdayHeadCount].ToString()); // 翌日人員数
|
|
464 |
wrk.NextdayHeadCount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.NextdayHeadCount]); // 翌日人員数
|
|
465 | 465 |
|
466 | 466 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
467 | 467 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOEstimateBudget.cs | ||
---|---|---|
358 | 358 |
|
359 | 359 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
360 | 360 |
|
361 |
wrk.ConstructionTime = double.Parse(objwrk[(int)TableColumn.ConstructionTime].ToString()); // 工期
|
|
362 |
wrk.IntegratedCode = int.Parse(objwrk[(int)TableColumn.IntegratedCode].ToString()); // 積算者
|
|
363 |
wrk.DataCreateDate = DateTime.Parse(objwrk[(int)TableColumn.DataCreateDate].ToString()); // 引込日
|
|
364 |
wrk.RetValue1 = double.Parse(objwrk[(int)TableColumn.RetValue1].ToString()); // 予定価格
|
|
365 |
wrk.RetValue2 = double.Parse(objwrk[(int)TableColumn.RetValue2].ToString()); // 直接工事費
|
|
366 |
wrk.RetValue3 = double.Parse(objwrk[(int)TableColumn.RetValue3].ToString()); // 積み上げ共通仮設費
|
|
367 |
wrk.RetValue4 = double.Parse(objwrk[(int)TableColumn.RetValue4].ToString()); // 積み上げ現場管理費
|
|
368 |
wrk.RetPercent = double.Parse(objwrk[(int)TableColumn.RetPercent].ToString()); // 一般管理費率
|
|
361 |
wrk.ConstructionTime = CommonMotions.cnvDouble(objwrk[(int)TableColumn.ConstructionTime]); // 工期
|
|
362 |
wrk.IntegratedCode = int.Parse(objwrk[(int)TableColumn.IntegratedCode].ToString()); // 積算者 |
|
363 |
wrk.DataCreateDate = DateTime.Parse(objwrk[(int)TableColumn.DataCreateDate].ToString()); // 引込日 |
|
364 |
wrk.RetValue1 = CommonMotions.cnvDouble(objwrk[(int)TableColumn.RetValue1]); // 予定価格
|
|
365 |
wrk.RetValue2 = CommonMotions.cnvDouble(objwrk[(int)TableColumn.RetValue2]); // 直接工事費
|
|
366 |
wrk.RetValue3 = CommonMotions.cnvDouble(objwrk[(int)TableColumn.RetValue3]); // 積み上げ共通仮設費
|
|
367 |
wrk.RetValue4 = CommonMotions.cnvDouble(objwrk[(int)TableColumn.RetValue4]); // 積み上げ現場管理費
|
|
368 |
wrk.RetPercent = CommonMotions.cnvDouble(objwrk[(int)TableColumn.RetPercent]); // 一般管理費率
|
|
369 | 369 |
|
370 | 370 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
371 | 371 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOEstimateBudgetDetail.cs | ||
---|---|---|
426 | 426 |
{ |
427 | 427 |
// データ取得 |
428 | 428 |
|
429 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号
|
|
429 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
|
430 | 430 |
|
431 | 431 |
wrk.GroupCount = int.Parse(objwrk[(int)TableColumn.GroupCount].ToString()); // グループ番号 |
432 | 432 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号 |
... | ... | |
434 | 434 |
wrk.ItemCode = int.Parse(objwrk[(int)TableColumn.ItemCode].ToString()); // 工種キー |
435 | 435 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード |
436 | 436 |
wrk.FirstString = objwrk[(int)TableColumn.FirstString].ToString(); // 構成名称 |
437 |
wrk.SecondString = objwrk[(int)TableColumn.SecondString].ToString(); // 工種名称・協力会社名
|
|
438 |
wrk.EstimatePrice = double.Parse(objwrk[(int)TableColumn.EstimatePrice].ToString()); // 見積時金額
|
|
439 |
wrk.NegotiationPrice = double.Parse(objwrk[(int)TableColumn.NegotiationPrice].ToString()); // 交渉時金額
|
|
437 |
wrk.SecondString = objwrk[(int)TableColumn.SecondString].ToString(); // 工種名称・協力会社名 |
|
438 |
wrk.EstimatePrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.EstimatePrice]); // 見積時金額
|
|
439 |
wrk.NegotiationPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.NegotiationPrice]); // 交渉時金額
|
|
440 | 440 |
|
441 |
wrk.Notes = objwrk[(int)TableColumn.Notes].ToString(); // 注意事項
|
|
441 |
wrk.Notes = objwrk[(int)TableColumn.Notes].ToString(); // 注意事項 |
|
442 | 442 |
|
443 | 443 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
444 | 444 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOEstimateData.cs | ||
---|---|---|
399 | 399 |
try |
400 | 400 |
{ |
401 | 401 |
// データ取得 |
402 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号
|
|
403 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号
|
|
404 |
wrk.ComponentCode = int.Parse(objwrk[(int)TableColumn.ComponentCode].ToString()); // 構成キー
|
|
402 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
|
403 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号 |
|
404 |
wrk.ComponentCode = int.Parse(objwrk[(int)TableColumn.ComponentCode].ToString()); // 構成キー |
|
405 | 405 |
wrk.FixedItemCode = objwrk[(int)TableColumn.FixedItemCode].ToString(); // 固定項目キー |
406 | 406 |
wrk.ItemName = objwrk[(int)TableColumn.ItemName].ToString(); // 作業名称 |
407 | 407 |
wrk.SpecName = objwrk[(int)TableColumn.SpecName].ToString(); // 品質・形状・寸法 |
408 |
wrk.PriceValue = double.Parse(objwrk[(int)TableColumn.PriceValue].ToString()); // 金額
|
|
409 |
wrk.Note = objwrk[(int)TableColumn.Note].ToString(); // 備考
|
|
410 |
wrk.MyExpensesFlg = int.Parse(objwrk[(int)TableColumn.MyExpensesFlg].ToString()); // 自社経費フラグ
|
|
411 |
wrk.InputFlg = int.Parse(objwrk[(int)TableColumn.InputFlg].ToString()); // 入力フラグ
|
|
408 |
wrk.PriceValue = CommonMotions.cnvDouble(objwrk[(int)TableColumn.PriceValue]); // 金額
|
|
409 |
wrk.Note = objwrk[(int)TableColumn.Note].ToString(); // 備考 |
|
410 |
wrk.MyExpensesFlg = int.Parse(objwrk[(int)TableColumn.MyExpensesFlg].ToString()); // 自社経費フラグ |
|
411 |
wrk.InputFlg = int.Parse(objwrk[(int)TableColumn.InputFlg].ToString()); // 入力フラグ |
|
412 | 412 |
|
413 | 413 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
414 | 414 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOEstimateDataDetail.cs | ||
---|---|---|
470 | 470 |
// データ取得 |
471 | 471 |
|
472 | 472 |
wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString()); // 工事番号 |
473 |
wrk.PageCount = int.Parse(objwrk[(int)TableColumn.PageCount].ToString()); // ページ番号
|
|
474 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号
|
|
473 |
wrk.PageCount = int.Parse(objwrk[(int)TableColumn.PageCount].ToString()); // ページ番号 |
|
474 |
wrk.LineCount = int.Parse(objwrk[(int)TableColumn.LineCount].ToString()); // 行番号 |
|
475 | 475 |
wrk.DataType = int.Parse(objwrk[(int)TableColumn.DataType].ToString()); // データタイプ |
476 |
wrk.ComponentCode = int.Parse(objwrk[(int)TableColumn.ComponentCode].ToString()); // 構成キー(行)
|
|
476 |
wrk.ComponentCode = int.Parse(objwrk[(int)TableColumn.ComponentCode].ToString()); // 構成キー(行) |
|
477 | 477 |
wrk.ItemCode = int.Parse(objwrk[(int)TableColumn.ItemCode].ToString()); // 工種キー |
478 | 478 |
wrk.SpecCode = int.Parse(objwrk[(int)TableColumn.SpecCode].ToString()); // 規格・寸法キー |
479 |
wrk.ItemName = objwrk[(int)TableColumn.ItemName].ToString(); // 作業名称
|
|
480 |
wrk.SpecName = objwrk[(int)TableColumn.SpecName].ToString(); // 作業/品質・形状・寸法
|
|
481 |
wrk.UnitCount = double.Parse(objwrk[(int)TableColumn.UnitCount].ToString()); // 数量
|
|
482 |
wrk.UnitName = objwrk[(int)TableColumn.UnitName].ToString(); // 単位
|
|
483 |
wrk.UnitPrice = double.Parse(objwrk[(int)TableColumn.UnitPrice].ToString()); // 単価
|
|
484 |
wrk.LineTotal = double.Parse(objwrk[(int)TableColumn.LineTotal].ToString()); // 金額
|
|
485 |
wrk.Note = objwrk[(int)TableColumn.Note].ToString(); // 備考
|
|
486 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード
|
|
487 |
wrk.MyExpensesFlg = int.Parse(objwrk[(int)TableColumn.MyExpensesFlg].ToString()); // 自社経費フラグ
|
|
488 |
wrk.InputFlg = int.Parse(objwrk[(int)TableColumn.InputFlg].ToString()); // 入力フラグ
|
|
479 |
wrk.ItemName = objwrk[(int)TableColumn.ItemName].ToString(); // 作業名称 |
|
480 |
wrk.SpecName = objwrk[(int)TableColumn.SpecName].ToString(); // 作業/品質・形状・寸法 |
|
481 |
wrk.UnitCount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.UnitCount]); // 数量
|
|
482 |
wrk.UnitName = objwrk[(int)TableColumn.UnitName].ToString(); // 単位 |
|
483 |
wrk.UnitPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.UnitPrice]); // 単価
|
|
484 |
wrk.LineTotal = CommonMotions.cnvDouble(objwrk[(int)TableColumn.LineTotal]); // 金額
|
|
485 |
wrk.Note = objwrk[(int)TableColumn.Note].ToString(); // 備考 |
|
486 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード |
|
487 |
wrk.MyExpensesFlg = int.Parse(objwrk[(int)TableColumn.MyExpensesFlg].ToString()); // 自社経費フラグ |
|
488 |
wrk.InputFlg = int.Parse(objwrk[(int)TableColumn.InputFlg].ToString()); // 入力フラグ |
|
489 | 489 |
|
490 | 490 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString()); |
491 | 491 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMConstructionSpec.cs | ||
---|---|---|
369 | 369 |
wrk.SpecName = objwrk[(int)TableColumn.SpecName].ToString(); |
370 | 370 |
wrk.UnitName = objwrk[(int)TableColumn.UnitName].ToString(); |
371 | 371 |
|
372 |
wrk.UnitPrice = double.Parse(objwrk[(int)TableColumn.UnitPrice].ToString());
|
|
372 |
wrk.UnitPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.UnitPrice]);
|
|
373 | 373 |
|
374 | 374 |
wrk.DeleteFlg = int.Parse(objwrk[(int)TableColumn.DeleteFlg].ToString()); |
375 | 375 |
|
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMDepartmentExpenses.cs | ||
---|---|---|
406 | 406 |
wrk.NameCode = int.Parse(objwrk[(int)NameColumn.NameCode].ToString()); |
407 | 407 |
wrk.ExpensesPeriod = int.Parse(objwrk[(int)NameColumn.ExpensesPeriod].ToString()); |
408 | 408 |
wrk.DisplayOrder = int.Parse(objwrk[(int)NameColumn.DisplayOrder].ToString()); |
409 |
wrk.ExpensesRaito = double.Parse(objwrk[(int)NameColumn.ExpensesRaito].ToString());
|
|
409 |
wrk.ExpensesRaito = CommonMotions.cnvDouble(objwrk[(int)NameColumn.ExpensesRaito]);
|
|
410 | 410 |
wrk.DeleteFlg = int.Parse(objwrk[(int)NameColumn.DeleteFlg].ToString()); |
411 | 411 |
|
412 | 412 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.EntryDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMExpenses.cs | ||
---|---|---|
288 | 288 |
wrk.DivisionCode = int.Parse(objwrk[(int)NameColumn.DivisionCode].ToString()); |
289 | 289 |
wrk.NameCode = int.Parse(objwrk[(int)NameColumn.NameCode].ToString()); |
290 | 290 |
wrk.DisplayOrder = int.Parse(objwrk[(int)NameColumn.DisplayOrder].ToString()); |
291 |
wrk.ExpensesRaito = double.Parse(objwrk[(int)NameColumn.ExpensesRaito].ToString());
|
|
291 |
wrk.ExpensesRaito = CommonMotions.cnvDouble(objwrk[(int)NameColumn.ExpensesRaito]);
|
|
292 | 292 |
wrk.DeleteFlg = int.Parse(objwrk[(int)NameColumn.DeleteFlg].ToString()); |
293 | 293 |
|
294 | 294 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.EntryDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMPersonInCharge.cs | ||
---|---|---|
440 | 440 |
wrk.MsgBackColor = objwrk[(int)ColumnCnt.MsgBackColor].ToString(); |
441 | 441 |
wrk.DisplayString = objwrk[(int)ColumnCnt.DisplayString].ToString(); |
442 | 442 |
wrk.DepartmentCode = int.Parse(objwrk[(int)ColumnCnt.DepartmentCode].ToString()); |
443 |
wrk.MonthlySalary = double.Parse(objwrk[(int)ColumnCnt.MonthlySalary].ToString());
|
|
444 |
wrk.YearSalary = double.Parse(objwrk[(int)ColumnCnt.YearSalary].ToString());
|
|
443 |
wrk.MonthlySalary = CommonMotions.cnvDouble(objwrk[(int)ColumnCnt.MonthlySalary]);
|
|
444 |
wrk.YearSalary = CommonMotions.cnvDouble(objwrk[(int)ColumnCnt.YearSalary]);
|
|
445 | 445 |
wrk.Qualification = objwrk[(int)ColumnCnt.Qualification].ToString(); |
446 | 446 |
wrk.SealPrintName = objwrk[(int)ColumnCnt.SealPrintName].ToString(); |
447 | 447 |
wrk.EmployeeClassFlg = int.Parse(objwrk[(int)ColumnCnt.EmployeeClassFlg].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMPersonSalary.cs | ||
---|---|---|
334 | 334 |
// データ取得 |
335 | 335 |
wrk.PersonCode = int.Parse(objwrk[(int)NameColumn.PersonCode].ToString()); |
336 | 336 |
wrk.StartDate = DateTime.Parse(objwrk[(int)NameColumn.StartDate].ToString()); |
337 |
wrk.MonthlySalary = double.Parse(objwrk[(int)NameColumn.MonthlySalary].ToString());
|
|
338 |
wrk.YearSalary = double.Parse(objwrk[(int)NameColumn.YearSalary].ToString());
|
|
337 |
wrk.MonthlySalary = CommonMotions.cnvDouble(objwrk[(int)NameColumn.MonthlySalary]);
|
|
338 |
wrk.YearSalary = CommonMotions.cnvDouble(objwrk[(int)NameColumn.YearSalary]);
|
|
339 | 339 |
|
340 | 340 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.EntryDate].ToString()); |
341 | 341 |
wrk.UpdateDate = DateTime.Parse(objwrk[(int)NameColumn.UpdateDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSystem.cs | ||
---|---|---|
382 | 382 |
wrk.Address3 = objwrk[(int)SystemColumn.ADDRESS3].ToString(); |
383 | 383 |
wrk.PhoneNumber = objwrk[(int)SystemColumn.PHONENUMBER].ToString(); |
384 | 384 |
wrk.FaxNumber = objwrk[(int)SystemColumn.FAXNUMBER].ToString(); |
385 |
wrk.ConstructionExpenses = double.Parse(objwrk[(int)SystemColumn.CONSTRUCTIONEXPENSES].ToString());
|
|
386 |
wrk.OfficeExpenses = double.Parse(objwrk[(int)SystemColumn.OFFICEEXPENSES].ToString());
|
|
387 |
wrk.OperatingExpenses = double.Parse(objwrk[(int)SystemColumn.OPERATINGEXPENSES].ToString());
|
|
388 |
wrk.ConsumptionTax = double.Parse(objwrk[(int)SystemColumn.CONSUMPTIONTAX].ToString());
|
|
389 |
wrk.CooperationRate = double.Parse(objwrk[(int)SystemColumn.COOPERATIONRATE].ToString());
|
|
385 |
wrk.ConstructionExpenses = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.CONSTRUCTIONEXPENSES]);
|
|
386 |
wrk.OfficeExpenses = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.OFFICEEXPENSES]);
|
|
387 |
wrk.OperatingExpenses = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.OPERATINGEXPENSES]);
|
|
388 |
wrk.ConsumptionTax = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.CONSUMPTIONTAX]);
|
|
389 |
wrk.CooperationRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.COOPERATIONRATE]);
|
|
390 | 390 |
wrk.ExcelSavePath = objwrk[(int)SystemColumn.EXCELSAVEPATH].ToString(); |
391 | 391 |
|
392 | 392 |
wrk.BusinessPeriod = int.Parse(objwrk[(int)SystemColumn.BUSINESSPERIOD].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMTypeExpenses.cs | ||
---|---|---|
376 | 376 |
wrk.TypeCode = int.Parse(objwrk[(int)NameColumn.TypeCode].ToString()); |
377 | 377 |
wrk.ExpensesPeriod = int.Parse(objwrk[(int)NameColumn.ExpensesPeriod].ToString()); |
378 | 378 |
wrk.NameCode = int.Parse(objwrk[(int)NameColumn.NameCode].ToString()); |
379 |
wrk.ExpensesRaito = double.Parse(objwrk[(int)NameColumn.ExpensesRaito].ToString());
|
|
379 |
wrk.ExpensesRaito = CommonMotions.cnvDouble(objwrk[(int)NameColumn.ExpensesRaito]);
|
|
380 | 380 |
wrk.DeleteFlg = int.Parse(objwrk[(int)NameColumn.DeleteFlg].ToString()); |
381 | 381 |
|
382 | 382 |
wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.EntryDate].ToString()); |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrder.cs | ||
---|---|---|
585 | 585 |
wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString()); // 協力会社コード |
586 | 586 |
|
587 | 587 |
wrk.CreateDate = DateTime.Parse(objwrk[(int)TableColumn.CreateDate].ToString()); // 作成日付 |
588 |
wrk.OrderPrice = double.Parse(objwrk[(int)TableColumn.OrderPrice].ToString()); // 発注金額
|
|
588 |
wrk.OrderPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OrderPrice]); // 発注金額
|
|
589 | 589 |
wrk.LastRowStringDate = DateTime.Parse(objwrk[(int)TableColumn.LastRowStringDate].ToString()); // 最終行表示文字 |
590 | 590 |
wrk.OrderSheetType = int.Parse(objwrk[(int)TableColumn.OrderSheetType].ToString()); // 簡易・本式フラグ |
591 | 591 |
wrk.PaymentTerms = int.Parse(objwrk[(int)TableColumn.PaymentTerms].ToString()); // 支払い条件 |
592 |
wrk.CashRatio = double.Parse(objwrk[(int)TableColumn.CashRatio].ToString()); // 現金割合(%)
|
|
592 |
wrk.CashRatio = CommonMotions.cnvDouble(objwrk[(int)TableColumn.CashRatio]); // 現金割合(%)
|
|
593 | 593 |
wrk.BillPeriod = int.Parse(objwrk[(int)TableColumn.BillPeriod].ToString()); // 手形期間 |
594 | 594 |
|
595 | 595 |
wrk.PrePayments = int.Parse(objwrk[(int)TableColumn.PrePayments].ToString()); // 前金払 |
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrderDetail.cs | ||
---|---|---|
464 | 464 |
wrk.ItemCode = int.Parse(objwrk[(int)TableColumn.ItemCode].ToString()); // 工種キー |
465 | 465 |
wrk.FirstString = objwrk[(int)TableColumn.FirstString].ToString(); // 工種・品名 |
466 | 466 |
wrk.SecondString = objwrk[(int)TableColumn.SecondString].ToString(); // 内容内訳 |
467 |
wrk.UnitCount = double.Parse(objwrk[(int)TableColumn.UnitCount].ToString()); // 数量
|
|
467 |
wrk.UnitCount = CommonMotions.cnvDouble(objwrk[(int)TableColumn.UnitCount]); // 数量
|
|
468 | 468 |
wrk.UnitName = objwrk[(int)TableColumn.UnitName].ToString(); // 単位 |
469 |
wrk.UnitPrice = double.Parse(objwrk[(int)TableColumn.UnitPrice].ToString()); // 単価
|
|
470 |
wrk.OrdersLinePrice = double.Parse(objwrk[(int)TableColumn.OrdersLinePrice].ToString()); // 金額
|
|
469 |
wrk.UnitPrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.UnitPrice]); // 単価
|
|
470 |
wrk.OrdersLinePrice = CommonMotions.cnvDouble(objwrk[(int)TableColumn.OrdersLinePrice]); // 金額
|
|
471 | 471 |
wrk.SourceCode = int.Parse(objwrk[(int)TableColumn.SourceCode].ToString()); // 予算作成時工事番号 |
472 | 472 |
wrk.SourceLineCnt = int.Parse(objwrk[(int)TableColumn.SourceLineCnt].ToString()); // 注文書作成時台帳行番号 |
473 | 473 |
|
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOTranceportDailyData.cs | ||
---|---|---|
447 | 447 |
wrk.PersonCode = int.Parse(objwrk[(int)TableColumn.PersonCode].ToString()); // 担当者コード |
448 | 448 |
wrk.AttendanceDate = DateTime.Parse(objwrk[(int)TableColumn.AttendanceDate].ToString()); // 日報作成日 |
449 | 449 |
|
450 |
wrk.StartDistance = double.Parse(objwrk[(int)TableColumn.StartDistance].ToString()); // 当日出発キロ数
|
|
451 |
wrk.ComplateDistance = double.Parse(objwrk[(int)TableColumn.ComplateDistance].ToString()); // 当日終了キロ数
|
|
452 |
wrk.TotalDistance = double.Parse(objwrk[(int)TableColumn.TotalDistance].ToString()); // 当日合計キロ数
|
|
450 |
wrk.StartDistance = CommonMotions.cnvDouble(objwrk[(int)TableColumn.StartDistance]); // 当日出発キロ数
|
|
451 |
wrk.ComplateDistance = CommonMotions.cnvDouble(objwrk[(int)TableColumn.ComplateDistance]); // 当日終了キロ数
|
|
452 |
wrk.TotalDistance = CommonMotions.cnvDouble(objwrk[(int)TableColumn.TotalDistance]); // 当日合計キロ数
|
|
453 | 453 |
wrk.OfficeGoFlg = int.Parse(objwrk[(int)TableColumn.OfficeGoFlg].ToString()); // 事務所出勤フラグ |
454 | 454 |
wrk.OfficeOutFlg = int.Parse(objwrk[(int)TableColumn.OfficeOutFlg].ToString()); // 事務所帰宅フラグ |
455 | 455 |
wrk.TrancePayGoFlg = int.Parse(objwrk[(int)TableColumn.TrancePayGoFlg].ToString()); // 有料通勤出勤フラグ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
---|---|---|
1958 | 1958 |
} |
1959 | 1959 |
|
1960 | 1960 |
strSQL += " AND DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) IS NOT NULL"; |
1961 |
strSQL += string.Format(" AND (DATE('{0}') <= DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days))", dtStart.ToShortDateString()); |
|
1962 |
strSQL += string.Format(" AND DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) <= DATE('{0}'))", dtLast.ToShortDateString()); |
|
1961 | 1963 |
strSQL += " ORDER BY d) A"; |
1962 | 1964 |
strSQL += ", PERSONSALARYMASTER AS B"; |
1963 | 1965 |
strSQL += " WHERE B.STARTDATE <= A.d"; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
---|---|---|
1983 | 1983 |
} |
1984 | 1984 |
|
1985 | 1985 |
strSQL += " AND DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) IS NOT NULL"; |
1986 |
strSQL += string.Format(" AND (DATE('{0}') <= DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days))", dtStart.ToShortDateString()); |
|
1987 |
strSQL += string.Format(" AND DATE(CONCAT(A1.years, '/', A2.month, '/', A3.days)) <= DATE('{0}'))", dtLast.ToShortDateString()); |
|
1986 | 1988 |
strSQL += " ORDER BY d) A"; |
1987 | 1989 |
strSQL += ", PERSONSALARYMASTER AS B"; |
1988 | 1990 |
strSQL += " WHERE B.STARTDATE <= A.d"; |
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.30")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.30")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.32")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.32")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff