プロジェクト

全般

プロフィール

リビジョン 410

堀内6年以上前に追加

メニュー:製品版売上一覧削除
管理マスタ:確認切り替え表示を修正
売上一覧:集計単位SQL修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORemInvoiceData.cs
55 55

  
56 56
        #endregion
57 57

  
58

  
59 58
        #region SELECT SQL作成
60 59
        private string CreateSelectSQL()
61 60
        {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
1922 1922
            try
1923 1923
            {
1924 1924
                // 工事予算書データを読み込む
1925
                string strSQL = BudgetDB.CreatePrimarykeyString(m_ConstructionCode);
1925
                StringBuilder strSQL = new StringBuilder();
1926
                strSQL.Append(BudgetDB.CreatePrimarykeyString(m_ConstructionCode));
1926 1927
                ConstructionBudget BudgetRec = new ConstructionBudget();
1927
                if (!BudgetDB.SelectAction(strSQL, ref BudgetRec)) return false;
1928
                if (!BudgetDB.SelectAction(strSQL.ToString(), ref BudgetRec)) return false;
1928 1929

  
1929 1930
                // 工事予算書明細データを読み込む
1930
                strSQL += " ORDER BY GroupCount ASC, LineCount ASC";
1931
                strSQL.Append(" ORDER BY GroupCount ASC, LineCount ASC");
1931 1932
                List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
1932
                if (!DetailDB.SelectAction(strSQL, ref DetailList)) return false;
1933
                if (!DetailDB.SelectAction(strSQL.ToString(), ref DetailList)) return false;
1933 1934
                if (DetailList.Count == 0) return false;
1934 1935

  
1935 1936
                DataGridViewEX dgv = dgvAllDisplay;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
4252 4252
                // 承認機能番号セット
4253 4253
                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("請求承認")).Key;
4254 4254
                // 受付番号
4255
                frm.OrderNo = CommonDefine.s_Default_OrderNo;
4255
                frm.OrderNo = m_nMaxOrderNo;
4256 4256

  
4257 4257
                // 見えない画面を出す
4258 4258
                frm.WindowState = FormWindowState.Minimized;
......
4264 4264
                if (!frm.OneApprovalProcess) return false;
4265 4265

  
4266 4266
                // 完了メッセージ
4267
                CommonMotions.EntryEndMessage("積算見積書", "確認");
4267
                CommonMotions.EntryEndMessage("請求承認", "確認");
4268 4268

  
4269 4269
                return true;
4270 4270
            }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs
284 284
            // 
285 285
            this.btnCancel.BackColor = System.Drawing.Color.Red;
286 286
            this.btnCancel.ForeColor = System.Drawing.Color.White;
287
            this.btnCancel.Location = new System.Drawing.Point(832, 509);
287
            this.btnCancel.Location = new System.Drawing.Point(832, 498);
288 288
            this.btnCancel.Name = "btnCancel";
289 289
            this.btnCancel.Size = new System.Drawing.Size(140, 40);
290 290
            this.btnCancel.TabIndex = 22;
......
295 295
            // 
296 296
            this.btnExecProc1.BackColor = System.Drawing.Color.Green;
297 297
            this.btnExecProc1.ForeColor = System.Drawing.Color.White;
298
            this.btnExecProc1.Location = new System.Drawing.Point(680, 509);
298
            this.btnExecProc1.Location = new System.Drawing.Point(680, 498);
299 299
            this.btnExecProc1.Name = "btnExecProc1";
300 300
            this.btnExecProc1.Size = new System.Drawing.Size(140, 40);
301 301
            this.btnExecProc1.TabIndex = 21;
......
307 307
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
308 308
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
309 309
            this.BackColor = System.Drawing.Color.PaleGoldenrod;
310
            this.ClientSize = new System.Drawing.Size(984, 561);
310
            this.ClientSize = new System.Drawing.Size(984, 541);
311 311
            this.Controls.Add(this.btnCancel);
312 312
            this.Controls.Add(this.btnExecProc1);
313 313
            this.Controls.Add(this.groupBoxEx2);
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs
135 135
            this.btnGenerate.Enabled = false;
136 136
            this.btnGenerate.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
137 137
            this.btnGenerate.ForeColor = System.Drawing.Color.Black;
138
            this.btnGenerate.Location = new System.Drawing.Point(896, 620);
138
            this.btnGenerate.Location = new System.Drawing.Point(1024, 620);
139 139
            this.btnGenerate.Name = "btnGenerate";
140 140
            this.btnGenerate.Size = new System.Drawing.Size(120, 30);
141 141
            this.btnGenerate.TabIndex = 33;
......
355 355
            this.btnDel.Enabled = false;
356 356
            this.btnDel.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
357 357
            this.btnDel.ForeColor = System.Drawing.Color.White;
358
            this.btnDel.Location = new System.Drawing.Point(1024, 620);
358
            this.btnDel.Location = new System.Drawing.Point(896, 620);
359 359
            this.btnDel.Name = "btnDel";
360 360
            this.btnDel.Size = new System.Drawing.Size(120, 30);
361 361
            this.btnDel.TabIndex = 40;
362 362
            this.btnDel.Text = "請求取消";
363 363
            this.btnDel.UseVisualStyleBackColor = false;
364
            this.btnDel.Visible = false;
364 365
            this.btnDel.Click += new System.EventHandler(this.btnDel_Click);
365 366
            // 
366 367
            // panel2
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
2799 2799
        {
2800 2800
            try
2801 2801
            {
2802
                if (dgv.CurrentRow == null)
2803
                    return;
2802
                DataGridViewRow CurRow = dgv.Rows[RowIndex];
2803
                if (CurRow == null) return;
2804
                if (dgv.CurrentRow == null) return;
2804 2805

  
2805
                if (RowIndex == -1)
2806
                    return;
2806
                if (RowIndex < 0) return;
2807 2807

  
2808 2808
                // ??????L???w???x
2809
                if (CommonMotions.cnvInt(dgv[(int)DispColumn.KyoryokuUmu, RowIndex].Value) == 1)
2809
                if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KyoryokuUmu].Value) == 1)
2810 2810
                {
2811
                    dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KojiSeikyu].Value)
2812
                                                                                                            * (CommonMotions.SystemMasterData.ConsumptionTax / 100));
2811
                    double wrkValue = CommonMotions.cnvDouble(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value);
2812
                    double dCooperationRate = (CommonMotions.SystemMasterData.CooperationRate / 100);
2813
                    CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(wrkValue * dCooperationRate);
2813 2814
                }
2814 2815
                else
2815 2816
                {
2816
                    dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = "";
2817
                    CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = "";
2817 2818
                }
2818 2819

  
2819 2820
                // ???v?Z?o
2820
                ShoukeiSanshutu((int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value));
2821
                ShoukeiSanshutu((int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(CurRow.Cells[Code_Column].Value));
2821 2822

  
2822 2823
                // ???v?l?Z?o
2823
                SetSubGoukei(dgv, (int)DispColumn.KojiSeikyu, (int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value), RowsTypeDef.?????);
2824
                SetSubGoukei(dgv, (int)DispColumn.KojiSeikyu, (int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(CurRow.Cells[Code_Column].Value), RowsTypeDef.?????);
2824 2825
            }
2825 2826
            catch (Exception ex)
2826 2827
            {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs
400 400
            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
401 401
            this.comboBox1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
402 402
            this.comboBox1.FormattingEnabled = true;
403
            this.comboBox1.IntegralHeight = false;
403 404
            this.comboBox1.Location = new System.Drawing.Point(422, 5);
405
            this.comboBox1.MaxDropDownItems = 12;
404 406
            this.comboBox1.Name = "comboBox1";
405 407
            this.comboBox1.Size = new System.Drawing.Size(130, 24);
406 408
            this.comboBox1.TabIndex = 2;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs
85 85
        private static Color s_RowSelectColor = Color.LightBlue;
86 86

  
87 87
        /// <summary>
88
        /// 発注区分
89
        /// </summary>
90
        private long s_OrderCotegory = 1 << 5;
91
        /// <summary>
92
        /// 発注者選択
93
        /// </summary>
94
        private long s_Orderers = 1 << 4;
95
        /// <summary>
88 96
        /// 月選択
89 97
        /// </summary>
90 98
        private long s_SelectedMonth = 1 << 3;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs
248 248
                sql.Append(" C1.ConstructionCode = A1.REQCONSTRUCTIONCODE");
249 249
                sql.AppendFormat(" AND C1.ConstructionPeriod = {0}", numericUpDown2.Value);
250 250
                sql.Append(" Group By A1.REQUESTMONTH");
251
                sql.Append(" Order By A1.REQUESTMONTH");
251
                sql.Append(" Order By A1.REQUESTMONTH DESC");
252 252

  
253 253
                var data = new ArrayList();
254 254
                ReqHDB.ExecuteReader(sql.ToString(), ref data);
255

  
256
                int GetMonth = 0;
255
                int BreakKey = -1;
257 256
                foreach (object[] objRec in data)
258 257
                {
259
                    GetMonth = CommonMotions.cnvInt(objRec[0]);
258
                    int GetMonth = CommonMotions.cnvInt(objRec[0]);
259
                    int nYear = CommonMotions.cnvTruncate(GetMonth / 100);
260
                    int nMonth = (GetMonth % 100);
261
                    string wrk1 = nYear.ToString();
262
                    string wrk2 = string.Empty;
263
                    if (nMonth < 10) wrk2 = string.Format("  {0}", nMonth);
264
                    else wrk2 = string.Format(" {0}", nMonth);
260 265

  
261
                    listMonth.Add(new KeyValuePair<int, String>(GetMonth, string.Format("{0}?N{1}??",
262
                                                                                        CommonMotions.cnvTruncate(GetMonth / 100),
263
                                                                                        GetMonth % 100)));
266
                    if (BreakKey != nYear)
267
                    {
268
                        if (BreakKey > 1) listMonth.Add(new KeyValuePair<int, String>(0, "*--------*"));
269

  
270
                        BreakKey = nYear;
271
                    }
272

  
273
                listMonth.Add(new KeyValuePair<int, String>(GetMonth, string.Format("{0}?N{1}??", wrk1, wrk2)));
264 274
                }
265 275
            }
266 276
            catch (Exception ex)
......
520 530
                long SelComb = 0;
521 531
                int CntNo = 1;
522 532
                long lTotal = 0;
523
                string strConstrName = string.Empty;
524
                string strDepName = string.Empty;
525
                string strPersonName = string.Empty;
533

  
534
                StringBuilder strOrderCotegory = new StringBuilder();
535
                StringBuilder strConstrName = new StringBuilder();
536
                StringBuilder strDepName = new StringBuilder();
537
                StringBuilder strPersonName = new StringBuilder();
526 538
                foreach (object[] objRec in data)
527 539
                {
528
                    strConstrName = string.Empty;
529
                    strConstrName = CommonMotions.cnvString(objRec[(int)GetOrder.A2OrderersName1])
530
                        + CommonMotions.cnvString(objRec[(int)GetOrder.A2OrderersName2]);
540
                    strOrderCotegory.Clear();
541
                    strConstrName.Clear();
542
                    strDepName.Clear();
543
                    strPersonName.Clear();
531 544

  
532
                    strDepName = CommonMotions.cnvString(objRec[(int)GetOrder.E1DepartmentString]);
533
                    strPersonName = CommonMotions.cnvString(objRec[(int)GetOrder.D1PersonName]);
545
                    strOrderCotegory.Append(objRec[(int)GetOrder.A2OrderCotegory]);
546
                    strConstrName.AppendFormat("{0}{1}", objRec[(int)GetOrder.A2OrderersName1], objRec[(int)GetOrder.A2OrderersName2]);
547
                    strDepName.Append(objRec[(int)GetOrder.E1DepartmentString]);
548
                    strPersonName.Append(objRec[(int)GetOrder.D1PersonName]);
534 549

  
535 550
                    SelComb = SelectedCondition();
536
                    if (SelComb == 0)
551
                    if (SelComb == 0 || SelComb == s_SelectedMonth)
537 552
                    {
538
                        strDepName = string.Empty;
539
                        strPersonName = string.Empty;
553
                        strConstrName.Clear();
554
                        strDepName.Clear();
555
                        strPersonName.Clear();
540 556
                    }
541
                    else if ((SelComb & s_SelectedDepartment) != 0)
542
                    {   // ??????I?????????
543
                        strDepName = string.Empty;
557
                    else
558
                    {
559
                        if ((SelComb & s_SelectedDepartment) != 0)
560
                        {   // ??????I?????????
561
                            strDepName.Clear();
562
                        }
563
                        else if ((SelComb & s_SelectedDepartment) == 0)
564
                        {   // ??????I??????????
565
                        }
566
                        else if ((SelComb & s_SelectedPerson) != 0)
567
                        {   // ?S?????I?????????
568
                            strPersonName.Clear();
569
                        }
570
                        else if ((SelComb & s_SelectedPerson) == 0)
571
                        {   // ?S?????I??????????
572
                        }
544 573
                    }
545
                    else if ((SelComb & s_SelectedDepartment) == 0)
546
                    {   // ??????I??????????
547
                    }
548
                    else if ((SelComb & s_SelectedPerson) != 0)
549
                    {   // ?S?????I?????????
550
                        strPersonName = string.Empty;
551
                    }
552
                    else if ((SelComb & s_SelectedPerson) == 0)
553
                    {   // ?S?????I??????????
554
                    }
555 574

  
556 575
                    dgv.Rows.Add(CntNo++,
557
                                objRec[(int)GetOrder.A2OrderCotegory],
576
                                strOrderCotegory.ToString(),
558 577
                                objRec[(int)GetOrder.A2OrderersCode],
559 578
                                objRec[(int)GetOrder.DiviNameString],
560
                                strConstrName,
579
                                strConstrName.ToString(),
561 580
                                CommonMotions.cnvInt(objRec[(int)GetOrder.Value]).ToString("#,0"),
562 581
                                objRec[(int)GetOrder.E1DepartmentCode],
563
                                strDepName,
582
                                strDepName.ToString(),
564 583
                                objRec[(int)GetOrder.D1PersonCode],
565
                                strPersonName
584
                                strPersonName.ToString()
566 585
                                );
567 586
                    lTotal += CommonMotions.cnvInt(objRec[(int)GetOrder.Value]);
568 587
                }
......
591 610
            {
592 611
                long selValue = 0;
593 612

  
613
                if (CommonMotions.cnvInt(comboBox4.SelectedValue) != 0) selValue += s_OrderCotegory;
614
                if (CommonMotions.cnvInt(comboBox5.SelectedValue) != 0) selValue += s_Orderers;
594 615
                if (CommonMotions.cnvInt(comboBox1.SelectedValue) != 0) selValue += s_SelectedMonth;
595 616
                if (CommonMotions.cnvInt(comboBox2.SelectedValue) != 0) selValue += s_SelectedDepartment;
596 617
                if (CommonMotions.cnvInt(comboBox3.SelectedValue) != 0) selValue += s_SelectedPerson;
......
612 633
        /// <param name="sql"></param>
613 634
        private void CreateSelectSQL(StringBuilder sql)
614 635
        {
636
            StringBuilder strGroup = new StringBuilder();
637
            StringBuilder strOrder = new StringBuilder();
615 638
            try
616 639
            {
617 640
                int SelMonth = CommonMotions.cnvInt(comboBox1.SelectedValue);
......
651 674

  
652 675
                sql.Append(", SUM(A1.REQUESTAMOUNT) AS Value");
653 676

  
654
                sql.Append(" from requesthead AS A1");
677
                sql.Append(" From requesthead AS A1");
655 678
                sql.Append(" LEFT JOIN orderersmaster AS A2");
656 679
                sql.Append("    ON A2.OrderCotegory = A1.ORDERERSDIVISION");
657 680
                sql.Append("    And A2.OrderersCode = A1.ORDERERSCODE");
......
690 713

  
691 714

  
692 715
                long SelComb = SelectedCondition();
693
                StringBuilder strGroup = new StringBuilder();
694
                StringBuilder strOrder = new StringBuilder();
716

  
717
                // ???????????W?v
718
                strGroup.Append("A2.OrderCotegory");
719
                // ???z????\??
695 720
                strOrder.Append("Value DESC");
721

  
696 722
                // ??????????????W?v?P???????
697
                if (SelComb == 0)
723
                if (SelComb == 0 || SelComb == s_SelectedMonth)
698 724
                {   // ?S?????
699
                    strGroup.Append("A2.OrderCotegory, A2.OrderersCode");
700

  
701
                    if (strOrder.ToString().Length > 0) strOrder.Append(",");
702
                    strOrder.Append("Divi.DisplayOrder, A2.DisplayOrder");
725
                    strOrder.Append(", Divi.DisplayOrder, A2.DisplayOrder");
726
                    return;
703 727
                }
704
                else if ((SelComb & s_SelectedDepartment) != 0)
705
                {   // ??????I?????????
706
                    if (strGroup.ToString().Length > 0) strGroup.Append(", ");
707
                    strGroup.Append("A2.OrderCotegory, A2.OrderersCode, D1.PersonCode");
708 728

  
709
                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
710
                    strOrder.Append("D1.DisplayOrder");
729
                // ?S???O???????????W?v
730
                strGroup.Append(", A2.OrderersCode");
731

  
732

  
733
                // ?????I??
734
                if ((SelComb & s_SelectedDepartment) != 0)
735
                {   // ?????
736
                    strGroup.Append(", D1.PersonCode");
737

  
738
                    strOrder.Append(", D1.DisplayOrder");
711 739
                }
712 740
                else if ((SelComb & s_SelectedDepartment) == 0)
713
                {   // ??????I??????????
714
                    if (strGroup.ToString().Length > 0) strGroup.Append(", ");
715
                    strGroup.Append("E1.DepartmentCode");
741
                {   // ??????
742
                    strGroup.Append(", E1.DepartmentCode");
716 743

  
717
                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
718
                    strOrder.Append("E1.DisplayOrder");
744
                    strOrder.Append(", E1.DisplayOrder");
719 745
                }
720
                else if ((SelComb & s_SelectedPerson) != 0)
721
                {   // ?S?????I?????????
746

  
747
                // ?S????I??
748
                if ((SelComb & s_SelectedPerson) != 0)
749
                {   // ?????
722 750
                }
723 751
                else if ((SelComb & s_SelectedPerson) == 0)
724
                {   // ?S?????I??????????
725
                    if (strGroup.ToString().Length > 0) strGroup.Append(", ");
726
                    strGroup.Append("D1.PersonCode");
752
                {   // ??????
753
                    strGroup.Append(", D1.PersonCode");
727 754

  
728
                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
729
                    strOrder.Append("D1.DisplayOrder");
755
                    strOrder.Append(", D1.DisplayOrder");
730 756
                }
731 757

  
732
                sql.AppendFormat(" group by {0}", strGroup.ToString());
733
                sql.AppendFormat(" order by {0}", strOrder.ToString());
734

  
735 758
            }
736 759
            catch (Exception ex)
737 760
            {
738 761
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
739 762
            }
763
            finally
764
            {
765
                sql.AppendFormat(" Group By {0}", strGroup.ToString());
766
                sql.AppendFormat(" Order By {0}", strOrder.ToString());
767
            }
740 768
        }
741 769
        #endregion
742 770

  
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs
1394 1394
        {
1395 1395
            try
1396 1396
            {
1397
                // システム管理者はこのまま表示する
1398
                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode) return;
1399

  
1400
                // システム管理者以外は運用形態フラグを表示しない
1401
                groupBoxEx6.Visible = false;
1402
                groupBoxEx2.Height += 58;
1403

  
1397 1404
                // 製品版Type1は消費税以外の設定を消す
1398 1405
                switch (ProductDefine.ProductType)
1399 1406
                {
1400
                    case (int)ProductDefine.ProductTypeDef.Originals:
1401
                        groupBoxEx6.Visible = false;
1402
                        groupBoxEx2.Height += 58;
1403
                        break;
1404 1407
                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
1408
                        // 製品版
1405 1409
                        foreach (Control CurCtrl in groupBoxEx2.Controls)
1406 1410
                        {
1407 1411
                            if (CurCtrl.Name.Equals("label15")
......
1416 1420
                            CurCtrl.Visible = false;
1417 1421
                        }
1418 1422
                        break;
1423
                    case (int)ProductDefine.ProductTypeDef.Originals:
1424
                        // オリジナル
1425
                        break;
1419 1426
                }
1420 1427
            }
1421 1428
            catch (System.Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
555 555
                                                                { 0,
556 556
                                                                    0,
557 557
                                                                    0,
558
                                                                    (int)ClsExcute.MaintenanceExecuteNo.SalesConfirm
558
                                                                    0,
559 559
                                                                },
560 560
        };
561 561
        #endregion

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