リビジョン 278
資材返却、バグ修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 86;
|
|
| 17 |
public static int s_SystemVersion = 87;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs | ||
|---|---|---|
| 498 | 498 |
sql.AppendLine(" , Cmi.JUNKCOUNT");
|
| 499 | 499 |
sql.AppendLine(" , ifnull(Mri.CommentText, '') as CommentText");
|
| 500 | 500 |
sql.AppendLine(" , Cmi.CompleteFlg");
|
| 501 |
sql.AppendLine(" , ifnull(DATE_FORMAT(Mri.RepayPlanDate, '%Y/%m/%d'), '') as RepayPlanDate");
|
|
| 502 |
sql.AppendLine(" , DATE_FORMAT(Cmi.ProcessDate, '%Y/%m/%d')");
|
|
| 501 |
sql.AppendLine(" , DATE_FORMAT(Mri.RepayPlanDate, '%Y/%m/%d') as RepayPlanDate");
|
|
| 502 |
sql.AppendLine(" , DATE_FORMAT(Cmi.ProcessDate, '%Y/%m/%d') as ProcessDate");
|
|
| 503 | 503 |
sql.AppendLine(" , Mri.RECKIND");
|
| 504 | 504 |
|
| 505 | 505 |
sql.AppendLine(" from");
|
| 506 | 506 |
sql.AppendLine(" ConstructionMaterialInfo as Cmi");
|
| 507 |
sql.AppendLine(" , MaterialRecordInfo as Mri");
|
|
| 508 |
|
|
| 509 | 507 |
sql.AppendLine(" left join (");
|
| 510 | 508 |
sql.AppendLine(" MaterialItemMaster as Mim");
|
| 511 | 509 |
sql.AppendLine(" left join MaterialKindMaster as Mkm");
|
| 512 | 510 |
sql.AppendLine(" on Mim.MaterialKindCode = Mkm.MaterialKindCode");
|
| 513 |
sql.AppendLine(" ) on Mri.MATERIALITEMCODE = Mim.MaterialItemCode");
|
|
| 511 |
sql.AppendLine(" ) on Mim.MATERIALITEMCODE = Cmi.MaterialItemCode");
|
|
| 512 |
sql.AppendLine(" , MaterialRecordInfo as Mri");
|
|
| 514 | 513 |
|
| 515 | 514 |
sql.AppendFormat(" where Cmi.ConstructionCode = {0} ", ConstructionCode);
|
| 516 |
sql.AppendLine(" And Cmi.CONSTRUCTIONCODE = Mri.CONSTRUCTIONCODE");
|
|
| 517 |
sql.AppendLine(" And Cmi.MATERIALITEMCODE = Mri.MATERIALITEMCODE");
|
|
| 515 |
sql.AppendLine(" And Mri.CONSTRUCTIONCODE = Cmi.CONSTRUCTIONCODE");
|
|
| 516 |
sql.AppendLine(" And Mri.MATERIALITEMCODE = Cmi.MATERIALITEMCODE");
|
|
| 517 |
sql.AppendLine(" And DATE(Mri.ENTRYDATE) = DATE(Cmi.PROCESSDATE)");
|
|
| 518 |
sql.AppendFormat(" And Mri.RECKIND = {0}", (int)MaterialRecordInfo.RecKindDef.Rental);
|
|
| 519 |
|
|
| 518 | 520 |
sql.AppendLine(" order by");
|
| 519 | 521 |
sql.AppendLine(" Mkm.DisplayOrder");
|
| 520 | 522 |
sql.AppendLine(" , Mim.DisplayOrder ");
|
| 521 |
sql.AppendLine(" , RECKIND");
|
|
| 523 |
sql.AppendLine(" , ProcessDate");
|
|
| 522 | 524 |
|
| 523 | 525 |
// データ取得 |
| 524 | 526 |
if (!IoCmi.ExecuteReader(sql.ToString(), ref arData)) return false; |
| ... | ... | |
| 530 | 532 |
object[] obiSumRec = new object[Enum.GetNames(typeof(DispColumn)).Length]; |
| 531 | 533 |
int[] BreakKey = new int[2]; |
| 532 | 534 |
int[] ReadDataKey = new int[2]; |
| 535 |
DateTime dtReadRentProcessDate = DateTime.MinValue; |
|
| 536 |
DateTime dtBreakRentProcessDate = DateTime.MinValue; |
|
| 533 | 537 |
bool bFirst = true; |
| 534 | 538 |
int[] nCalcWrk = new int[4]; |
| 535 | 539 |
int nCompCnt = 0; |
| ... | ... | |
| 538 | 542 |
|
| 539 | 543 |
ReadDataKey[0] = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindCode]); |
| 540 | 544 |
ReadDataKey[1] = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]); |
| 545 |
dtReadRentProcessDate = CommonMotions.cnvDate(work[(int)DataColumn.RentProcessDate]).Date; |
|
| 541 | 546 |
|
| 547 |
if (ReadDataKey[1] == 107) |
|
| 548 |
{
|
|
| 549 |
Debug.WriteLine("");
|
|
| 550 |
} |
|
| 542 | 551 |
// 種類・品目が違えば表示 |
| 543 |
if (BreakKey[0] == ReadDataKey[0] && BreakKey[1] == ReadDataKey[1]) |
|
| 552 |
if (BreakKey[0] == ReadDataKey[0] && BreakKey[1] == ReadDataKey[1] && dtBreakRentProcessDate == dtReadRentProcessDate)
|
|
| 544 | 553 |
{
|
| 545 | 554 |
|
| 546 | 555 |
} |
| ... | ... | |
| 557 | 566 |
// キーセット |
| 558 | 567 |
BreakKey[0] = ReadDataKey[0]; |
| 559 | 568 |
BreakKey[1] = ReadDataKey[1]; |
| 569 |
dtBreakRentProcessDate = dtReadRentProcessDate; |
|
| 560 | 570 |
bFirst = false; |
| 561 | 571 |
} |
| 562 | 572 |
|
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.86")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.86")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.87")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.87")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff