プロジェクト

全般

プロフィール

リビジョン 300

堀内約7年前に追加

注文書入力画面固定文字追加
台帳施工費ロック
請求まとめ修正中

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 111;
17
        public static int s_SystemVersion = 112;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs
260 260
                bool bPetition = false;
261 261
                // 申請データ取得
262 262
                StringBuilder strSQL = new StringBuilder();
263
                strSQL.AppendFormat(" Where PersonCode = {0}", PersonCode.ToString());
264
                strSQL.AppendFormat(" And ApprovalCode = {0}", ApprovalCode.ToString());
263
                strSQL.AppendFormat(" Where PersonCode = {0}", PersonCode);
264
                strSQL.AppendFormat(" And ApprovalCode = {0}", ApprovalCode);
265 265
                strSQL.AppendFormat(" And DATE(EntryDate) = DATE(STR_TO_DATE('{0}','%Y/%m/%d'))", ApprovalDate.ToShortDateString());
266
                strSQL.AppendFormat(" And OrderNo = {0}", OrderNo.ToString());
266
                strSQL.AppendFormat(" And OrderNo = {0}", OrderNo);
267 267
                List<PersonApproval> PetitionList = new List<PersonApproval>();
268 268
                if (!ApprDB.SelectAction(strSQL.ToString(), ref PetitionList)) return bPetition;
269 269
                // 申請データが無い場合
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApproval.cs
453 453
            StringBuilder strWork = new StringBuilder();
454 454
            try
455 455
            {
456
                strWork.AppendFormat(" Where {0}PersonCode = {1}", APara, PersonCode.ToString());
457
                strWork.AppendFormat(" And {0}ApprovalCode = {1}", APara, ApprovalCode.ToString());
456
                strWork.AppendFormat(" Where {0}PersonCode = {1}", APara, PersonCode);
457
                strWork.AppendFormat(" And {0}ApprovalCode = {1}", APara, ApprovalCode);
458 458
                strWork.AppendFormat(" And DATE({0}OrderDate) = DATE(STR_TO_DATE('{1}','%Y/%m/%d'))", APara, OrderDate.ToShortDateString());
459 459
                if (OrderNo != 0)
460
                    strWork.AppendFormat(" And {0}OrderNo = {1}", APara, OrderNo.ToString());
460
                    strWork.AppendFormat(" And {0}OrderNo = {1}", APara, OrderNo);
461 461
                if (SeqNo != 0)
462
                    strWork.AppendFormat(" And {0}SeqNo = {1}", APara, SeqNo.ToString());
462
                    strWork.AppendFormat(" And {0}SeqNo = {1}", APara, SeqNo);
463 463
            }
464 464
            catch (Exception ex)
465 465
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
708 708
        {
709 709
            try
710 710
            {
711
                int iNextProcessNo = 0;
712
                // ----- ???????Z?b?g
713
                switch (m_ApprovalCode)
714
                {
715
                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:                      // 8:?o???????F
716
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
717
                        break;
718
                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:              // 9:??????o?^???F
719
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.CostomerRegist;
720
                        break;
721
                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:              // 10:??????o?^???F
722
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SubConstrRegist;
723
                        break;
724
                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:???x??
725
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
726
                        break;
727
                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:???x??
728
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
729
                        break;
730
                }
731
                if (iNextProcessNo == 0) return;
711
                // ????o?????p?????[?^?Z?b?g
712
                DispTargetData();
732 713

  
733
                // ----- ?N???v???Z?X???
734
                int NowPoint = ClsExcute.NextProcess(iNextProcessNo);
735

  
736
                // ???E???x??????????????
737
                ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear();
738
                switch (m_ApprovalCode)
739
                {
740
                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:???x??
741
                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Labor);
742
                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
743
                        break;
744
                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:???x??
745
                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Normal);
746
                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
747
                        break;
748
                }
749

  
750
                // ----- ?S????R?[?h?Z?b?g
751
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PersonCode);
752
                // ??t??
753
                ClsExcute.ProcControlPara[NowPoint].DateExecParameter.Add(m_SearchDate);
754
                // ??t???
755
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_SearchSeqNo);
756

  
757 714
                m_bTargetFlg = true;
758 715
                m_bEndFlg = true;
759 716
                this.Close();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
835 835
        }
836 836
        #endregion
837 837

  
838
        #region 次呼出処理パラメータセット(対象データを見る)
839
        /// <summary>
840
        /// 次呼出処理パラメータセット(対象データを見る)
841
        /// </summary>
842
        private void DispTargetData()
843
        {
844
            try
845
            {
846
                int iNextProcessNo = 0;
847
                // ----- 次処理セット
848
                switch (m_ApprovalCode)
849
                {
850
                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:                      // 8:出勤管理承認
851
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
852
                        break;
853
                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:              // 9:発注者登録承認
854
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.CostomerRegist;
855
                        break;
856
                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:              // 10:協力会社登録承認
857
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SubConstrRegist;
858
                        break;
859
                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:手間支払
860
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
861
                        break;
862
                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:業者支払
863
                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
864
                        break;
865
                }
866
                if (iNextProcessNo == 0) return;
867

  
868
                // ----- 起動プロセス設定
869
                int NowPoint = ClsExcute.NextProcess(iNextProcessNo);
870

  
871
                // 手間・業者支払いは区分が一番最初
872
                ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear();
873
                switch (m_ApprovalCode)
874
                {
875
                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:手間支払
876
                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Labor);
877
                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
878
                        break;
879
                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:業者支払
880
                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Normal);
881
                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
882
                        break;
883
                }
884

  
885
                // ----- 担当者コードセット
886
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PersonCode);
887
                // 受付番号
888
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_OrderNo);
889
                // 受付日
890
                ClsExcute.ProcControlPara[NowPoint].DateExecParameter.Add(m_SearchDate);
891
            }
892
            catch (Exception ex)
893
            {
894
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
895
            }
896
        }
897
        #endregion
898
        
838 899
        #region ---------- >> 申請後処理
839 900
        #region 申請後のデータ更新処理を行う
840 901
        /// <summary>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
2966 2966
                    {
2967 2967
                        case (int)DataGroup.ConstructionCosts:       // 施工費
2968 2968
                            // 施工費・購入品の固定項目以外の行は名称等を編集出来る
2969
                            if (DetailRec.FixDataFlg != 1)
2970
                            {
2971
                                for (int i = (int)GridColumn.ItemName; i <= (int)GridColumn.CompanyName; i++)
2972
                                {
2973
                                    CurRow.Cells[i].ReadOnly = false;
2974
                                }
2975
                            }
2969
                            //if (DetailRec.FixDataFlg != 1)
2970
                            //{
2971
                            //    for (int i = (int)GridColumn.ItemName; i <= (int)GridColumn.CompanyName; i++)
2972
                            //    {
2973
                            //        CurRow.Cells[i].ReadOnly = false;
2974
                            //    }
2975
                            //}
2976 2976
                            break;
2977 2977

  
2978 2978
                        case (int)DataGroup.Assistant:               // 副担当
......
4352 4352
                    if (nWrkCompanyCode < 1) continue;
4353 4353

  
4354 4354
                    // 明細行の位置が変わっていた時はリストに追加する
4355
                    PDetailList.Add(new object[] { nWrkCompanyCode, nOldLineCnt, RowLineCnt });
4355
                    int nSourceCode = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.SourceCode].Value);               // 元工事番号
4356
                    PDetailList.Add(new object[] { nWrkCompanyCode, nOldLineCnt, RowLineCnt, nSourceCode });
4356 4357

  
4357 4358
                } // iRows
4358 4359

  
......
4621 4622
                    strSQL.Append(" A.ConstructionCode");
4622 4623
                    strSQL.Append(" From purchaseorderdetail as A");
4623 4624
                    strSQL.Append(", purchaseorder as B");
4624
                    strSQL.AppendFormat(" Where A.ConstructionCode = {0}", m_ConstructionCode);
4625
                    strSQL.AppendFormat(" Where A.ConstructionCode = {0}", CommonMotions.cnvInt(CurCount[3]));
4625 4626
                    strSQL.AppendFormat(" And A.SourceCode = {0}", m_ConstructionCode);
4626 4627
                    strSQL.AppendFormat(" And A.SourceLineCnt = {0}", CommonMotions.cnvInt(CurCount[1]));
4627 4628
                    strSQL.Append(" And B.ConstructionCode = A.ConstructionCode");
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs
42 42
            this.label1 = new System.Windows.Forms.Label();
43 43
            this.panel1 = new System.Windows.Forms.Panel();
44 44
            this.btnInputImage = new System.Windows.Forms.Button();
45
            this.label9 = new System.Windows.Forms.Label();
46
            this.label8 = new System.Windows.Forms.Label();
47
            this.lblFixComment = new System.Windows.Forms.Label();
45 48
            this.lblLabel01 = new System.Windows.Forms.Label();
46 49
            this.panel2 = new System.Windows.Forms.Panel();
47 50
            this.radioButton2 = new System.Windows.Forms.RadioButton();
......
54 57
            this.lblLabel02 = new System.Windows.Forms.Label();
55 58
            this.label14 = new System.Windows.Forms.Label();
56 59
            this.label4 = new System.Windows.Forms.Label();
57
            this.label9 = new System.Windows.Forms.Label();
58 60
            this.label5 = new System.Windows.Forms.Label();
59 61
            this.label11 = new System.Windows.Forms.Label();
60
            this.label8 = new System.Windows.Forms.Label();
61 62
            this.lblLabel04 = new System.Windows.Forms.Label();
62 63
            this.pnlApproval = new System.Windows.Forms.Panel();
63 64
            this.lblApprovalCount = new System.Windows.Forms.Label();
......
188 189
            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
189 190
            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
190 191
            this.panel1.Controls.Add(this.btnInputImage);
192
            this.panel1.Controls.Add(this.label9);
193
            this.panel1.Controls.Add(this.label8);
194
            this.panel1.Controls.Add(this.lblFixComment);
191 195
            this.panel1.Controls.Add(this.lblLabel01);
192 196
            this.panel1.Controls.Add(this.panel2);
193 197
            this.panel1.Controls.Add(this.label17);
......
198 202
            this.panel1.Controls.Add(this.lblLabel02);
199 203
            this.panel1.Controls.Add(this.label14);
200 204
            this.panel1.Controls.Add(this.label4);
201
            this.panel1.Controls.Add(this.label9);
202 205
            this.panel1.Controls.Add(this.label5);
203 206
            this.panel1.Controls.Add(this.label11);
204
            this.panel1.Controls.Add(this.label8);
205 207
            this.panel1.Controls.Add(this.lblLabel04);
206 208
            this.panel1.Controls.Add(this.pnlApproval);
207 209
            this.panel1.Controls.Add(this.pnlApprovalButton);
208
            this.panel1.Location = new System.Drawing.Point(7, 40);
210
            this.panel1.Location = new System.Drawing.Point(7, 38);
209 211
            this.panel1.Name = "panel1";
210
            this.panel1.Size = new System.Drawing.Size(1330, 108);
212
            this.panel1.Size = new System.Drawing.Size(1330, 110);
211 213
            this.panel1.TabIndex = 8;
212 214
            // 
213 215
            // btnInputImage
......
216 218
            this.btnInputImage.BackColor = System.Drawing.Color.PaleTurquoise;
217 219
            this.btnInputImage.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
218 220
            this.btnInputImage.ForeColor = System.Drawing.Color.Black;
219
            this.btnInputImage.Location = new System.Drawing.Point(820, 71);
221
            this.btnInputImage.Location = new System.Drawing.Point(895, 62);
220 222
            this.btnInputImage.Name = "btnInputImage";
221
            this.btnInputImage.Size = new System.Drawing.Size(170, 25);
223
            this.btnInputImage.Size = new System.Drawing.Size(160, 24);
222 224
            this.btnInputImage.TabIndex = 54;
223 225
            this.btnInputImage.Text = "入力位置確認";
224 226
            this.btnInputImage.UseVisualStyleBackColor = false;
225 227
            this.btnInputImage.Click += new System.EventHandler(this.btnInputImage_Click);
226 228
            // 
229
            // label9
230
            // 
231
            this.label9.BackColor = System.Drawing.Color.SandyBrown;
232
            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
233
            this.label9.Location = new System.Drawing.Point(1081, 62);
234
            this.label9.Name = "label9";
235
            this.label9.Size = new System.Drawing.Size(120, 25);
236
            this.label9.TabIndex = 35;
237
            this.label9.Text = "着 工 日";
238
            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
239
            // 
240
            // label8
241
            // 
242
            this.label8.BackColor = System.Drawing.Color.White;
243
            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
244
            this.label8.ForeColor = System.Drawing.Color.Black;
245
            this.label8.Location = new System.Drawing.Point(1209, 62);
246
            this.label8.Name = "label8";
247
            this.label8.Size = new System.Drawing.Size(114, 25);
248
            this.label8.TabIndex = 36;
249
            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
250
            // 
251
            // lblFixComment
252
            // 
253
            this.lblFixComment.AutoSize = true;
254
            this.lblFixComment.Font = new System.Drawing.Font("MS 明朝", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(128)));
255
            this.lblFixComment.ForeColor = System.Drawing.Color.Red;
256
            this.lblFixComment.Location = new System.Drawing.Point(820, 88);
257
            this.lblFixComment.Name = "lblFixComment";
258
            this.lblFixComment.Size = new System.Drawing.Size(452, 16);
259
            this.lblFixComment.TabIndex = 98;
260
            this.lblFixComment.Text = "※金額変更時の法定福利費は8.0%で手計算してください。";
261
            this.lblFixComment.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
262
            // 
227 263
            // lblLabel01
228 264
            // 
229 265
            this.lblLabel01.BackColor = System.Drawing.Color.White;
230 266
            this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
231 267
            this.lblLabel01.ForeColor = System.Drawing.Color.Black;
232
            this.lblLabel01.Location = new System.Drawing.Point(134, 5);
268
            this.lblLabel01.Location = new System.Drawing.Point(132, 4);
233 269
            this.lblLabel01.Name = "lblLabel01";
234 270
            this.lblLabel01.Size = new System.Drawing.Size(115, 25);
235 271
            this.lblLabel01.TabIndex = 52;
......
240 276
            this.panel2.BackColor = System.Drawing.Color.White;
241 277
            this.panel2.Controls.Add(this.radioButton2);
242 278
            this.panel2.Controls.Add(this.radioButton1);
243
            this.panel2.Location = new System.Drawing.Point(820, 37);
279
            this.panel2.Location = new System.Drawing.Point(820, 33);
244 280
            this.panel2.Name = "panel2";
245
            this.panel2.Size = new System.Drawing.Size(250, 27);
281
            this.panel2.Size = new System.Drawing.Size(235, 27);
246 282
            this.panel2.TabIndex = 48;
247 283
            // 
248 284
            // radioButton2
249 285
            // 
250
            this.radioButton2.Location = new System.Drawing.Point(126, 0);
286
            this.radioButton2.Location = new System.Drawing.Point(121, 0);
251 287
            this.radioButton2.Name = "radioButton2";
252 288
            this.radioButton2.Size = new System.Drawing.Size(120, 28);
253 289
            this.radioButton2.TabIndex = 0;
254
            this.radioButton2.Text = "正 規 版";
290
            this.radioButton2.Text = "正版";
255 291
            this.radioButton2.UseVisualStyleBackColor = true;
256 292
            this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
257 293
            // 
258 294
            // radioButton1
259 295
            // 
260 296
            this.radioButton1.Checked = true;
261
            this.radioButton1.Location = new System.Drawing.Point(6, 0);
297
            this.radioButton1.Location = new System.Drawing.Point(17, 0);
262 298
            this.radioButton1.Name = "radioButton1";
263 299
            this.radioButton1.Size = new System.Drawing.Size(120, 28);
264 300
            this.radioButton1.TabIndex = 0;
265 301
            this.radioButton1.TabStop = true;
266
            this.radioButton1.Text = "簡 易 版";
302
            this.radioButton1.Text = "簡版";
267 303
            this.radioButton1.UseVisualStyleBackColor = true;
268 304
            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
269 305
            // 
......
272 308
            this.label17.BackColor = System.Drawing.Color.White;
273 309
            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
274 310
            this.label17.ForeColor = System.Drawing.Color.Black;
275
            this.label17.Location = new System.Drawing.Point(462, 71);
311
            this.label17.Location = new System.Drawing.Point(438, 68);
276 312
            this.label17.Name = "label17";
277
            this.label17.Size = new System.Drawing.Size(350, 25);
313
            this.label17.Size = new System.Drawing.Size(374, 25);
278 314
            this.label17.TabIndex = 47;
279 315
            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
280 316
            // 
......
282 318
            // 
283 319
            this.label16.BackColor = System.Drawing.Color.SandyBrown;
284 320
            this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
285
            this.label16.Location = new System.Drawing.Point(334, 71);
321
            this.label16.Location = new System.Drawing.Point(310, 68);
286 322
            this.label16.Name = "label16";
287 323
            this.label16.Size = new System.Drawing.Size(120, 25);
288 324
            this.label16.TabIndex = 46;
......
294 330
            this.lblConstructionCodelabel.BackColor = System.Drawing.Color.SandyBrown;
295 331
            this.lblConstructionCodelabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
296 332
            this.lblConstructionCodelabel.ForeColor = System.Drawing.Color.White;
297
            this.lblConstructionCodelabel.Location = new System.Drawing.Point(8, 5);
333
            this.lblConstructionCodelabel.Location = new System.Drawing.Point(4, 4);
298 334
            this.lblConstructionCodelabel.Name = "lblConstructionCodelabel";
299 335
            this.lblConstructionCodelabel.Size = new System.Drawing.Size(120, 25);
300 336
            this.lblConstructionCodelabel.TabIndex = 30;
......
306 342
            this.label3.BackColor = System.Drawing.Color.SandyBrown;
307 343
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
308 344
            this.label3.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
309
            this.label3.Location = new System.Drawing.Point(8, 38);
345
            this.label3.Location = new System.Drawing.Point(4, 36);
310 346
            this.label3.Name = "label3";
311 347
            this.label3.Size = new System.Drawing.Size(120, 25);
312 348
            this.label3.TabIndex = 33;
......
318 354
            this.lblLabel03.BackColor = System.Drawing.Color.White;
319 355
            this.lblLabel03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
320 356
            this.lblLabel03.ForeColor = System.Drawing.Color.Black;
321
            this.lblLabel03.Location = new System.Drawing.Point(134, 38);
357
            this.lblLabel03.Location = new System.Drawing.Point(132, 36);
322 358
            this.lblLabel03.Name = "lblLabel03";
323 359
            this.lblLabel03.Size = new System.Drawing.Size(550, 25);
324 360
            this.lblLabel03.TabIndex = 34;
......
329 365
            this.lblLabel02.BackColor = System.Drawing.Color.White;
330 366
            this.lblLabel02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
331 367
            this.lblLabel02.ForeColor = System.Drawing.Color.Black;
332
            this.lblLabel02.Location = new System.Drawing.Point(255, 5);
368
            this.lblLabel02.Location = new System.Drawing.Point(255, 4);
333 369
            this.lblLabel02.Name = "lblLabel02";
334
            this.lblLabel02.Size = new System.Drawing.Size(816, 25);
370
            this.lblLabel02.Size = new System.Drawing.Size(800, 25);
335 371
            this.lblLabel02.TabIndex = 32;
336 372
            this.lblLabel02.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
337 373
            // 
......
339 375
            // 
340 376
            this.label14.BackColor = System.Drawing.Color.SandyBrown;
341 377
            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
342
            this.label14.Location = new System.Drawing.Point(1081, 38);
378
            this.label14.Location = new System.Drawing.Point(1081, 36);
343 379
            this.label14.Name = "label14";
344 380
            this.label14.Size = new System.Drawing.Size(120, 25);
345 381
            this.label14.TabIndex = 35;
......
350 386
            // 
351 387
            this.label4.BackColor = System.Drawing.Color.SandyBrown;
352 388
            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
353
            this.label4.Location = new System.Drawing.Point(692, 38);
389
            this.label4.Location = new System.Drawing.Point(692, 36);
354 390
            this.label4.Name = "label4";
355 391
            this.label4.Size = new System.Drawing.Size(120, 25);
356 392
            this.label4.TabIndex = 35;
357 393
            this.label4.Text = "発注書タイプ";
358 394
            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
359 395
            // 
360
            // label9
361
            // 
362
            this.label9.BackColor = System.Drawing.Color.SandyBrown;
363
            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
364
            this.label9.Location = new System.Drawing.Point(1081, 5);
365
            this.label9.Name = "label9";
366
            this.label9.Size = new System.Drawing.Size(120, 25);
367
            this.label9.TabIndex = 35;
368
            this.label9.Text = "着 工 日";
369
            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
370
            // 
371 396
            // label5
372 397
            // 
373 398
            this.label5.BackColor = System.Drawing.Color.SandyBrown;
374 399
            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
375
            this.label5.Location = new System.Drawing.Point(8, 71);
400
            this.label5.Location = new System.Drawing.Point(4, 68);
376 401
            this.label5.Name = "label5";
377 402
            this.label5.Size = new System.Drawing.Size(120, 25);
378 403
            this.label5.TabIndex = 35;
......
384 409
            this.label11.BackColor = System.Drawing.Color.White;
385 410
            this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
386 411
            this.label11.ForeColor = System.Drawing.Color.Black;
387
            this.label11.Location = new System.Drawing.Point(1209, 38);
412
            this.label11.Location = new System.Drawing.Point(1209, 36);
388 413
            this.label11.Name = "label11";
389 414
            this.label11.Size = new System.Drawing.Size(114, 25);
390 415
            this.label11.TabIndex = 36;
391 416
            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
392 417
            // 
393
            // label8
394
            // 
395
            this.label8.BackColor = System.Drawing.Color.White;
396
            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
397
            this.label8.ForeColor = System.Drawing.Color.Black;
398
            this.label8.Location = new System.Drawing.Point(1209, 5);
399
            this.label8.Name = "label8";
400
            this.label8.Size = new System.Drawing.Size(114, 25);
401
            this.label8.TabIndex = 36;
402
            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
403
            // 
404 418
            // lblLabel04
405 419
            // 
406 420
            this.lblLabel04.BackColor = System.Drawing.Color.White;
407 421
            this.lblLabel04.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
408 422
            this.lblLabel04.ForeColor = System.Drawing.Color.Black;
409
            this.lblLabel04.Location = new System.Drawing.Point(134, 71);
423
            this.lblLabel04.Location = new System.Drawing.Point(132, 68);
410 424
            this.lblLabel04.Name = "lblLabel04";
411
            this.lblLabel04.Size = new System.Drawing.Size(190, 25);
425
            this.lblLabel04.Size = new System.Drawing.Size(170, 25);
412 426
            this.lblLabel04.TabIndex = 36;
413 427
            this.lblLabel04.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
414 428
            // 
......
421 435
            this.pnlApproval.Controls.Add(this.lblApprovalCount);
422 436
            this.pnlApproval.Controls.Add(this.btnPetition);
423 437
            this.pnlApproval.Controls.Add(this.btnApproval);
424
            this.pnlApproval.Location = new System.Drawing.Point(1060, 66);
438
            this.pnlApproval.Location = new System.Drawing.Point(1060, 0);
425 439
            this.pnlApproval.Name = "pnlApproval";
426 440
            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
427 441
            this.pnlApproval.TabIndex = 51;
......
476 490
            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
477 491
            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
478 492
            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
479
            this.pnlApprovalButton.Location = new System.Drawing.Point(1060, 66);
493
            this.pnlApprovalButton.Location = new System.Drawing.Point(1060, 0);
480 494
            this.pnlApprovalButton.Name = "pnlApprovalButton";
481 495
            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
482 496
            this.pnlApprovalButton.TabIndex = 53;
......
1749 1763
        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
1750 1764
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
1751 1765
        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
1766
        private System.Windows.Forms.Label lblFixComment;
1752 1767
    }
1753 1768
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
63 63

  
64 64
            m_DspLabelCtrl[(int)DspLblCtrlName.StartingDate] = label8;
65 65
            m_DspLabelCtrl[(int)DspLblCtrlName.CompleteDate] = label11;
66
        
67
            // ここで固定文字の表示
68
            lblFixComment.Text = string.Format("※金額変更時の{0}は{1}%で手計算してください。"
69
                                                                ,s_StatutoryWelfareName
70
                                                                , CommonMotions.SystemMasterData.StatutoryWelfareRate.ToString("0.0"));
66 71
        }
67 72
        #endregion
68 73
        
......
992 997
        }
993 998
        #endregion
994 999

  
1000
        #region 台帳発注金額テーブル
995 1001
        /// <summary>
996 1002
        /// 台帳発注金額テーブル
997 1003
        /// </summary>
998 1004
        private List<KeyValuePair<int, int>> LedgerOrderPrice = new List<KeyValuePair<int, int>>();
1005
        #endregion
999 1006

  
1000 1007
        #region 台帳発注金額テーブル作成
1001 1008
        /// <summary>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
583 583
        {
584 584
            try
585 585
            {
586
                // ?R???{?{?b?N?X?Z?b?g
586
                // ?????R???{?{?b?N?X?Z?b?g
587 587
                LoadTargetMonth(ref m_Payday);
588 588

  
589 589
                // ?S??????F?????
590
                int DepCode = 0;
591
                int PersonCode = 0;
592 590
                //if (ClsExcute.ProcControlPara.Count > 0)
593 591
                //{
594 592
                //    int cnt = ClsExcute.ProcControlPara.Count - 1;
......
609 607
                //    }
610 608
                //}
611 609

  
610
                int DepCode = 0;
611
                int PersonCode = 0;
612 612
                // ?p?????[?^?????Z?b?g
613 613
                SetInitParametar(ref DepCode, ref PersonCode);
614 614

  
615 615
                // ?R???{?{?b?N?X?????\??
616 616
                InitCombBox(DepCode, PersonCode);
617
                
617

  
618 618
                // ???[?U???????
619 619
                ClsSecurityPermission.SetUserType(m_UserInfo);
620 620

  
......
667 667
                    bool Pettition = false;
668 668
                    if ((m_PaInfo is PaymentApprovalInfo))
669 669
                    {
670
                        Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
670
                        //Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
671
                        Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
671 672
                    }
672 673
                    // ???O?C????????F??????m?F????
673 674
                    bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs
603 603
            this.groupBoxEx1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
604 604
            this.groupBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
605 605
            this.groupBoxEx1.BorderColor = System.Drawing.Color.Gray;
606
            this.groupBoxEx1.Controls.Add(this.pnlApproval);
607
            this.groupBoxEx1.Controls.Add(this.pnlApprovalButton);
606 608
            this.groupBoxEx1.Controls.Add(this.label11);
607 609
            this.groupBoxEx1.Controls.Add(this.cmbPerson);
608 610
            this.groupBoxEx1.Controls.Add(this.cmbDepartment);
609 611
            this.groupBoxEx1.Controls.Add(this.label4);
610 612
            this.groupBoxEx1.Controls.Add(this.panel2);
611
            this.groupBoxEx1.Controls.Add(this.pnlApproval);
612
            this.groupBoxEx1.Controls.Add(this.pnlApprovalButton);
613 613
            this.groupBoxEx1.Controls.Add(this.lblPaymentDate);
614 614
            this.groupBoxEx1.Controls.Add(this.label5);
615 615
            this.groupBoxEx1.Controls.Add(this.label2);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
51 51

  
52 52
                DepCode = PersonRec.DepartmentCode;
53 53
                PersonCode = PaymentPersonCode;
54

  
55
                cmbDepartment.Enabled = false;
56
                cmbPerson.Enabled = false;
54 57
            }
55 58
            catch (Exception ex)
56 59
            {
......
3406 3409
                StringBuilder sql = new StringBuilder();
3407 3410
                bool bNewData = false;
3408 3411
                // SQL??
3409
                CreateSQLType2Exists(m_PaInfo, ref sql);
3412
                CreateSQLType2Exists(ref sql);
3410 3413

  
3411 3414
                // Order By Set
3412 3415
                SetSQLOrder(ref sql);
......
3692 3695
            try
3693 3696
            {
3694 3697
                DataGridView dgv = getShowingView();
3698
                DataGridViewRow CurRow = dgv.Rows[LineCount];
3695 3699

  
3696
                int DepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.DetailName].Value);
3700
                int DepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.DetailName].Value);
3697 3701

  
3698 3702
                int SaleCode = CommonMotions.cnvInt(work[(int)ClickGetData.SalesPersonCode]);
3699 3703
                int ConstrPersonCode = CommonMotions.cnvInt(work[(int)ClickGetData.ConstructionPersonCode]);
......
3701 3705
                int InstrCode = CommonMotions.cnvInt(work[(int)ClickGetData.ConstructionInstructor]);
3702 3706

  
3703 3707
                // ?s????O???U?s????????
3704
                dgv.Rows[LineCount].Visible = false;
3705
                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
3708
                CurRow.Visible = false;
3709
                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
3706 3710

  
3707 3711
                // ?????S??
3708 3712
                if (m_UserInfo.m_GeneralAffairsFlg == (int)SecurityMaster.GeneAffDef.GeneralDep)
3709 3713
                {
3710 3714
                    // ?????????W????S??????Q?????\????A??W??\???????????????????????B
3711
                    dgv.Rows[LineCount].Visible = true;
3712
                    dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3715
                    CurRow.Visible = true;
3716
                    CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3713 3717
                }
3714 3718
                // ??????????
3715 3719
                else if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority)
3716 3720
                {
3717 3721
                    // ?????????W????S??????Q?????\????A??????????????O???W??\?????B
3718
                    dgv.Rows[LineCount].Visible = true;
3719
                    dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3722
                    CurRow.Visible = true;
3723
                    CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3720 3724
                }
3721 3725
                // ???????A????????
3722
                else if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.LimitedAuthority || m_UserInfo.m_Type == CommonDefine.SecurityRankPos.FreeAuthority)
3726
                else if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.LimitedAuthority
3727
                        || m_UserInfo.m_Type == CommonDefine.SecurityRankPos.FreeAuthority)
3723 3728
                {
3724 3729
                    // ?Q????????????`?F?b?N
3725 3730
                    foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserDepartment)
......
3727 3732
                        // ??????????????????????H?????\??????
3728 3733
                        if (RefDepRec.DepartmentCode != DepCode)
3729 3734
                        {
3730
                            dgv.Rows[LineCount].Visible = true;
3731
                            dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3735
                            CurRow.Visible = true;
3736
                            CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3732 3737
                        }
3733 3738
                    }
3734 3739
                }
......
3740 3745
                        // ?c??S??
3741 3746
                        if (CommonMotions.LoginUserData.PersonCode == SaleCode)
3742 3747
                        {
3743
                            dgv.Rows[LineCount].Visible = true;
3744
                            dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3748
                            CurRow.Visible = true;
3749
                            CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3745 3750
                        }
3746 3751
                        // ?H???S??
3747 3752
                        if (CommonMotions.LoginUserData.PersonCode == ConstrPersonCode
3748 3753
                            || CommonMotions.LoginUserData.PersonCode == SubPersonCode
3749 3754
                            || CommonMotions.LoginUserData.PersonCode == InstrCode)
3750 3755
                        {
3751
                            dgv.Rows[LineCount].Visible = true;
3752
                            dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3756
                            CurRow.Visible = true;
3757
                            CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3753 3758
                        }
3754 3759
                    }
3755 3760
                    else if (m_UserInfo.m_SecRange == ClsSecurityPermission.SecRangeType.OneDepartment)
......
3760 3765
                            // ??????????????????????H?????\??????
3761 3766
                            if (RefDepRec.DepartmentCode != DepCode)
3762 3767
                            {
3763
                                dgv.Rows[LineCount].Visible = true;
3764
                                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3768
                                CurRow.Visible = true;
3769
                                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3765 3770
                            }
3766 3771
                        }
3767 3772
                    }
......
3789 3794
                int SelDepCode = GetDepartmentCode();
3790 3795
                int SelPersonCode = GetConstrPersonCode();
3791 3796

  
3797
                // ----- ?s?f?[?^
3798
                DataGridViewRow CurRow = dgv.Rows[LineCount];
3792 3799
                // ???E?H???R?[?h
3793
                int CompCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[m_Company_Column].Value);
3794
                int ConstrCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[m_Genba_Column].Value);
3800
                int CompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
3801
                int ConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
3795 3802

  
3796 3803
                // ?\???S????
3797
                int RowAppDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.TantoDepCode].Value);
3798
                int RowApprovalPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.TantoShoninCode].Value);
3804
                int RowAppDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.TantoDepCode].Value);
3805
                int RowApprovalPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.TantoShoninCode].Value);
3799 3806

  
3800 3807
                // ?e?S????R?[?h
3801
                int RowConstrPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstrPerson].Value);
3802
                int RowSalesPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.SalesPerson].Value);
3803
                int RowAssistPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.AssistPerson].Value);
3804
                int RowInstrPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.InstrPerson].Value);
3808
                int RowConstrPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ConstrPerson].Value);
3809
                int RowSalesPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SalesPerson].Value);
3810
                int RowAssistPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.AssistPerson].Value);
3811
                int RowInstrPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.InstrPerson].Value);
3805 3812

  
3806 3813
                // ?e?S???????
3807
                int RowConstrDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstrDepCode].Value);
3808
                int RowSalesDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.SalesDepCode].Value);
3809
                int RowAssistDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.AssistDepCode].Value);
3810
                int RowInstrDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.InstrDepCode].Value);
3814
                int RowConstrDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ConstrDepCode].Value);
3815
                int RowSalesDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SalesDepCode].Value);
3816
                int RowAssistDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.AssistDepCode].Value);
3817
                int RowInstrDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.InstrDepCode].Value);
3811 3818

  
3812 3819
                // ?s????\??????
3813 3820
                if (CompCode == 0 || ConstrCode == 0) return;
3814 3821

  
3815 3822
                // ?s????O???U?s????????
3816
                dgv.Rows[LineCount].Visible = false;
3817
                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
3823
                CurRow.Visible = false;
3824
                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
3818 3825

  
3819 3826
                // ----- ?????E?S??????Z?b?g????????
3820

  
3821
                if (RowApprovalPersonCode != 0)
3822
                {   // ?\?????\????
3823
                    if (SelPersonCode != 0 && RowApprovalPersonCode != SelPersonCode) return;
3827
                if (SelDepCode != 0 && SelPersonCode != 0)
3828
                {
3829
                    if (RowApprovalPersonCode != 0)
3830
                    {   // ?\?????\????
3831
                        // ????
3832
                        if (RowAppDepCode != SelDepCode) return;
3833
                        // ?S????
3834
                        if (RowApprovalPersonCode != SelPersonCode) return;
3835
                    }
3836
                    else if (RowApprovalPersonCode == 0)
3837
                    {   // ?H???S????
3838
                        // ????
3839
                        if (RowConstrDepCode != SelDepCode) return;
3840
                        // ?S????
3841
                        if (RowConstrPersonCode != SelPersonCode) return;
3842
                    }
3824 3843
                }
3825
                else if (RowApprovalPersonCode == 0)
3826
                {   // ?\??????c??E?S????E???S????E?w????
3827

  
3844
                else if (SelDepCode != 0 && SelPersonCode == 0)
3845
                {
3846
                    if (RowApprovalPersonCode != 0)
3847
                    {   // ?\?????\????
3848
                        // ????
3849
                        if (RowAppDepCode != SelDepCode) return;
3850
                    }
3851
                    else if (RowApprovalPersonCode == 0)
3852
                    {   // ?H???S????
3853
                        // ????
3854
                        if (RowConstrDepCode != SelDepCode) return;
3855
                    }
3828 3856
                }
3829 3857

  
3830
                dgv.Rows[LineCount].Visible = true;
3831
                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3858
                CurRow.Visible = true;
3859
                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
3832 3860
            }
3833 3861
            catch (Exception ex)
3834 3862
            {
......
4264 4292
        /// </summary>
4265 4293
        /// <param name="PaInfo"></param>
4266 4294
        /// <param name="sql"></param>
4267
        private void CreateSQLType2Exists(PaymentApprovalInfo PaInfo, ref StringBuilder sql)
4295
        private void CreateSQLType2Exists(ref StringBuilder sql)
4268 4296
        {
4269 4297
            try
4270 4298
            {
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.11")]
36
[assembly: AssemblyFileVersion("1.0.1.11")]
35
[assembly: AssemblyVersion("1.0.1.12")]
36
[assembly: AssemblyFileVersion("1.0.1.12")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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