リビジョン 488
バージョン設定ミス修正
工事情報バグ修正
積算見積入力：数字編集修正
注文書作成修正
メニュー初期時エラー修正
| trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| 21 | 21 |
/// </summary> |
| 22 |
public static int s_UpDateCopyVersion = 2;
|
|
| 22 |
public static int s_UpDateCopyVersion = 1;
|
|
| 23 | 23 |
} |
| 24 | 24 |
} |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
|---|---|---|
| 794 | 794 |
/// <summary> |
| 795 | 795 |
/// ??Z????f?[?^???????z???????? |
| 796 | 796 |
/// </summary> |
| 797 |
private void SetEstimatePraiceValue() |
|
| 797 |
private void SetEstimatePraiceValue(int nStatusFlg)
|
|
| 798 | 798 |
{
|
| 799 | 799 |
try |
| 800 | 800 |
{
|
| 801 |
int EstimatePraice = GetEstimatePrice(0); // ????????o???z |
|
| 802 |
if (EstimatePraice != 0) |
|
| 801 |
int[] nCode = new int[]{ CommonDefine.ProjectsStatus.First(x => x.Value.Equals("??????")).Key
|
|
| 802 |
, CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?????o")).Key };
|
|
| 803 |
|
|
| 804 |
// ????????o???z |
|
| 805 |
int EstimatePraice = GetEstimatePrice(0); |
|
| 806 |
if (EstimatePraice == 0 && (nStatusFlg == nCode[0] || nStatusFlg == nCode[1])) |
|
| 803 | 807 |
{
|
| 808 |
((Label)m_DspCtrl[(int)DspCnt.EstimatesPrice0]).TextAlign = ContentAlignment.MiddleCenter; |
|
| 809 |
m_DspCtrl[(int)DspCnt.EstimatesPrice0].Text = CommonDefine.s_UndecidedString; |
|
| 810 |
} |
|
| 811 |
else |
|
| 812 |
{
|
|
| 804 | 813 |
((Label)m_DspCtrl[(int)DspCnt.EstimatesPrice0]).TextAlign = ContentAlignment.MiddleRight; |
| 805 | 814 |
m_DspCtrl[(int)DspCnt.EstimatesPrice0].Text = EstimatePraice.ToString("#,0");
|
| 806 | 815 |
} |
| 807 |
else |
|
| 816 |
|
|
| 817 |
// ????????o???z |
|
| 818 |
EstimatePraice = GetEstimatePrice(1); |
|
| 819 |
if (EstimatePraice == 0 && (nStatusFlg == nCode[0] || nStatusFlg == nCode[1])) |
|
| 808 | 820 |
{
|
| 809 |
((Label)m_DspCtrl[(int)DspCnt.EstimatesPrice0]).TextAlign = ContentAlignment.MiddleLeft;
|
|
| 810 |
m_DspCtrl[(int)DspCnt.EstimatesPrice0].Text = CommonDefine.s_UndecidedString;
|
|
| 821 |
((Label)m_DspCtrl[(int)DspCnt.EstimatesPrice1]).TextAlign = ContentAlignment.MiddleCenter;
|
|
| 822 |
m_DspCtrl[(int)DspCnt.EstimatesPrice1].Text = CommonDefine.s_UndecidedString;
|
|
| 811 | 823 |
} |
| 812 |
EstimatePraice = GetEstimatePrice(1); // ????????o???z |
|
| 813 |
if (EstimatePraice != 0) |
|
| 824 |
else |
|
| 814 | 825 |
{
|
| 815 | 826 |
((Label)m_DspCtrl[(int)DspCnt.EstimatesPrice1]).TextAlign = ContentAlignment.MiddleRight; |
| 816 | 827 |
m_DspCtrl[(int)DspCnt.EstimatesPrice1].Text = EstimatePraice.ToString("#,0");
|
| 817 | 828 |
} |
| 818 |
else |
|
| 819 |
{
|
|
| 820 |
((Label)m_DspCtrl[(int)DspCnt.EstimatesPrice1]).TextAlign = ContentAlignment.MiddleLeft; |
|
| 821 |
m_DspCtrl[(int)DspCnt.EstimatesPrice1].Text = CommonDefine.s_UndecidedString; |
|
| 822 |
} |
|
| 823 | 829 |
} |
| 824 | 830 |
catch (Exception ex) |
| 825 | 831 |
{
|
| ... | ... | |
| 1444 | 1450 |
// ??????N?x???Z?b?g |
| 1445 | 1451 |
SetDepartmentCombbox(); |
| 1446 | 1452 |
|
| 1453 |
int nStatusFlg = worklist[0].ConstructionStatusFlg; |
|
| 1447 | 1454 |
// ??Z??????z?Z?b?g |
| 1448 |
SetEstimatePraiceValue(); |
|
| 1455 |
SetEstimatePraiceValue(nStatusFlg);
|
|
| 1449 | 1456 |
|
| 1450 | 1457 |
// ?\???E???F?E???????t??Z?b?g |
| 1451 | 1458 |
SetLabelDates(); |
| ... | ... | |
| 1508 | 1515 |
|
| 1509 | 1516 |
m_DspCtrl[(int)DspCnt.ConstructionCompletionDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].ConstructionCompletionDate); // ?{?H??????
|
| 1510 | 1517 |
|
| 1511 |
if (worklist[0].OrdersDecisionPrice != 0) |
|
| 1518 |
int[] nCode = new int[]{ CommonDefine.ProjectsStatus.First(x => x.Value.Equals("??????")).Key
|
|
| 1519 |
, CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?????o")).Key
|
|
| 1520 |
, CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key };
|
|
| 1521 |
if (worklist[0].OrdersDecisionPrice == 0 && (nStatusFlg == nCode[0] || nStatusFlg == nCode[1] || nStatusFlg == nCode[2])) |
|
| 1512 | 1522 |
{
|
| 1523 |
((TextBox)m_DspCtrl[(int)DspCnt.OrdersDecisionPrice]).TextAlign = HorizontalAlignment.Center; |
|
| 1524 |
} |
|
| 1525 |
else |
|
| 1526 |
{
|
|
| 1513 | 1527 |
((TextBox)m_DspCtrl[(int)DspCnt.OrdersDecisionPrice]).TextAlign = HorizontalAlignment.Right; |
| 1514 | 1528 |
m_DspCtrl[(int)DspCnt.OrdersDecisionPrice].Text = CommonMotions.cnvDouble(worklist[0].OrdersDecisionPrice).ToString("#,0"); // ??????????z
|
| 1515 | 1529 |
} |
| 1516 |
else |
|
| 1517 |
((TextBox)m_DspCtrl[(int)DspCnt.OrdersDecisionPrice]).TextAlign = HorizontalAlignment.Center; |
|
| 1518 | 1530 |
|
| 1519 |
if (worklist[0].OrdersDecisionPriceInTax != 0)
|
|
| 1531 |
if (worklist[0].OrdersDecisionPriceInTax == 0 && (nStatusFlg == nCode[0] || nStatusFlg == nCode[1] || nStatusFlg == nCode[2]))
|
|
| 1520 | 1532 |
{
|
| 1533 |
((TextBox)m_DspCtrl[(int)DspCnt.OrdersDecisionPriceInTax]).TextAlign = HorizontalAlignment.Center; |
|
| 1534 |
} |
|
| 1535 |
else |
|
| 1536 |
{
|
|
| 1521 | 1537 |
((TextBox)m_DspCtrl[(int)DspCnt.OrdersDecisionPriceInTax]).TextAlign = HorizontalAlignment.Right; |
| 1522 | 1538 |
m_DspCtrl[(int)DspCnt.OrdersDecisionPriceInTax].Text = CommonMotions.cnvDouble(worklist[0].OrdersDecisionPriceInTax).ToString("#,0"); // ??????????z
|
| 1523 | 1539 |
} |
| 1524 |
else |
|
| 1525 |
((TextBox)m_DspCtrl[(int)DspCnt.OrdersDecisionPriceInTax]).TextAlign = HorizontalAlignment.Center; |
|
| 1526 | 1540 |
|
| 1527 | 1541 |
m_DspCtrl[(int)DspCnt.ConstructionPeriodStart].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].ConstructionPeriodStart); // ?_??H???J?n |
| 1528 | 1542 |
|
| ... | ... | |
| 1574 | 1588 |
|
| 1575 | 1589 |
#region ?H?????t???O |
| 1576 | 1590 |
// ?H?????t???O |
| 1577 |
switch (worklist[0].ConstructionStatusFlg)
|
|
| 1591 |
switch (nStatusFlg) |
|
| 1578 | 1592 |
{
|
| 1579 | 1593 |
case (int)CommonDefine.StatNumArray.Status0: |
| 1580 | 1594 |
rdbStatus0.Checked = true; |
| ... | ... | |
| 1639 | 1653 |
|
| 1640 | 1654 |
// ?????x |
| 1641 | 1655 |
if (worklist[0].ExpectedOrder >= 0) trkProgress.Value = worklist[0].ExpectedOrder; |
| 1642 |
switch (worklist[0].ConstructionStatusFlg)
|
|
| 1656 |
switch (nStatusFlg) |
|
| 1643 | 1657 |
{
|
| 1644 | 1658 |
case (int)CommonDefine.StatNumArray.Status0: // ????? |
| 1645 | 1659 |
case (int)CommonDefine.StatNumArray.Status1: // ?????o |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs | ||
|---|---|---|
| 1067 | 1067 |
FrmEstimateInput frm = (FrmEstimateInput)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle; |
| 1068 | 1068 |
bool ThisEnd = frm.ParentEnd; |
| 1069 | 1069 |
//bool DataEndtry = frm.DataChangeFlg; |
| 1070 |
bool DataEndtry = true; |
|
| 1071 | 1070 |
|
| 1072 | 1071 |
// フォームのクリア |
| 1073 | 1072 |
ClsOtherProc.ProcFormClose(ProcessNo); |
| ... | ... | |
| 1084 | 1083 |
} |
| 1085 | 1084 |
else |
| 1086 | 1085 |
{
|
| 1086 |
// チェックボックスより進捗状態を取得する |
|
| 1087 |
int iStatus = GetStatusForCheckBox(); |
|
| 1087 | 1088 |
// 見積金額取得 |
| 1088 |
if (DataEndtry) SetEstimatePraiceValue();
|
|
| 1089 |
SetEstimatePraiceValue(iStatus);
|
|
| 1089 | 1090 |
// 別プロセスボタンメニュー更新 |
| 1090 | 1091 |
UpDateProcessContextMenu(); |
| 1091 | 1092 |
this.Activate(); |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrint.cs | ||
|---|---|---|
| 863 | 863 |
dgvRow.Cells[(int)DispGridColumn.ItemName].Value = Datalist.ItemName; |
| 864 | 864 |
dgvRow.Cells[(int)DispGridColumn.SpecName].Value = Datalist.SpecName; |
| 865 | 865 |
|
| 866 |
dgvRow.Cells[(int)DispGridColumn.UnitCount].Value = Datalist.UnitCount.ToString("#,#.###");
|
|
| 866 |
dgvRow.Cells[(int)DispGridColumn.UnitCount].Value = Datalist.UnitCount.ToString("#,#.##");
|
|
| 867 | 867 |
dgvRow.Cells[(int)DispGridColumn.UnitName].Value = Datalist.UnitName; |
| 868 | 868 |
dgvRow.Cells[(int)DispGridColumn.UnitPrice].Value = Datalist.UnitPrice.ToString("#,#");
|
| 869 | 869 |
|
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs | ||
|---|---|---|
| 1012 | 1012 |
strSQL.Append(" On B.SourceCode = A.ConstructionCode");
|
| 1013 | 1013 |
strSQL.Append(" And B.ConstructionCode = A.SourceCode");
|
| 1014 | 1014 |
strSQL.Append(" And B.DetailCount = A.SourceDetailCnt");
|
| 1015 |
strSQL.Append(" And");
|
|
| 1016 |
strSQL.AppendFormat(" B.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
|
|
| 1015 | 1017 |
|
| 1016 | 1018 |
strSQL.Append(DetailDB.CreatePrimarykeyString(OrderRec.ConstructionCode, OrderRec.SeqNo, -1, 0, "A.")); |
| 1017 |
//strSQL.AppendFormat(" And A.GroupCount in ({0}, {1})", (int)PurchaseOrderDetail.GroupCountDef.Detail
|
|
| 1018 |
// , (int)PurchaseOrderDetail.GroupCountDef.StatutoryWelfare); |
|
| 1019 | 1019 |
|
| 1020 | 1020 |
strSQL.Append(" ORDER BY A.GroupCount ASC, A.LineCount ASC");
|
| 1021 | 1021 |
DetailData.Clear(); |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
|---|---|---|
| 4172 | 4172 |
DataGridViewEX dgv = dgvSalesInProjects; |
| 4173 | 4173 |
try |
| 4174 | 4174 |
{
|
| 4175 |
if (CommonMotions.SystemMasterData.ConstructionNoBase < 0) return; |
|
| 4175 | 4176 |
// グリッドタイトルセット |
| 4176 | 4177 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 4177 | 4178 |
|
| ... | ... | |
| 4445 | 4446 |
DataGridViewEX dgv = dgvTenders; |
| 4446 | 4447 |
try |
| 4447 | 4448 |
{
|
| 4449 |
if (CommonMotions.SystemMasterData.ConstructionNoBase < 0) return; |
|
| 4450 |
|
|
| 4448 | 4451 |
// グリッドタイトルセット |
| 4449 | 4452 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 4450 | 4453 |
|
| ... | ... | |
| 4709 | 4712 |
DataGridViewEX dgv = dgvBudgetUp; |
| 4710 | 4713 |
try |
| 4711 | 4714 |
{
|
| 4715 |
if (CommonMotions.SystemMasterData.ConstructionNoBase < 0) return; |
|
| 4712 | 4716 |
// グリッドタイトルセット |
| 4713 | 4717 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 4714 | 4718 |
|
| ... | ... | |
| 4995 | 4999 |
DataGridViewEX dgv = dgvConstructionProjects; |
| 4996 | 5000 |
try |
| 4997 | 5001 |
{
|
| 5002 |
if (CommonMotions.SystemMasterData.ConstructionNoBase < 0) return; |
|
| 4998 | 5003 |
// グリッドタイトルセット |
| 4999 | 5004 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 5000 | 5005 |
|
| ... | ... | |
| 5624 | 5629 |
DataGridViewEX dgv = dgvFluctuationProjects; |
| 5625 | 5630 |
try |
| 5626 | 5631 |
{
|
| 5632 |
if (CommonMotions.SystemMasterData.ConstructionNoBase < 0) return; |
|
| 5627 | 5633 |
// グリッドタイトルセット |
| 5628 | 5634 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 5629 | 5635 |
|
| ... | ... | |
| 6027 | 6033 |
DataGridViewEX dgv = dgvNonOrders; |
| 6028 | 6034 |
try |
| 6029 | 6035 |
{
|
| 6036 |
if (CommonMotions.SystemMasterData.ConstructionNoBase < 0) return; |
|
| 6030 | 6037 |
// グリッドタイトルセット |
| 6031 | 6038 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
| 6032 | 6039 |
|
他の形式にエクスポート: Unified diff