リビジョン 190
協力業者検索画面不具合のため元に戻す
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 42;
|
|
17 |
public static int s_SystemVersion = 43;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubConJobDiag.cs | ||
---|---|---|
327 | 327 |
cmbJapaneseSyllabary.SelectedIndex = -1; |
328 | 328 |
cmbLabour.SelectedIndex = -1; |
329 | 329 |
|
330 |
StringBuilder strSQL = new StringBuilder(); |
|
331 |
strSQL.Append(" Where CompanyCode In (Select A1.CompanyCode From SUBCONTRACTORJOBLINK A1"); |
|
332 |
strSQL.AppendFormat(" Where A1.JobCategoryCode = {0})", CommonMotions.cnvInt(cmbJobType.SelectedValue)); |
|
333 |
strSQL.Append(" AND DELETEFLG = 0"); |
|
334 |
strSQL.Append(" Order By DisplayOrder"); |
|
330 |
string strSQL = " Where CompanyCode In (Select A1.CompanyCode From SUBCONTRACTORJOBLINK A1"; |
|
331 |
strSQL += string.Format(" Where A1.JobCategoryCode = {0})", CommonMotions.cnvInt(cmbJobType.SelectedValue)); |
|
332 |
strSQL += " AND DELETEFLG = 0"; |
|
333 |
strSQL += " Order By DisplayOrder"; |
|
335 | 334 |
// データ表示 |
336 |
DispMasterGridData(strSQL.ToString());
|
|
335 |
DispMasterGridData(strSQL); |
|
337 | 336 |
} |
338 | 337 |
catch (Exception ex) |
339 | 338 |
{ |
... | ... | |
357 | 356 |
cmbJobType.SelectedIndex = -1; |
358 | 357 |
cmbLabour.SelectedIndex = -1; |
359 | 358 |
|
360 |
StringBuilder strSQL = new StringBuilder(); |
|
361 |
strSQL.AppendFormat(" Where JapaneseSyllabary = '{0}'", cmbJapaneseSyllabary.SelectedValue); |
|
362 |
strSQL.Append(" AND DELETEFLG = 0"); |
|
363 |
strSQL.Append(" Order By DisplayOrder"); |
|
359 |
string strSQL = " Where JapaneseSyllabary = '" + cmbJapaneseSyllabary.SelectedValue.ToString() + "'"; |
|
360 |
strSQL += " AND DELETEFLG = 0"; |
|
361 |
strSQL += " Order By DisplayOrder"; |
|
364 | 362 |
// データ表示 |
365 |
DispMasterGridData(strSQL.ToString());
|
|
363 |
DispMasterGridData(strSQL); |
|
366 | 364 |
} |
367 | 365 |
catch (Exception ex) |
368 | 366 |
{ |
... | ... | |
386 | 384 |
cmbJapaneseSyllabary.SelectedIndex = -1; |
387 | 385 |
cmbJobType.SelectedIndex = -1; |
388 | 386 |
|
389 |
StringBuilder strSQL = new StringBuilder(); |
|
390 |
strSQL.AppendFormat(" Where labourKind = {0}", cmbLabour.SelectedValue); |
|
391 |
strSQL.Append(" AND DELETEFLG = 0"); |
|
392 |
strSQL.Append(" Order By DisplayOrder"); |
|
387 |
string strSQL = string.Format(" Where labourKind = {0}", cmbLabour.SelectedValue); |
|
388 |
strSQL += " AND DELETEFLG = 0"; |
|
389 |
strSQL += " Order By DisplayOrder"; |
|
393 | 390 |
// データ表示 |
394 |
DispMasterGridData(strSQL.ToString());
|
|
391 |
DispMasterGridData(strSQL); |
|
395 | 392 |
|
396 | 393 |
} |
397 | 394 |
catch (Exception ex) |
... | ... | |
429 | 426 |
try |
430 | 427 |
{ |
431 | 428 |
string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
432 |
InputSearchLogData isdList = new InputSearchLogData();
|
|
429 |
List<InputSearchLogData> isdList = new List<InputSearchLogData>();
|
|
433 | 430 |
if (!isdDB.SelectAction(strSQL, ref isdList)) return false; |
431 |
if (isdList.Count == 0) return false; |
|
434 | 432 |
|
435 | 433 |
return true; |
436 | 434 |
} |
... | ... | |
502 | 500 |
|
503 | 501 |
List<InputSearchLogData> isdList = new List<InputSearchLogData>(); |
504 | 502 |
// SQL作成 |
505 |
StringBuilder strSQL = new StringBuilder(); |
|
506 |
strSQL.AppendFormat(" Where truncate(ConstructionCode / 100, 0) = {0}", CommonMotions.cnvTruncate((double)m_ConstructionCode / 100.0)); |
|
507 |
strSQL.AppendFormat(" And UsedProcessNo = {0}", m_UsedProcessNo); |
|
508 |
strSQL.Append(" Group by InputCode"); |
|
509 |
strSQL.Append(" Order By DisplayOrder"); |
|
510 |
if (!isdDB.SelectAction(strSQL.ToString(), ref isdList)) return; |
|
503 |
string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
|
504 |
strSQL += " Order By DisplayOrder"; |
|
505 |
if (!isdDB.SelectAction(strSQL, ref isdList)) return; |
|
511 | 506 |
|
512 | 507 |
// 要素表示 |
513 | 508 |
int i = 0; |
... | ... | |
523 | 518 |
else |
524 | 519 |
{ |
525 | 520 |
// 協力会社マスタ取得 |
526 |
strSQL = new StringBuilder(); |
|
527 |
strSQL.Append(sbcDB.CreatePrimarykeyString(wrk.InputCode)); |
|
528 |
strSQL.Append(" AND DELETEFLG = 0"); |
|
529 |
if (!sbcDB.SelectAction(strSQL.ToString(), ref sbcRec)) continue; |
|
521 |
strSQL = sbcDB.CreatePrimarykeyString(wrk.InputCode); |
|
522 |
strSQL += " AND DELETEFLG = 0"; |
|
523 |
if (!sbcDB.SelectAction(strSQL, ref sbcRec)) continue; |
|
530 | 524 |
} |
531 | 525 |
int iRows = dgvHistory.Rows.Add(++i, |
532 | 526 |
sbcRec.CompanyCode, |
... | ... | |
571 | 565 |
} |
572 | 566 |
|
573 | 567 |
// SQL作成 |
574 |
StringBuilder strSQL = new StringBuilder(); |
|
575 |
strSQL.Append(sbcDB.CreatePrimarykeyString(SubContractorCode)); |
|
576 |
strSQL.Append(" AND DELETEFLG = 0"); |
|
568 |
string strSQL = sbcDB.CreatePrimarykeyString(SubContractorCode); |
|
569 |
strSQL += " AND DELETEFLG = 0"; |
|
577 | 570 |
// 協力会社マスタ取得 |
578 |
if (!sbcDB.SelectAction(strSQL.ToString(), ref DataRec)) return false;
|
|
571 |
if (!sbcDB.SelectAction(strSQL, ref DataRec)) return false; |
|
579 | 572 |
|
580 | 573 |
return true; |
581 | 574 |
} |
... | ... | |
827 | 820 |
try |
828 | 821 |
{ |
829 | 822 |
InputSearchLogData isdRec = new InputSearchLogData(); |
830 |
StringBuilder strSQL = new StringBuilder(); |
|
831 |
strSQL.Append(isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo)); |
|
832 |
strSQL.AppendFormat(" And InputCode = {0}", SubconstructorCode); |
|
823 |
string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
|
824 |
strSQL += string.Format(" And InputCode = {0}", SubconstructorCode); |
|
833 | 825 |
|
834 | 826 |
// データがあれば登録しない |
835 |
if (isdDB.SelectAction(strSQL.ToString(), ref isdRec)) return true;
|
|
827 |
if (isdDB.SelectAction(strSQL, ref isdRec)) return true; |
|
836 | 828 |
|
837 | 829 |
// 最大表示番号を取得する |
838 | 830 |
string strMax = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubconstractorDiag.cs | ||
---|---|---|
529 | 529 |
if (m_InitFlg) return; |
530 | 530 |
|
531 | 531 |
// 工種検索条件取得 |
532 |
StringBuilder strSQL = new StringBuilder(); |
|
533 |
strSQL.Append(GetSqlFromCmbItemType()); |
|
534 |
if (strSQL.Length != 0) strSQL.AppendFormat("{0} {1}", s_SQLWHERE, strSQL.ToString()); |
|
532 |
string strSQL = GetSqlFromCmbItemType(); |
|
533 |
if (strSQL.Length != 0) strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL); |
|
535 | 534 |
|
536 | 535 |
// 50音検索条件取得 |
537 |
StringBuilder SecondSQL = new StringBuilder(); |
|
538 |
SecondSQL.Append(GetSqlFromcmbJapaneseSyllabary()); |
|
539 |
if (SecondSQL.Length != 0) strSQL.AppendFormat(" {0} {1}", s_SQLAND, SecondSQL.ToString()); |
|
536 |
string SecondSQL = GetSqlFromcmbJapaneseSyllabary(); |
|
537 |
if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL); |
|
540 | 538 |
|
541 | 539 |
// 支払区分検索条件取得 |
542 |
StringBuilder ThirdSQL = new StringBuilder(); |
|
543 |
ThirdSQL.Append(GetSqlFromcmbLabour()); |
|
544 |
if (ThirdSQL.Length != 0) strSQL.AppendFormat("{0} {1}", s_SQLAND, ThirdSQL.ToString()); |
|
540 |
string ThirdSQL = GetSqlFromcmbLabour(); ; |
|
541 |
if (ThirdSQL.Length != 0) strSQL += string.Format("{0} {1}", s_SQLAND, ThirdSQL); |
|
545 | 542 |
|
546 |
strSQL.AppendFormat("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
|
|
543 |
strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
|
|
547 | 544 |
|
548 | 545 |
// 文字列にWhereが無い場合は先頭をWhereに変更する |
549 |
if (strSQL.ToString().IndexOf(s_SQLWHERE, 0) < 0)
|
|
546 |
if (strSQL.IndexOf(s_SQLWHERE, 0) < 0) |
|
550 | 547 |
{ |
551 |
strSQL.AppendFormat("{0} {1}", s_SQLWHERE, strSQL.ToString().Substring(s_SQLAND.Length + 1));
|
|
548 |
strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL.Substring(s_SQLAND.Length + 1));
|
|
552 | 549 |
} |
553 | 550 |
|
554 | 551 |
// データ表示 |
555 |
DispSubconstractorMasterGridData(strSQL.ToString());
|
|
552 |
DispSubconstractorMasterGridData(strSQL); |
|
556 | 553 |
} |
557 | 554 |
catch (Exception ex) |
558 | 555 |
{ |
... | ... | |
666 | 663 |
if (m_InitFlg) return; |
667 | 664 |
|
668 | 665 |
// 50音検索条件取得 |
669 |
StringBuilder strSQL = new StringBuilder(); |
|
670 |
strSQL.Append(GetSqlFromcmbJapaneseSyllabary()); |
|
671 |
if (strSQL.Length != 0) strSQL.AppendFormat("{0} {1}", s_SQLWHERE, strSQL); |
|
666 |
string strSQL = GetSqlFromcmbJapaneseSyllabary(); |
|
667 |
if (strSQL.Length != 0) strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL); |
|
672 | 668 |
|
673 | 669 |
// 工種検索条件取得 |
674 |
StringBuilder SecondSQL = new StringBuilder(); |
|
675 |
SecondSQL.Append(GetSqlFromCmbItemType()); |
|
676 |
if (SecondSQL.Length != 0) strSQL.AppendFormat(" {0} {1}", s_SQLAND, SecondSQL.ToString()); |
|
670 |
string SecondSQL = GetSqlFromCmbItemType(); |
|
671 |
if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL); |
|
677 | 672 |
|
678 | 673 |
// 支払区分検索条件取得 |
679 |
StringBuilder ThirdSQL = new StringBuilder(); |
|
680 |
ThirdSQL.Append(GetSqlFromcmbLabour()); |
|
681 |
if (ThirdSQL.Length != 0) strSQL.AppendFormat(" {0} {1}", s_SQLAND, ThirdSQL.ToString()); |
|
674 |
string ThirdSQL = GetSqlFromcmbLabour(); ; |
|
675 |
if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL); |
|
682 | 676 |
|
683 |
strSQL.AppendFormat("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
|
|
677 |
strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
|
|
684 | 678 |
|
685 | 679 |
// 文字列にWhereが無い場合は先頭をWhereに変更する |
686 |
if (strSQL.ToString().IndexOf(s_SQLWHERE, 0) < 0)
|
|
680 |
if (strSQL.IndexOf(s_SQLWHERE, 0) < 0) |
|
687 | 681 |
{ |
688 |
strSQL.AppendFormat("{0} {1}", s_SQLWHERE, strSQL.ToString().Substring(s_SQLAND.Length + 1));
|
|
682 |
strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL.Substring(s_SQLAND.Length + 1));
|
|
689 | 683 |
} |
690 | 684 |
|
691 | 685 |
// データ表示 |
692 |
DispSubconstractorMasterGridData(strSQL.ToString());
|
|
686 |
DispSubconstractorMasterGridData(strSQL); |
|
693 | 687 |
} |
694 | 688 |
catch (Exception ex) |
695 | 689 |
{ |
... | ... | |
877 | 871 |
|
878 | 872 |
List<InputSearchLogData> isdList = new List<InputSearchLogData>(); |
879 | 873 |
// SQL作成 |
880 |
StringBuilder strSQL = new StringBuilder(); |
|
881 |
strSQL.AppendFormat(" Where truncate(ConstructionCode / 100, 0) = {0}", CommonMotions.cnvTruncate((double)m_ConstructionCode / 100.0)); |
|
882 |
strSQL.AppendFormat(" And UsedProcessNo = {0}", m_UsedProcessNo); |
|
883 |
strSQL.Append(" Group by InputCode"); |
|
884 |
strSQL.Append(" Order By DisplayOrder"); |
|
885 |
if (!isdDB.SelectAction(strSQL.ToString(), ref isdList)) return; |
|
874 |
string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
|
875 |
strSQL += " Order By DisplayOrder"; |
|
876 |
if (!isdDB.SelectAction(strSQL, ref isdList)) return; |
|
886 | 877 |
|
887 | 878 |
// 要素表示 |
888 | 879 |
int i = 0; |
... | ... | |
934 | 925 |
IOMPersonInCharge personDB = new IOMPersonInCharge(); |
935 | 926 |
try |
936 | 927 |
{ |
937 |
StringBuilder strSQL = new StringBuilder();
|
|
928 |
string strSQL = string.Empty;
|
|
938 | 929 |
if (DataType == (int)CommonDefine.CodeDataType.FixCode) |
939 | 930 |
{ |
940 | 931 |
// 自社の場合 |
... | ... | |
953 | 944 |
else if (DataType == (int)CommonDefine.CodeDataType.Subconstractor) |
954 | 945 |
{ |
955 | 946 |
// SQL作成 |
956 |
strSQL.Append(sbcDB.CreatePrimarykeyString(SubContractorCode));
|
|
947 |
strSQL = sbcDB.CreatePrimarykeyString(SubContractorCode);
|
|
957 | 948 |
// 工種マスタ取得 |
958 |
if (!sbcDB.SelectAction(strSQL.ToString(), ref DataRec)) return false;
|
|
949 |
if (!sbcDB.SelectAction(strSQL, ref DataRec)) return false; |
|
959 | 950 |
} |
960 | 951 |
else if (DataType == (int)CommonDefine.CodeDataType.Person) |
961 | 952 |
{ |
962 | 953 |
PersonInChargeMaster personRec = new PersonInChargeMaster(); |
963 | 954 |
// SQL作成 |
964 |
strSQL.Append(personDB.CreatePrimarykeyString(SubContractorCode));
|
|
965 |
strSQL.AppendFormat(" AND EmployeeClassFlg = {0} And DeleteFlg = 0", (int)CommonDefine.EmployeeClassFlg.OutSource);
|
|
955 |
strSQL = personDB.CreatePrimarykeyString(SubContractorCode);
|
|
956 |
strSQL += string.Format(" AND EmployeeClassFlg = {0} And DeleteFlg = 0", (int)CommonDefine.EmployeeClassFlg.OutSource);
|
|
966 | 957 |
// 担当者マスタ取得 |
967 |
if (!personDB.SelectAction(strSQL.ToString(), ref personRec)) return false;
|
|
958 |
if (!personDB.SelectAction(strSQL, ref personRec)) return false; |
|
968 | 959 |
DataRec.CompanyCode = personRec.PersonCode; |
969 | 960 |
DataRec.CompanyName = personRec.PersonName; |
970 | 961 |
} |
... | ... | |
1191 | 1182 |
} |
1192 | 1183 |
|
1193 | 1184 |
InputSearchLogData isdRec = new InputSearchLogData(); |
1194 |
StringBuilder strSQL = new StringBuilder(); |
|
1195 |
strSQL.Append(isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo)); |
|
1196 |
strSQL.AppendFormat(" And InputCode = {0}", SubconstructorCode); |
|
1185 |
string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
|
1186 |
strSQL += string.Format(" And InputCode = {0}", SubconstructorCode); |
|
1197 | 1187 |
|
1198 | 1188 |
// データがあれば登録しない |
1199 |
if (isdDB.SelectAction(strSQL.ToString(), ref isdRec)) return true;
|
|
1189 |
if (isdDB.SelectAction(strSQL, ref isdRec)) return true; |
|
1200 | 1190 |
|
1201 | 1191 |
// 最大表示番号を取得する |
1202 | 1192 |
string strMax = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo); |
... | ... | |
1272 | 1262 |
private string CreateSQL() |
1273 | 1263 |
{ |
1274 | 1264 |
// 支払区分検索条件取得 |
1275 |
StringBuilder strSQL = new StringBuilder(); |
|
1276 |
strSQL.Append(GetSqlFromcmbLabour()); |
|
1277 |
if (strSQL.Length != 0) strSQL.AppendFormat("{0} {1}", s_SQLWHERE, strSQL.ToString()); |
|
1265 |
string strSQL = GetSqlFromcmbLabour(); |
|
1266 |
if (strSQL.Length != 0) strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL); |
|
1278 | 1267 |
|
1279 | 1268 |
// 工種検索条件取得 |
1280 |
StringBuilder SecondSQL = new StringBuilder(); |
|
1281 |
SecondSQL.Append(GetSqlFromCmbItemType()); |
|
1282 |
if (SecondSQL.Length != 0) strSQL.AppendFormat(" {0} {1}", s_SQLAND, SecondSQL.ToString()); |
|
1269 |
string SecondSQL = GetSqlFromCmbItemType(); |
|
1270 |
if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL); |
|
1283 | 1271 |
|
1284 | 1272 |
// 50音検索条件取得 |
1285 |
StringBuilder ThirdSQL = new StringBuilder(); |
|
1286 |
ThirdSQL.Append(GetSqlFromcmbJapaneseSyllabary()); |
|
1287 |
if (ThirdSQL.Length != 0) strSQL.AppendFormat(" {0} {1}", s_SQLAND, ThirdSQL.ToString()); |
|
1273 |
string ThirdSQL = GetSqlFromcmbJapaneseSyllabary(); ; |
|
1274 |
if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL); |
|
1288 | 1275 |
|
1289 |
strSQL.AppendFormat("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
|
|
1276 |
strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
|
|
1290 | 1277 |
|
1291 | 1278 |
// 文字列にWhereが無い場合は先頭をWhereに変更する |
1292 |
if (strSQL.ToString().IndexOf(s_SQLWHERE, 0) < 0)
|
|
1279 |
if (strSQL.IndexOf(s_SQLWHERE, 0) < 0) |
|
1293 | 1280 |
{ |
1294 |
strSQL.AppendFormat("{0} {1}", s_SQLWHERE, strSQL.ToString().Substring(s_SQLAND.Length + 1));
|
|
1281 |
strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL.Substring(s_SQLAND.Length + 1));
|
|
1295 | 1282 |
} |
1296 | 1283 |
|
1297 |
return strSQL.ToString();
|
|
1284 |
return strSQL; |
|
1298 | 1285 |
} |
1299 | 1286 |
|
1300 | 1287 |
#endregion |
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.42")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.42")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.43")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.43")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff