プロジェクト

全般

プロフィール

リビジョン 283

堀内約7年前に追加

工事情報選択・協力会社選択サブフォーム変更
画面フォント一部ゴシックを明朝に変更
担当者変更時、台帳追加処理修正(日数指定を引継)
定数値’0001/01/01’をDateTime.MinVlueより編集するように変更
請求まとめ処理修正実装中

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
72 72
            MaterialCountEntry = 25,            // 25:資材数変更画面
73 73
            MaterialReserveEntry = 26,          // 26:資材貸出
74 74
            MaterialReturnEntry = 27,           // 27:資材返却
75
            MaterialSelect = 28,                // 28;資材選択
75
            MaterialSelect = 28,                // 28:資材選択
76 76
            RequestSummaryList = 29,            // 29:請求まとめ 
77 77
            PaymentConfirmation = 30,           // 30:入金確認
78 78
            RequestInput = 31,                  // 31:請求入力
......
1174 1174
        }
1175 1175
        #endregion
1176 1176
        
1177
        #region 発注書入力
1177
        #region 注文書入力
1178 1178
        /// <summary>
1179
        /// 発注書入力
1179
        /// 注文書入力
1180 1180
        /// </summary>
1181 1181
        /// <returns></returns>
1182 1182
        public static void ProcessExecuteNo_PurchaseOrderEntry(ProcessParameter CurrentPara)
1183 1183
        {
1184
            // 発注書入力
1184
            // 注文書入力
1185 1185
            FrmPurchaseOrderEntry frm = new FrmPurchaseOrderEntry();
1186 1186
            try
1187 1187
            {
......
1230 1230
        }
1231 1231
        #endregion
1232 1232

  
1233
        #region 発注書印刷
1233
        #region 注文書印刷
1234 1234
        /// <summary>
1235
        /// 発注書入力
1235
        /// 注文書入力
1236 1236
        /// </summary>
1237 1237
        /// <returns></returns>
1238 1238
        public static void ProcessExecuteNo_PurchaseOrderPrint(ProcessParameter CurrentPara)
1239 1239
        {
1240
            // 発注書入力
1240
            // 注文書入力
1241 1241
            FrmPurchaseOrderPrint frm = new FrmPurchaseOrderPrint();
1242 1242
            try
1243 1243
            {
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentDataDetail.cs
313 313
            int iReturn = -1;
314 314
            try
315 315
            {
316
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
317
                strcmd.Append("SELECT count(CompanyCode)");
318
                strcmd.Append(" FROM PaymentDataDetail ");
316
                // SQL作成
317
                strcmd.Append("SELECT count(*) FROM PaymentDataDetail ");
319 318
                strcmd.Append(AddSQLString);
320 319

  
321 320
                // SQL実行
322 321
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return -1;
323 322

  
324 323
                // データセット
325
                foreach (object[] objwrk in arData)
326
                {
327
                    iReturn = CommonMotions.cnvInt(objwrk[0]);
328
                }
329
                // 件数があればセットする
330
                if (arData.Count > 0) iReturn = arData.Count;
324
                object[] objwrk = (object[])arData[0];
331 325

  
326
                iReturn = CommonMotions.cnvInt(objwrk[0]);
327

  
332 328
                return iReturn;
333 329
            }
334 330
            catch (Exception ex)
branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBudgetDetail.cs
5 5

  
6 6
namespace ProcessManagement.DataModel
7 7
{
8
    /// <summary>
9
    /// 工事予算書明細データ
10
    /// </summary>
8 11
    public class ConstructionBudgetDetail
9 12
    {
10
        /// <summary>
11
        /// 工事予算書明細データ
12
        /// </summary>
13 13
        #region メンバ変数
14 14

  
15 15
        private int     m_ConstructionCode = 0;	            // 工事コード
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
1093 1093
                            FlgString = "?????";
1094 1094
                        }
1095 1095
                        break;
1096
                    case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:    // ??????????
1097
                    case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:    // ?????????
1096
                    case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:                // ??????????
1097
                    case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:                // ?????????
1098 1098
                        int ParentCode = ClsProcessExist.GetParentConstrCode(nConstrCode);
1099 1099
                        if (GetPrintCount(OrderDB, ParentCode, nConstrCode))
1100 1100
                        {
1101
                            FlgString = "??";
1101
                            FlgString = "?????";
1102 1102
                        }
1103 1103

  
1104 1104
                        if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs
386 386
                int ConstrPeriod = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text);
387 387

  
388 388
                strSQL.Append("SELECT A.CONSTRUCTIONCODE,");
389
                strSQL.Append(" CASE DATE(A.ConstructionPeriodStart2) WHEN DATE('0001/01/01') THEN A.ConstructionPeriodStart ELSE A.ConstructionPeriodStart2 END StDate,");
390
                strSQL.Append(" CASE DATE(A.ConstructionPeriodEnd2) WHEN DATE('0001/01/01') THEN A.ConstructionPeriodEnd ELSE A.ConstructionPeriodEnd2 END EdDate,");
389
                strSQL.AppendFormat(" CASE DATE(A.ConstructionPeriodStart2) WHEN DATE('{0}')", DateTime.MinValue.ToShortDateString());
390
                strSQL.Append("  THEN A.ConstructionPeriodStart ELSE A.ConstructionPeriodStart2 END StDate,");
391
                strSQL.AppendFormat(" CASE DATE(A.ConstructionPeriodEnd2) WHEN DATE('{0}')", DateTime.MinValue.ToShortDateString());
392
                strSQL.Append("  THEN A.ConstructionPeriodEnd ELSE A.ConstructionPeriodEnd2 END EdDate,");
391 393
                strSQL.Append(" B.PERSONCODE B1, B.SEALPRINTNAME B2, B.MONTHLYSALARY B3,");
392 394
                strSQL.Append(" C.PERSONCODE C1, C.SEALPRINTNAME C2, C.MONTHLYSALARY C3,");
393 395
                strSQL.Append(" D.PERSONCODE D1, D.SEALPRINTNAME D2, D.MONTHLYSALARY D3,");
......
998 1000
        /// <returns></returns>
999 1001
        private bool LedgerDataChange(IOConstructionLedger LedgerDB,
1000 1002
                                        IOConstructionLedgerDetail LedgerDDB,
1003
                                        IOConstructionLedgerExcute LedgerEDB,
1001 1004
                                        int TotalOrdersPrice,
1002 1005
                                        bool TyingDataFlag,
1003 1006
                                        ArrayList ParentData,
......
1023 1026
                // ----- ?H??????????f?[?^????
1024 1027
                // ?H???S????
1025 1028
                bool bChgParson1 = false;
1026
                if (!LedgerDetailDataSalarySet(LedgerDDB, ProcConstrCode, frm, TotalOrdersPrice,
1029
                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB,ProcConstrCode, frm, TotalOrdersPrice,
1027 1030
                                                    (int)FrmConstructionLedger.DataGroup.Payroll,
1028 1031
                                                    objRec, LedgerRec, ref bChgParson1)) return false;
1029 1032

  
1030 1033
                // ?H?????S????
1031 1034
                bool bChgParson2 = false;
1032
                if (!LedgerDetailDataSalarySet(LedgerDDB, ProcConstrCode, frm, TotalOrdersPrice,
1035
                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, frm, TotalOrdersPrice,
1033 1036
                                                    (int)FrmConstructionLedger.DataGroup.Assistant,
1034 1037
                                                    objRec, LedgerRec, ref bChgParson2)) return false;
1035 1038

  
1036 1039
                // ?H???w????
1037 1040
                bool bChgParson3 = false;
1038
                if (!LedgerDetailDataSalarySet(LedgerDDB, ProcConstrCode, frm, TotalOrdersPrice,
1041
                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, frm, TotalOrdersPrice,
1039 1042
                                                    (int)FrmConstructionLedger.DataGroup.Instructor,
1040 1043
                                                    objRec, LedgerRec, ref bChgParson3)) return false;
1041 1044

  
......
1107 1110
        /// ?H??????????F?S????E???S????E?w?????Z?b?g
1108 1111
        /// </summary>
1109 1112
        /// <returns></returns>
1110
        private bool LedgerDetailDataSalarySet(IOConstructionLedgerDetail LedgerDDB, int ProcConstrCode, FrmConstructionLedger frm
1113
        private bool LedgerDetailDataSalarySet(IOConstructionLedgerDetail LedgerDDB
1114
                                                    , IOConstructionLedgerExcute LedgerEDB
1115
                                                    , int ProcConstrCode, FrmConstructionLedger frm
1111 1116
                                                    , int TotalOrdersPrice, int GroupCode
1112 1117
                                                    , object[] objRec, ConstructionLedger LedgerRec, ref bool bChangeCode)
1113 1118
        {
1114 1119
            try
1115 1120
            {
1116 1121
                // ??W?f?[?^??
1117
                int TargetParson1 = CommonMotions.cnvInt(((ComboBox)m_DspCtrl[(int)DspCnt.ConstructionPersonCode]).SelectedValue);
1118
                int TargetParson2 = CommonMotions.cnvInt(((ComboBox)m_DspCtrl[(int)DspCnt.ConstrSubPersonCode]).SelectedValue);
1119
                int TargetParson3 = CommonMotions.cnvInt(((ComboBox)m_DspCtrl[(int)DspCnt.ConstructionInstructor]).SelectedValue);
1122
                int TargetParson1 = CommonMotions.cnvInt(((ComboBox)m_DspCtrl[(int)DspCnt.ConstructionPersonCode]).SelectedValue);  // ?S????
1123
                int TargetParson2 = CommonMotions.cnvInt(((ComboBox)m_DspCtrl[(int)DspCnt.ConstrSubPersonCode]).SelectedValue);     // ???S????
1124
                int TargetParson3 = CommonMotions.cnvInt(((ComboBox)m_DspCtrl[(int)DspCnt.ConstructionInstructor]).SelectedValue);  // ?w????
1120 1125
                DateTime StartDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodStart2].Text);
1121 1126
                if (StartDate == DateTime.MinValue)
1122 1127
                    StartDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodStart].Text);
......
1134 1139

  
1135 1140
                int ConstructorCode = 0;
1136 1141
                double MonthryCost = 0;
1137
                bool bSalaryCorrection = true;
1138 1142
                switch (GroupCode)
1139 1143
                {
1140 1144
                    // ?H???S????
......
1146 1150
                    case (int)FrmConstructionLedger.DataGroup.Assistant:
1147 1151
                        ConstructorCode = TargetParson2;
1148 1152
                        MonthryCost = CommonDefine.AssistantMonthryCost;
1149
                        bSalaryCorrection = false;
1150 1153
                        break;
1151 1154

  
1152 1155
                    // ?H???w????
1153 1156
                    case (int)FrmConstructionLedger.DataGroup.Instructor:
1154 1157
                        ConstructorCode = TargetParson3;
1155 1158
                        MonthryCost = CommonDefine.InstructorMonthryCost;
1156
                        bSalaryCorrection = false;
1157 1159
                        break;
1158 1160
                }
1159 1161
                // ?f?[?^???????????AAnd?@?S???????????????????????
......
1171 1173
                                            DetailRec.GroupCount,
1172 1174
                                            DetailRec.LineCount,
1173 1175
                                            false)) return false;
1176
                
1177
                    // ???^?????????w?????O?S????x???z????????
1178
                    if (DetailRec.SalaryFlg == (int)CommonDefine.SalaryDevision.DaysInput)
1179
                    {
1180
                        strSQL.Clear();
1181
                        strSQL.Append(LedgerEDB.CreatePrimarykeyString(DetailRec.ConstructionCode
1182
                                                                        , DetailRec.GroupCount
1183
                                                                        , DetailRec.LineCount));
1184
                        LedgerEDB.DeleteAction(strSQL.ToString(), false);
1185
                    }
1174 1186
                }
1175 1187

  
1176 1188
                // ?S??????????????????f?[?^????????????
......
1191 1203
                    && LedgerRec.ConstructionStart == StartDate
1192 1204
                    && LedgerRec.ConstructionEnd == EndDate) return true;
1193 1205

  
1194
                // ?J?n???????????O???????????Z?b?g????
1195
                if (StartDate < DateTime.Today) StartDate = DateTime.Today;
1196
                // ???^???z??
1197
                double ExecutionAmount = 0;
1198
                double AmountConfigRate = 0;
1199
                // ?????????
1200
                int workingCount = ClsCalendar.CalcPassedDaysCount(StartDate, EndDate);
1201
                // ?x???????^?v?Z
1202
                CommonMotions.CalcPayValueData(MonthryCost,
1203
                                                TotalOrdersPrice,
1204
                                                workingCount,
1205
                                                ref ExecutionAmount,
1206
                                                ref AmountConfigRate,
1207
                                                bSalaryCorrection);
1208

  
1209 1206
                // ----- ?V?S?????H???\?Z??????f?[?^??
1210
                ClearConstructionLedgerDetailRec(ref DetailRec);
1211
                DetailRec.ConstructionCode = ProcConstrCode;                                // ?H?????
1212
                DetailRec.GroupCount = GroupCode;                                           // ?O???[?v???
1213
                DetailRec.LineCount = 0;                                                    // ?s???
1207
                ConstructionLedgerDetail NewDetailRec = new ConstructionLedgerDetail();
1208
                NewDetailRec.ConstructionCode = ProcConstrCode;                                     // ?H?????
1209
                NewDetailRec.GroupCount = GroupCode;                                                // ?O???[?v???
1210
                NewDetailRec.LineCount = 99;                                                        // ?s???
1214 1211
                
1215 1212
                frm.GetTitileParametar = GroupCode;
1216
                DetailRec.FirstString = frm.GetTitleString;                                 // ???????
1213
                NewDetailRec.FirstString = frm.GetTitleString;                                      // ???????
1217 1214

  
1218
                DetailRec.SecondString = string.Empty;                                      // ?H?????e
1219
                DetailRec.CompanyType = (int)CommonDefine.CodeDataType.Person;              // ??????R?[?h?^?C?v
1220
                DetailRec.CompanyCode = ConstructorCode;                                    // ??????R?[?h
1221
                //DetailRec.ExecutionAmount = ExecutionAmount;                              // ???s???z
1222
                //DetailRec.AmountConfigRate = AmountConfigRate;                              // ???z?\????
1223
                DetailRec.ExecutionAmount = 0;                                              // ???s???z
1224
                DetailRec.AmountConfigRate = 0;                                             // ???z?\????
1215
                NewDetailRec.SecondString = string.Empty;                                           // ?H?????e
1216
                NewDetailRec.CompanyType = (int)CommonDefine.CodeDataType.Person;                   // ??????R?[?h?^?C?v
1217
                NewDetailRec.CompanyCode = ConstructorCode;                                         // ??????R?[?h
1218
                NewDetailRec.ExecutionAmount = 0;                                                   // ???s???z
1219
                NewDetailRec.AmountConfigRate = 0;                                                  // ???z?\????
1225 1220

  
1226
                DetailRec.SalaryFlg = (int)CommonDefine.SalaryDevision.All;                 // ???^?U????
1227
                DetailRec.SalaryDays = workingCount;                                        // ???^?U??????
1228
                DetailRec.OperatingFlg = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing;    // ?S?????t???O
1221
                // 2017/10/19 ???^?U?????E???^?U????????????p??
1222
                NewDetailRec.SalaryFlg = DetailRec.SalaryFlg;                                       // ???^?U????
1223
                NewDetailRec.SalaryDays = DetailRec.SalaryDays;                                     // ???^?U??????
1224
                NewDetailRec.OperatingFlg = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing; // ?S?????t???O
1229 1225

  
1230
                DetailRec.SalaryOnRegist = MonthryCost;                                     // ?o?^?????z???^
1226
                NewDetailRec.SalaryOnRegist = MonthryCost;                                          // ?o?^?????z???^
1231 1227

  
1232 1228
                // ?f?[?^???
1233
                if (!LedgerDDB.InsertAction(DetailRec, false)) return false;
1229
                if (!LedgerDDB.InsertAction(NewDetailRec, false)) return false;
1234 1230

  
1231
                // ???^?????????w???????p??????z?v??
1232
                if (NewDetailRec.SalaryFlg == (int)CommonDefine.SalaryDevision.DaysInput)
1233
                {
1234
                    // ?H???S??????f?[?^??
1235
                    if (GroupCode == (int)FrmConstructionLedger.DataGroup.Payroll)
1236
                    {
1237
                        ConstructionLedgerExcute ExecRec = new ConstructionLedgerExcute();
1238

  
1239
                        ExecRec.ConstructionCode = NewDetailRec.ConstructionCode;	// ?H???R?[?h
1240
                        ExecRec.GroupCount = NewDetailRec.GroupCount;               // ?O???[?v???
1241
                        ExecRec.LineCount = NewDetailRec.LineCount;                 // ?s???
1242

  
1243
                        DateTime dtStart = CommonMotions.cnvDate(objRec[(int)ReadParentOrder.StartDate]);
1244
                        int ColCnt = ClsChangeLedgerData.CalcTargetMonthToColumn(dtStart, DateTime.Now);
1245
                        ExecRec.ColumnCount = ColCnt;                               // ????
1246

  
1247
                        int ExecAmount = CommonMotions.cnvRound(
1248
                                            ((MonthryCost * CommonDefine.s_SalaryCorrection) / CommonDefine.s_ManHourUnitMonth) * DetailRec.SalaryDays);
1249
                        ExecRec.PaymentAmount = ExecAmount;                         // ?x?????z
1250
                        ExecRec.TargetMonth = DateTime.Now;                         // ???N??
1251

  
1252
                        LedgerEDB.InsertAction(ExecRec, false);
1253
                    }
1254
                }
1255

  
1235 1256
                // ?f?[?^??X?L
1236 1257
                bChangeCode = true;
1237 1258
                
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs
2845 2845
            this.dgvPurchaseOrder.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
2846 2846
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
2847 2847
            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
2848
            dataGridViewCellStyle6.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
2848
            dataGridViewCellStyle6.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
2849 2849
            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
2850 2850
            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
2851 2851
            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
......
2926 2926
            this.dgvLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
2927 2927
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
2928 2928
            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
2929
            dataGridViewCellStyle11.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
2929
            dataGridViewCellStyle11.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
2930 2930
            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
2931 2931
            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
2932 2932
            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
......
3947 3947
            // 
3948 3948
            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
3949 3949
            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
3950
            this.btnOtherProc.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
3950 3951
            this.btnOtherProc.Location = new System.Drawing.Point(1, 657);
3951 3952
            this.btnOtherProc.Name = "btnOtherProc";
3952 3953
            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
......
4009 4010
            this.Controls.Add(this.btnDataEntry);
4010 4011
            this.Controls.Add(this.btnEnd);
4011 4012
            this.Controls.Add(this.label1);
4012
            this.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
4013
            this.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
4013 4014
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
4014 4015
            this.KeyPreview = true;
4015 4016
            this.Name = "FrmConstructionBaseInfo";
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
720 720
                strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d') AS PetitionDate");
721 721
                strSQL.Append(", DATE_FORMAT(A.PetitionApprovalDate, '%Y/%m/%d') AS ApprovalDate");
722 722
                strSQL.Append(", B.INVOICENO");
723
                strSQL.Append(", ifnull(DATE_FORMAT(C.CRETATEDATE, '%Y/%m/%d'), '0001/01/01') AS PrintoutDate");
724
                strSQL.Append(", ifnull(DATE_FORMAT(C.REQUESTDATE, '%Y/%m/%d'), '0001/01/01') AS RequestDate");
725
                strSQL.Append(", ifnull(DATE_FORMAT(D.SendDate, '%Y/%m/%d'), '0001/01/01') AS SendDate");
723
                strSQL.AppendFormat(", ifnull(DATE_FORMAT(C.CRETATEDATE, '%Y/%m/%d'), '{0}') AS PrintoutDate", DateTime.MinValue.ToShortDateString());
724
                strSQL.AppendFormat(", ifnull(DATE_FORMAT(C.REQUESTDATE, '%Y/%m/%d'), '{0}') AS RequestDate", DateTime.MinValue.ToShortDateString());
725
                strSQL.AppendFormat(", ifnull(DATE_FORMAT(D.SendDate, '%Y/%m/%d'), '{0}') AS SendDate", DateTime.MinValue.ToShortDateString());
726 726
                strSQL.Append(" FROM");
727 727
                strSQL.Append(" processapproval AS A");
728 728
                strSQL.Append(" LEFT JOIN requesthead AS B");
......
3280 3280
                if (!ConstructionBaseInfoDataEntry(cbiDB, cpdDB))
3281 3281
                {
3282 3282
                    MessageBox.Show("?H????{???f?[?^?o?^?G???[????B", "?o?^?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3283
                    cbiDB.rollback();
3284
                    cpdDB.rollback();
3283
                    RollBackCommitProc(true,
3284
                                        cbiDB, cbidDB, cpdDB, cbLinkDB,
3285
                                        ApprovalDB, PersonDB,
3286
                                        BudgetDB, BudgetDDB,
3287
                                        LedgerDB, LedgerDDB, LedgerEDB);
3288

  
3285 3289
                    return false;
3286 3290
                }
3287 3291
                if (!ConstructionBaseInfoDetailDataEntry(cbidDB))
3288 3292
                {
3289 3293
                    MessageBox.Show("?H????{????f?[?^?o?^?G???[????B", "?o?^?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3290
                    cbiDB.rollback();
3291
                    cbidDB.rollback();
3292
                    cpdDB.rollback();
3294
                    RollBackCommitProc(true,
3295
                                        cbiDB, cbidDB, cpdDB, cbLinkDB,
3296
                                        ApprovalDB, PersonDB,
3297
                                        BudgetDB, BudgetDDB,
3298
                                        LedgerDB, LedgerDDB, LedgerEDB);
3299

  
3293 3300
                    return false;
3294 3301
                }
3295 3302

  
......
3299 3306
                if (!GetFluctuationParent(cbiDB, cbLinkDB, TyingDataFlag, ref ParentData, ref ProcConstrCode))
3300 3307
                {
3301 3308
                    MessageBox.Show("?\?Z???E????X?p?f?[?^???G???[????B", "???G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3302
                    cbiDB.rollback();
3303
                    cbidDB.rollback();
3304
                    cpdDB.rollback();
3305
                    cbLinkDB.rollback();
3309
                    RollBackCommitProc(true,
3310
                                        cbiDB, cbidDB, cpdDB, cbLinkDB,
3311
                                        ApprovalDB, PersonDB,
3312
                                        BudgetDB, BudgetDDB,
3313
                                        LedgerDB, LedgerDDB, LedgerEDB);
3314

  
3306 3315
                    return false;
3307 3316
                }
3308 3317

  
......
3314 3323
                if (!BudgetDataChange(ApprovalDB, BudgetDB, BudgetDDB, PersonDB, ParentData, ProcConstrCode, TyingDataFlag))
3315 3324
                {
3316 3325
                    MessageBox.Show("?H???\?Z???f?[?^?X?V?G???[????B", "?X?V?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3317
                    cbiDB.rollback();
3318
                    cbidDB.rollback();
3319
                    cpdDB.rollback();
3320
                    cbLinkDB.rollback();
3326
                    RollBackCommitProc(true,
3327
                                        cbiDB, cbidDB, cpdDB, cbLinkDB,
3328
                                        ApprovalDB, PersonDB,
3329
                                        BudgetDB, BudgetDDB,
3330
                                        LedgerDB, LedgerDDB, LedgerEDB);
3321 3331

  
3322
                    ApprovalDB.rollback();
3323
                    BudgetDB.rollback();
3324
                    BudgetDDB.rollback();
3325
                    PersonDB.rollback();
3326 3332
                    return false;
3327 3333
                }
3328 3334

  
......
3332 3338
                    if (!UpdateConstrEndDate(cbiDB))
3333 3339
                    {
3334 3340
                        MessageBox.Show("?H??????????H???o?^?G???[????B", "?o?^?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3335
                        cbiDB.rollback();
3336
                        cbidDB.rollback();
3337
                        cpdDB.rollback();
3338
                        cbLinkDB.rollback();
3341
                        RollBackCommitProc(true,
3342
                                            cbiDB, cbidDB, cpdDB, cbLinkDB,
3343
                                            ApprovalDB, PersonDB,
3344
                                            BudgetDB, BudgetDDB,
3345
                                            LedgerDB, LedgerDDB, LedgerEDB);
3346

  
3339 3347
                        return false;
3340 3348
                    }
3341 3349
                }
3342 3350

  
3343 3351
                // ?H???????f?[?^?X?V
3344
                if (!LedgerDataChange(LedgerDB, LedgerDDB,
3352
                if (!LedgerDataChange(LedgerDB, LedgerDDB, LedgerEDB,
3345 3353
                                        TotalOrdersPrice, TyingDataFlag, ParentData, ProcConstrCode, frm, ref ProcConstrCode))
3346 3354
                {
3347 3355
                    MessageBox.Show("?H???????f?[?^?X?V?G???[????B", "?X?V?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3348
                    cbiDB.rollback();
3349
                    cbidDB.rollback();
3350
                    cpdDB.rollback();
3351
                    cbLinkDB.rollback();
3356
                    RollBackCommitProc(true,
3357
                                        cbiDB, cbidDB, cpdDB, cbLinkDB,
3358
                                        ApprovalDB, PersonDB,
3359
                                        BudgetDB, BudgetDDB,
3360
                                        LedgerDB, LedgerDDB, LedgerEDB);
3352 3361

  
3353
                    ApprovalDB.rollback();
3354
                    PersonDB.rollback();
3355

  
3356
                    BudgetDB.rollback();
3357
                    BudgetDDB.rollback();
3358

  
3359
                    LedgerDB.rollback();
3360
                    LedgerDDB.rollback();
3361
                    LedgerEDB.rollback();
3362

  
3363 3362
                    return false;
3364 3363
                }
3365 3364

  
......
3367 3366
                if (!ClsChangeBaseInfoData.SetParentConstrStatus(cbiDB, m_ConstructionCode))
3368 3367
                {
3369 3368
                    MessageBox.Show("?????H???i???X?V?G???[????B", "?X?V?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3370
                    cbiDB.rollback();
3371
                    cbidDB.rollback();
3372
                    cpdDB.rollback();
3373
                    cbLinkDB.rollback();
3369
                    RollBackCommitProc(true,
3370
                                        cbiDB, cbidDB, cpdDB, cbLinkDB,
3371
                                        ApprovalDB, PersonDB,
3372
                                        BudgetDB, BudgetDDB,
3373
                                        LedgerDB, LedgerDDB, LedgerEDB);
3374 3374

  
3375
                    ApprovalDB.rollback();
3376
                    PersonDB.rollback();
3377

  
3378
                    BudgetDB.rollback();
3379
                    BudgetDDB.rollback();
3380

  
3381
                    LedgerDB.rollback();
3382
                    LedgerDDB.rollback();
3383
                    LedgerEDB.rollback();
3375
                    return false;
3384 3376
                }
3385 3377

  
3386
                // DB?o?^
3387
                cbiDB.commit();
3388
                cbidDB.commit();
3389
                cpdDB.commit();
3390
                cbLinkDB.commit();
3378
                // DBCommit
3379
                RollBackCommitProc(false,
3380
                                    cbiDB, cbidDB, cpdDB, cbLinkDB,
3381
                                    ApprovalDB, PersonDB,
3382
                                    BudgetDB, BudgetDDB,
3383
                                    LedgerDB, LedgerDDB, LedgerEDB);
3391 3384

  
3392
                ApprovalDB.commit();
3393
                PersonDB.commit();
3394

  
3395
                BudgetDB.commit();
3396
                BudgetDDB.commit();
3397

  
3398
                LedgerDB.commit();
3399
                LedgerDDB.commit();
3400
                LedgerEDB.commit();
3401

  
3402 3385
                // ?H???R?[?h??Z?b?g
3403 3386
                frm.ConstructionCode = ProcConstrCode;
3404 3387

  
......
3443 3426
        }
3444 3427
        #endregion
3445 3428

  
3429
        #region ?o?^????RollBack?ECommit????
3430
        /// <summary>
3431
        /// ?o?^????RollBack?ECommit????
3432
        /// </summary>
3433
        private void RollBackCommitProc(bool bRollBack,
3434
                                        IOConstructionBaseInfo cbiDB,           // ?H????{???
3435
                                        IOConstructionBaseInfoDetail cbidDB,    // ?H????{????
3436
                                        IOConstructionProgressDate cpdDB,       // ????i?????t?f?[?^
3437
                                        IOConstructionLink cbLinkDB,            // ?H?????????
3438
                                        IOProcessApproval ApprovalDB,           // ???F?f?[?^
3439
                                        IOMPersonInCharge PersonDB,             // ?S????}?X?^
3440
                                        IOConstructionBudget BudgetDB,          // ?H???\?Z???f?[?^
3441
                                        IOConstructionBudgetDetail BudgetDDB,   // ?H???\?Z??????f?[?^
3442
                                        IOConstructionLedger LedgerDB,          // ?H???????f?[?^
3443
                                        IOConstructionLedgerDetail LedgerDDB,   // ?H??????????f?[?^
3444
                                        IOConstructionLedgerExcute LedgerEDB    // ?H???????x?????f?[?^
3445
                                        )
3446
        {
3447
            try
3448
            {
3449
                if (bRollBack)
3450
                {
3451
                    cbiDB.rollback();
3452
                    cbidDB.rollback();
3453
                    cpdDB.rollback();
3454
                    cbLinkDB.rollback();
3455
                    ApprovalDB.rollback();
3456
                    PersonDB.rollback();
3457
                    BudgetDB.rollback();
3458
                    BudgetDDB.rollback();
3459
                    LedgerDB.rollback();
3460
                    LedgerDDB.rollback();
3461
                    LedgerEDB.rollback();
3462
                }
3463

  
3464
                // DB?o?^
3465
                cbiDB.commit();
3466
                cbidDB.commit();
3467
                cpdDB.commit();
3468
                cbLinkDB.commit();
3469
                ApprovalDB.commit();
3470
                PersonDB.commit();
3471
                BudgetDB.commit();
3472
                BudgetDDB.commit();
3473
                LedgerDB.commit();
3474
                LedgerDDB.commit();
3475
                LedgerEDB.commit();
3476
            }
3477
            catch (System.Exception ex)
3478
            {
3479
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
3480
            }
3481
        }
3482
        #endregion
3483

  
3446 3484
        #region ?f?[?^??????
3447 3485
        /// <summary>
3448 3486
        /// ???{?^??????????????
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
4405 4405
                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.ConstructionBudget;
4406 4406
                //frm.ShowInTaskbar = false;
4407 4407
                frm.ShowDialog();
4408
                if (frm.EndButton == System.Windows.Forms.DialogResult.OK)
4409
                {
4410
                    SubContractorMaster selRec = frm.SelectData;
4411
                    dgv.CurrentRow.Cells[(int)GridColumn.CompanyType].Value = frm.DataType;
4412
                    dgv.CurrentRow.Cells[(int)GridColumn.CompanyCode].Value = selRec.CompanyCode;
4413
                    dgv.CurrentRow.Cells[(int)GridColumn.CompanyName].Value = selRec.CompanyName;
4414
                }
4408
                if (frm.EndButton != System.Windows.Forms.DialogResult.OK) return;
4409

  
4410
                SubContractorMaster selRec = frm.SelectData;
4411
                dgv.CurrentRow.Cells[(int)GridColumn.CompanyType].Value = frm.DataType;
4412
                dgv.CurrentRow.Cells[(int)GridColumn.CompanyCode].Value = selRec.CompanyCode;
4413
                dgv.CurrentRow.Cells[(int)GridColumn.CompanyName].Value = selRec.CompanyName;
4415 4414
            }
4416 4415
            catch (System.Exception ex)
4417 4416
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
661 661

  
662 662
                frm.ShowDialog();
663 663
                // 終了コード確認
664
                if (frm.EndButton == DialogResult.No) return;
664
                if (DialogResult.Cancel.Equals(frm.EndButton)) return;
665 665

  
666 666
                bool bCheck = true;
667 667
                if (m_OrderersDivision != 0 && m_OrderersDivision != frm.OrderCotegory) bCheck = false;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
4292 4292
                int PaymentBurdenCol = dgv.ColumnCount + (int)ColPayTotal.PaymentBurdens;
4293 4293
                int RowLineCnt = 0;
4294 4294
                int nOldLineCnt = 0;
4295
                int nWrkCompanyCode = 0;
4295 4296
                List<ConstructionLedgerDetail> NewList = new List<ConstructionLedgerDetail>();
4296
                List<KeyValuePair<int, int>> PDetailList = new List<KeyValuePair<int, int>>();
4297
                ArrayList PDetailList = new ArrayList();
4297 4298

  
4298 4299
                foreach (DataGridViewRow wrkRow in dgv.Rows)
4299 4300
                {
......
4341 4342
                    CreateInsertRowData(wrkRow, RowLineCnt, ref NewList);
4342 4343

  
4343 4344
                    // 明細行の位置が変わっているかの判定
4344
                    if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.DataLineCount].Value)) continue;
4345 4345
                    nOldLineCnt = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.DataLineCount].Value);
4346 4346
                    if (nOldLineCnt == 0) continue;
4347 4347
                    if (nOldLineCnt == RowLineCnt) continue;
4348 4348

  
4349
                    // 協力会社定義なしは処理しない
4350
                    nWrkCompanyCode = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.CompanyCode].Value);
4351
                    if (nWrkCompanyCode < 1) continue;
4352

  
4349 4353
                    // 明細行の位置が変わっていた時はリストに追加する
4350
                    PDetailList.Add(new KeyValuePair<int, int>(nOldLineCnt, RowLineCnt));
4354
                    PDetailList.Add(new object[] { nWrkCompanyCode, nOldLineCnt, RowLineCnt });
4351 4355

  
4352 4356
                } // iRows
4353 4357

  
......
4592 4596
        /// <summary>
4593 4597
        /// 注文書明細台帳行番号更新
4594 4598
        /// </summary>
4595
        private bool SetPurchaseOrderDetailLineCount(IOPurchaseOrderDetail PDetailDB, List<KeyValuePair<int, int>> PDetailList)
4599
        private bool SetPurchaseOrderDetailLineCount(IOPurchaseOrderDetail PDetailDB, ArrayList PDetailList)
4596 4600
        {
4597 4601
            try
4598 4602
            {
4599 4603
                StringBuilder strSQL = new StringBuilder();
4600
                List<PurchaseOrderDetail> DataList = new List<PurchaseOrderDetail>();
4601
                foreach (KeyValuePair<int, int> CurCount in PDetailList)
4604
                ArrayList DataList = new ArrayList();
4605
                // 行番号を後ろからにする
4606
                PDetailList.Reverse();
4607
                foreach (object[] CurCount in PDetailList)
4602 4608
                {
4603 4609
                    // 行番号変化リストより更新を行う
4604 4610
                    strSQL.Clear();
4605
                    strSQL.AppendFormat(" Where SourceCode = {0}", m_ConstructionCode);
4606
                    strSQL.AppendFormat(" And SourceLineCnt = {0}", CurCount.Key);
4611

  
4612
                    strSQL.Append("Select");
4613
                    strSQL.Append(" A.ConstructionCode,");
4614
                    strSQL.Append(" A.SeqNo,");
4615
                    strSQL.Append(" A.GroupCount,");
4616
                    strSQL.Append(" A.LineCount,");
4617
                    strSQL.Append(" A.SourceCode,");
4618
                    strSQL.Append(" A.SourceLineCnt,");
4619
                    strSQL.Append(" A.ConstructionCode");
4620
                    strSQL.Append(" From purchaseorderdetail as A");
4621
                    strSQL.Append(", purchaseorder as B");
4622
                    strSQL.AppendFormat(" Where A.ConstructionCode = {0}", m_ConstructionCode);
4623
                    strSQL.AppendFormat(" And A.SourceCode = {0}", m_ConstructionCode);
4624
                    strSQL.AppendFormat(" And A.SourceLineCnt = {0}", CommonMotions.cnvInt(CurCount[1]));
4625
                    strSQL.Append(" And B.ConstructionCode = A.ConstructionCode");
4626
                    strSQL.Append(" And B.SeqNo = A.SeqNo");
4627
                    strSQL.AppendFormat(" And B.CompanyCode = {0}", CommonMotions.cnvInt(CurCount[0]));
4628
                    strSQL.Append(" Order by A.SeqNo");
4629

  
4607 4630
                    DataList.Clear();
4608
                    if (!PDetailDB.SelectAction(strSQL.ToString(), ref DataList, false)) return false;
4631
                    if (!PDetailDB.ExecuteReader(strSQL.ToString(), ref DataList, false)) return false;
4609 4632
                    // 注文書が無い場合は処理しない
4610 4633
                    if (DataList.Count == 0) continue;
4634
                    // 注文書が2行以上ある場合は変更後の場合があるので処理しない
4635
                    if (DataList.Count > 1) continue;
4611 4636

  
4637
                    object[] RefRec = (object[])DataList[0];
4612 4638
                    // 注文書があれば行番号を更新する
4613 4639
                    strSQL.Clear();
4614 4640
                    strSQL.Append("UPDATE PurchaseOrderDetail");
4615 4641
                    strSQL.Append(" SET");
4616
                    strSQL.AppendFormat(" SourceLineCnt = {0}", CurCount.Value);
4617
                    strSQL.Append(PDetailDB.CreatePrimarykeyString(DataList[0].ConstructionCode,
4618
                                                                    DataList[0].SeqNo,
4619
                                                                    DataList[0].GroupCount,
4620
                                                                    DataList[0].LineCount));
4642
                    strSQL.AppendFormat(" SourceLineCnt = {0}", CommonMotions.cnvInt(CurCount[2]));
4643
                    strSQL.Append(PDetailDB.CreatePrimarykeyString(CommonMotions.cnvInt(RefRec[0]),
4644
                                                                    CommonMotions.cnvInt(RefRec[1]),
4645
                                                                    CommonMotions.cnvInt(RefRec[2]),
4646
                                                                    CommonMotions.cnvInt(RefRec[3])));
4621 4647
                    if (!PDetailDB.ExecuteNonQuery(strSQL.ToString(), false)) return false;
4622 4648
                }
4623 4649
                return true;
......
4634 4660
        /// <summary>
4635 4661
        /// 業者請求明細台帳行番号更新
4636 4662
        /// </summary>
4637
        private bool SetBillingDataDetailLineCount(IOBillingDataDetail BDetailDB, List<KeyValuePair<int, int>> PDetailList)
4663
        private bool SetBillingDataDetailLineCount(IOBillingDataDetail BDetailDB, ArrayList PDetailList)
4638 4664
        {
4639 4665
            try
4640 4666
            {
4641 4667
                StringBuilder strSQL = new StringBuilder();
4642 4668
                List<BillingDataDetail> DataList = new List<BillingDataDetail>();
4643
                foreach (KeyValuePair<int, int> CurCount in PDetailList)
4669
                foreach (object[] CurCount in PDetailList)
4644 4670
                {
4645 4671
                    // 行番号変化リストより更新を行う
4646 4672
                    strSQL.Clear();
4647
                    strSQL.AppendFormat(" Where CONSTRUCTIONCODE = {0}", m_ConstructionCode);
4648
                    strSQL.AppendFormat(" And CONSTRUCTIONROWCNT = {0}", CurCount.Key);
4673
                    strSQL.AppendFormat(" Where COMPANYCODE = {0}", CommonMotions.cnvInt(CurCount[0]));
4674
                    strSQL.AppendFormat(" And CONSTRUCTIONCODE = {0}", m_ConstructionCode);
4675
                    strSQL.AppendFormat(" And CONSTRUCTIONROWCNT = {0}", CommonMotions.cnvInt(CurCount[1]));
4649 4676
                    DataList.Clear();
4650 4677
                    if (!BDetailDB.SelectAction(strSQL.ToString(), ref DataList, false)) return false;
4651 4678
                    // 注文書が無い場合は処理しない
......
4655 4682
                    strSQL.Clear();
4656 4683
                    strSQL.Append("UPDATE billingdatadetail");
4657 4684
                    strSQL.Append(" SET");
4658
                    strSQL.AppendFormat(" CONSTRUCTIONROWCNT = {0}", CurCount.Value);
4685
                    strSQL.AppendFormat(" CONSTRUCTIONROWCNT = {0}", CommonMotions.cnvInt(CurCount[2]));
4659 4686
                    strSQL.Append(BDetailDB.CreatePrimarykeyString(DataList[0].CompanyCode,
4660 4687
                                                                    DataList[0].TargetDate,
4661 4688
                                                                    DataList[0].SeqNo,
......
5032 5059
                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.ConstructionLedger;
5033 5060
                //frm.ShowInTaskbar = false;
5034 5061
                frm.ShowDialog();
5035
                if (frm.EndButton == System.Windows.Forms.DialogResult.OK)
5036
                {
5037
                    SubContractorMaster selRec = frm.SelectData;
5038
                    dgv.CurrentRow.Cells[(int)GridColumn.CompanyType].Value = frm.DataType;
5039
                    dgv.CurrentRow.Cells[(int)GridColumn.CompanyCode].Value = selRec.CompanyCode;
5040
                    dgv.CurrentRow.Cells[(int)GridColumn.CompanyName].Value = selRec.CompanyName;
5041
                    m_bChengeAns = true;
5042
                }
5062
                if (frm.EndButton != System.Windows.Forms.DialogResult.OK) return;
5063

  
5064
                SubContractorMaster selRec = frm.SelectData;
5065
                dgv.CurrentRow.Cells[(int)GridColumn.CompanyType].Value = frm.DataType;
5066
                dgv.CurrentRow.Cells[(int)GridColumn.CompanyCode].Value = selRec.CompanyCode;
5067
                dgv.CurrentRow.Cells[(int)GridColumn.CompanyName].Value = selRec.CompanyName;
5068
                m_bChengeAns = true;
5043 5069
            }
5044 5070
            catch (System.Exception ex)
5045 5071
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs
571 571
            // 
572 572
            this.label11.AutoSize = true;
573 573
            this.label11.BackColor = System.Drawing.Color.PaleGoldenrod;
574
            this.label11.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
574
            this.label11.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
575 575
            this.label11.ForeColor = System.Drawing.Color.Black;
576 576
            this.label11.Location = new System.Drawing.Point(645, 34);
577 577
            this.label11.Name = "label11";
......
609 609
            // 
610 610
            this.lblPlusorMinus2.AutoSize = true;
611 611
            this.lblPlusorMinus2.BackColor = System.Drawing.Color.PaleGoldenrod;
612
            this.lblPlusorMinus2.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
612
            this.lblPlusorMinus2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
613 613
            this.lblPlusorMinus2.ForeColor = System.Drawing.Color.Black;
614 614
            this.lblPlusorMinus2.Location = new System.Drawing.Point(338, 59);
615 615
            this.lblPlusorMinus2.Name = "lblPlusorMinus2";
......
622 622
            // 
623 623
            this.label16.AutoSize = true;
624 624
            this.label16.BackColor = System.Drawing.Color.PaleGoldenrod;
625
            this.label16.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
625
            this.label16.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
626 626
            this.label16.ForeColor = System.Drawing.Color.Black;
627 627
            this.label16.Location = new System.Drawing.Point(645, 59);
628 628
            this.label16.Name = "label16";
......
635 635
            // 
636 636
            this.lblPlusorMinus1.AutoSize = true;
637 637
            this.lblPlusorMinus1.BackColor = System.Drawing.Color.PaleGoldenrod;
638
            this.lblPlusorMinus1.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
638
            this.lblPlusorMinus1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
639 639
            this.lblPlusorMinus1.ForeColor = System.Drawing.Color.Black;
640 640
            this.lblPlusorMinus1.Location = new System.Drawing.Point(338, 34);
641 641
            this.lblPlusorMinus1.Name = "lblPlusorMinus1";
......
660 660
            // 
661 661
            this.label12.AutoSize = true;
662 662
            this.label12.BackColor = System.Drawing.Color.PaleGoldenrod;
663
            this.label12.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
663
            this.label12.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
664 664
            this.label12.ForeColor = System.Drawing.Color.Black;
665 665
            this.label12.Location = new System.Drawing.Point(338, 7);
666 666
            this.label12.Name = "label12";
......
736 736
            // 
737 737
            this.label13.AutoSize = true;
738 738
            this.label13.BackColor = System.Drawing.Color.PaleGoldenrod;
739
            this.label13.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
739
            this.label13.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
740 740
            this.label13.ForeColor = System.Drawing.Color.Black;
741 741
            this.label13.Location = new System.Drawing.Point(645, 7);
742 742
            this.label13.Name = "label13";
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
586 586
                strSQL.Append(" WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
587 587
                strSQL.AppendFormat(" AND A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
588 588
                if (PersonCode != 0) strSQL.AppendFormat(" AND B.CONSTRSUBPERSONCODE = {0}", PersonCode);
589
                strSQL.Append(" AND DATE_FORMAT(B.CONSTRUCTIONPERIODSTART,'%Y/%m/%d') != '0001/01/01'");
590
                strSQL.Append(" AND DATE_FORMAT(B.CONSTRUCTIONPERIODEND,'%Y/%m/%d') != '0001/01/01'");
589
                strSQL.AppendFormat(" AND DATE_FORMAT(B.CONSTRUCTIONPERIODSTART,'%Y/%m/%d') != '{0}'", DateTime.MinValue.ToShortDateString());
590
                strSQL.AppendFormat(" AND DATE_FORMAT(B.CONSTRUCTIONPERIODEND,'%Y/%m/%d') != '{0}'", DateTime.MinValue.ToShortDateString());
591 591
                ArrayList arList = new ArrayList();
592 592
                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
593 593

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs
2220 2220
                frm.PersonCharge = (int)FrmConstructionDiag.PersonChargePoint.Construction;
2221 2221
                frm.PersonCode = PersonCode;
2222 2222
                frm.ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts;
2223
                frm.SelectType = (int)FrmConstructionDiag.SelectConstructionType.Ongoing;
2223
                frm.SelectType = (int)FrmConstructionDiag.SelectConstructionType.OwnOngoing;
2224 2224

  
2225 2225
                frm.ShowDialog();
2226 2226
                // 終了コード確認
2227
                if (frm.EndButton == DialogResult.No) return;
2227
                if (DialogResult.Cancel.Equals(frm.EndButton)) return;
2228 2228

  
2229 2229
                // 工事コードセット
2230 2230
                dgvRow.Cells[(int)GridColumn01.ConstractionCode].Value = frm.ConstructionCode;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs
275 275
            // 
276 276
            this.label11.AutoSize = true;
277 277
            this.label11.BackColor = System.Drawing.Color.LightSteelBlue;
278
            this.label11.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
278
            this.label11.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
279 279
            this.label11.ForeColor = System.Drawing.Color.Black;
280 280
            this.label11.Location = new System.Drawing.Point(645, 34);
281 281
            this.label11.Name = "label11";
......
313 313
            // 
314 314
            this.lblPlusorMinus2.AutoSize = true;
315 315
            this.lblPlusorMinus2.BackColor = System.Drawing.Color.LightSteelBlue;
316
            this.lblPlusorMinus2.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
316
            this.lblPlusorMinus2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
317 317
            this.lblPlusorMinus2.ForeColor = System.Drawing.Color.Black;
318 318
            this.lblPlusorMinus2.Location = new System.Drawing.Point(338, 59);
319 319
            this.lblPlusorMinus2.Name = "lblPlusorMinus2";
......
326 326
            // 
327 327
            this.label16.AutoSize = true;
328 328
            this.label16.BackColor = System.Drawing.Color.LightSteelBlue;
329
            this.label16.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
329
            this.label16.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
330 330
            this.label16.ForeColor = System.Drawing.Color.Black;
331 331
            this.label16.Location = new System.Drawing.Point(645, 59);
332 332
            this.label16.Name = "label16";
......
339 339
            // 
340 340
            this.lblPlusorMinus1.AutoSize = true;
341 341
            this.lblPlusorMinus1.BackColor = System.Drawing.Color.LightSteelBlue;
342
            this.lblPlusorMinus1.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
342
            this.lblPlusorMinus1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
343 343
            this.lblPlusorMinus1.ForeColor = System.Drawing.Color.Black;
344 344
            this.lblPlusorMinus1.Location = new System.Drawing.Point(338, 34);
345 345
            this.lblPlusorMinus1.Name = "lblPlusorMinus1";
......
364 364
            // 
365 365
            this.label12.AutoSize = true;
366 366
            this.label12.BackColor = System.Drawing.Color.LightSteelBlue;
367
            this.label12.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
367
            this.label12.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
368 368
            this.label12.ForeColor = System.Drawing.Color.Black;
369 369
            this.label12.Location = new System.Drawing.Point(338, 7);
370 370
            this.label12.Name = "label12";
......
440 440
            // 
441 441
            this.label13.AutoSize = true;
442 442
            this.label13.BackColor = System.Drawing.Color.LightSteelBlue;
443
            this.label13.Font = new System.Drawing.Font("MS Pゴシック", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
443
            this.label13.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
444 444
            this.label13.ForeColor = System.Drawing.Color.Black;
445 445
            this.label13.Location = new System.Drawing.Point(645, 7);
446 446
            this.label13.Name = "label13";
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs
192 192
                strSQL.Append(", 0 AS SEQNO");
193 193
                strSQL.Append(", A.LINECOUNT AS LINECOUNT");
194 194
                strSQL.Append(", 0 AS ORDERNO");
195
                strSQL.Append(", DATE ('0001/01/01') AS PRINTOUTDATE");
195
                strSQL.AppendFormat(", DATE ('{0}') AS PRINTOUTDATE", DateTime.MinValue.ToShortDateString());
196 196
                strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL A");
197 197

  
198 198
                strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.SOURCECODE");
......
269 269
                strSQL.AppendFormat(" AND A.COMPANYTYPE <> {0}", (int)CommonDefine.CodeDataType.Person);
270 270
                strSQL.Append(" AND F.COMPANYCODE = A.COMPANYCODE)");
271 271

  
272
                strSQL.Append(" ORDER BY PURCHASEORDERFLG ASC, SOURCECODE ASC, COMPANYCODE ASC, APPVAL ASC");
272
                strSQL.Append(" ORDER BY ORDERNO DESC, PURCHASEORDERFLG ASC, SOURCECODE ASC, COMPANYCODE ASC, APPVAL ASC");
273 273
            }
274 274
            catch (Exception ex)
275 275
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
368 368
            IOPurchaseOrder OrderDB = new IOPurchaseOrder();
369 369
            try
370 370
            {
371
                string strSQL = "SELECT * FROM";
372
                strSQL += string.Format(" (SELECT COUNT(*) FROM PURCHASEORDER A1 WHERE CONSTRUCTIONCODE = {0}) A,", TargetCode);
373
                //strSQL += string.Format(" (SELECT COUNT(*) FROM PURCHASEORDER B1 WHERE CONSTRUCTIONCODE = {0} AND PRINTOUTDATE != TO_DATE('0001/01/01')) B", TargetCode);
374
                strSQL += string.Format(" (SELECT COUNT(*) FROM PURCHASEORDER B1 WHERE CONSTRUCTIONCODE = {0} AND DATE(PRINTOUTDATE) != STR_TO_DATE('0001/01/01', '%Y/%m/%d')) B", TargetCode);
371
                StringBuilder strSQL = new StringBuilder();
372
                strSQL.Append("SELECT * FROM");
373
                strSQL.AppendFormat(" (SELECT COUNT(*) FROM PURCHASEORDER A1 WHERE CONSTRUCTIONCODE = {0}) A,", TargetCode);
374
                strSQL.AppendFormat(" (SELECT COUNT(*) FROM PURCHASEORDER B1 WHERE CONSTRUCTIONCODE = {0}", TargetCode);
375
                strSQL.AppendFormat(" AND DATE(PRINTOUTDATE) != STR_TO_DATE('{0}', '%Y/%m/%d')) B", DateTime.MinValue.ToShortDateString());
375 376
                ArrayList arList = new ArrayList();
376
                if (!OrderDB.ExecuteReader(strSQL, ref arList)) return;
377
                if (!OrderDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
377 378

  
378 379
                object[] objRec = (object[])arList[0];
379 380
                AllCount = CommonMotions.cnvInt(objRec[0]);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmRegField.cs
188 188
                frmConstructionDiag.PersonCode = CommonMotions.LoginUserData.PersonCode;
189 189
                //frmConstructionDiag.PersonCharge = (int)FrmConstructionDiag.PersonChargePoint.Construction; //関連工事のみ表示する
190 190
                frmConstructionDiag.PersonCharge = m_ConstructionFieldNameHeader.PersonCharge;
191
                frmConstructionDiag.SelectType = (int)FrmConstructionDiag.SelectConstructionType.Ongoing;
191
                frmConstructionDiag.SelectType = (int)FrmConstructionDiag.SelectConstructionType.OwnOngoing;
192 192

  
193 193
                // 現場選択画面表示
194 194
                frmConstructionDiag.ShowDialog();
195 195

  
196
                // 選択結果判定 OKなら以下の処理を実行する
197
                if (frmConstructionDiag.EndButton == DialogResult.OK)
196
                // 終了コード確認
197
                if (DialogResult.Cancel.Equals(frmConstructionDiag.EndButton)) return;
198

  
199
                if (isExistConstructionRow(frmConstructionDiag.ConstructionCode) == true)
198 200
                {
199
                    if (isExistConstructionRow(frmConstructionDiag.ConstructionCode) == true)
201
                    if (MessageBox.Show("既に同一工事が存在しますが追加してよろしいですか?",
202
                                        "現場追加",
203
                                        MessageBoxButtons.YesNo,
204
                                        MessageBoxIcon.Question) == DialogResult.No)
200 205
                    {
201
                        if (MessageBox.Show("既に同一工事が存在しますが追加してよろしいですか?", "現場追加", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
202
                        {
203
                            return;
204
                        }
206
                        return;
205 207
                    }
208
                }
206 209

  
207
                    // 行番号付番
208
                    int rowCount = dgv1.RowCount - 1;
210
                // 行番号付番
211
                int rowCount = dgv1.RowCount - 1;
209 212

  
210
                    // 現場の追加
211
                    dgv1.Rows.Add(frmConstructionDiag.ConstructionCode, rowCount, frmConstructionDiag.ConstructionName, 0, false, -1);
212
                    dgv1.Rows[dgv1.RowCount - 1].Resizable = DataGridViewTriState.False;
213
                    dgv1[(int)ColumnIndex.BillPrice, dgv1.RowCount - 1].ReadOnly = false;
214
                    //dgv1[(int)ColumnIndex.BillPrice, dgv1.RowCount - 1].Style.Format = "#,0";
213
                // 現場の追加
214
                dgv1.Rows.Add(frmConstructionDiag.ConstructionCode, rowCount, frmConstructionDiag.ConstructionName, 0, false, -1);
215
                dgv1.Rows[dgv1.RowCount - 1].Resizable = DataGridViewTriState.False;
216
                dgv1[(int)ColumnIndex.BillPrice, dgv1.RowCount - 1].ReadOnly = false;
217
                //dgv1[(int)ColumnIndex.BillPrice, dgv1.RowCount - 1].Style.Format = "#,0";
215 218

  
216
                    // ハッシュテーブルに追加
217
                    m_HtGridRowConstructionCode.Add(rowCount, dgv1.Rows[dgv1.RowCount - 1]);
219
                // ハッシュテーブルに追加
220
                m_HtGridRowConstructionCode.Add(rowCount, dgv1.Rows[dgv1.RowCount - 1]);
218 221

  
219
                }
220

  
221
                // イベントハンドラ再登録
222
                dgv1.CellValueChanged += dgv1_CellValueChanged;
223
                dgv1.SelectionChanged += dgv1_SelectionChanged;
224

  
225 222
            }
226 223
            catch (Exception ex)
227 224
            {
228 225
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
229 226
            }
227
            finally
228
            {
229
                // イベントハンドラ再登録
230
                dgv1.CellValueChanged += dgv1_CellValueChanged;
231
                dgv1.SelectionChanged += dgv1_SelectionChanged;
232
            }
230 233
        }
231 234
        #endregion
232 235

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmRowDetail.Designer.cs
1
namespace ProcessManagement.Forms.DataEntry
2
{
3
    partial class FrmRowDetail
4
    {
5
        /// <summary>
6
        /// Required designer variable.
7
        /// </summary>
8
        private System.ComponentModel.IContainer components = null;
9

  
10
        /// <summary>
11
        /// Clean up any resources being used.
12
        /// </summary>
13
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
14
        protected override void Dispose(bool disposing)
15
        {
16
            if (disposing && (components != null))
17
            {
18
                components.Dispose();
19
            }
20
            base.Dispose(disposing);
21
        }
22

  
23
        #region Windows Form Designer generated code
24

  
25
        /// <summary>
26
        /// Required method for Designer support - do not modify
27
        /// the contents of this method with the code editor.
28
        /// </summary>
29
        private void InitializeComponent()
30
        {
31
            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
32
            this.label4 = new System.Windows.Forms.Label();
33
            this.label2 = new System.Windows.Forms.Label();
34
            this.label3 = new System.Windows.Forms.Label();
35
            this.label1 = new System.Windows.Forms.Label();
36
            this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
37
            this.textBox1 = new System.Windows.Forms.TextBox();
38
            this.btnDataEntry = new System.Windows.Forms.Button();
39
            this.btnEnd = new System.Windows.Forms.Button();
40
            this.groupBoxEx1.SuspendLayout();
41
            this.groupBoxEx2.SuspendLayout();
42
            this.SuspendLayout();
43
            // 
44
            // groupBoxEx1
45
            // 
46
            this.groupBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
47
            this.groupBoxEx1.BorderColor = System.Drawing.Color.White;
48
            this.groupBoxEx1.Controls.Add(this.label4);
49
            this.groupBoxEx1.Controls.Add(this.label2);
50
            this.groupBoxEx1.Controls.Add(this.label3);
51
            this.groupBoxEx1.Controls.Add(this.label1);
52
            this.groupBoxEx1.Location = new System.Drawing.Point(7, 6);
53
            this.groupBoxEx1.Name = "groupBoxEx1";
54
            this.groupBoxEx1.Size = new System.Drawing.Size(570, 66);
55
            this.groupBoxEx1.TabIndex = 0;
56
            this.groupBoxEx1.TabStop = false;
57
            // 
58
            // label4
59
            // 
60
            this.label4.BackColor = System.Drawing.Color.White;
61
            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
62
            this.label4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
63
            this.label4.ForeColor = System.Drawing.Color.Black;
64
            this.label4.Location = new System.Drawing.Point(134, 34);
65
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
66
            this.label4.Name = "label4";
67
            this.label4.Size = new System.Drawing.Size(430, 25);
68
            this.label4.TabIndex = 2;
69
            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
70
            // 
71
            // label2
72
            // 
73
            this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
74
            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
75
            this.label2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
76
            this.label2.ForeColor = System.Drawing.Color.Black;
77
            this.label2.Location = new System.Drawing.Point(6, 34);
78
            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
79
            this.label2.Name = "label2";
80
            this.label2.Size = new System.Drawing.Size(120, 25);
81
            this.label2.TabIndex = 1;
82
            this.label2.Text = "業者名称";
83
            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
84
            // 
85
            // label3
86
            // 
87
            this.label3.BackColor = System.Drawing.Color.White;
88
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
89
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
90
            this.label3.ForeColor = System.Drawing.Color.Black;
91
            this.label3.Location = new System.Drawing.Point(134, 4);
92
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
93
            this.label3.Name = "label3";
94
            this.label3.Size = new System.Drawing.Size(430, 25);
95
            this.label3.TabIndex = 1;
96
            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
97
            // 
98
            // label1
99
            // 
100
            this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
101
            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
102
            this.label1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
103
            this.label1.ForeColor = System.Drawing.Color.Black;
104
            this.label1.Location = new System.Drawing.Point(6, 4);
105
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
106
            this.label1.Name = "label1";
107
            this.label1.Size = new System.Drawing.Size(120, 25);
108
            this.label1.TabIndex = 1;
109
            this.label1.Text = "現場名称";
110
            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
111
            // 
112
            // groupBoxEx2
113
            // 
114
            this.groupBoxEx2.BorderColor = System.Drawing.Color.White;
115
            this.groupBoxEx2.Controls.Add(this.textBox1);
116
            this.groupBoxEx2.ForeColor = System.Drawing.Color.White;
117
            this.groupBoxEx2.Location = new System.Drawing.Point(7, 80);
118
            this.groupBoxEx2.Name = "groupBoxEx2";
119
            this.groupBoxEx2.Size = new System.Drawing.Size(570, 90);
120
            this.groupBoxEx2.TabIndex = 1;
121
            this.groupBoxEx2.TabStop = false;
122
            this.groupBoxEx2.Text = "明細内容";
123
            // 
124
            // textBox1
125
            // 
126
            this.textBox1.ImeMode = System.Windows.Forms.ImeMode.On;
127
            this.textBox1.Location = new System.Drawing.Point(5, 19);
128
            this.textBox1.Multiline = true;
129
            this.textBox1.Name = "textBox1";
130
            this.textBox1.Size = new System.Drawing.Size(560, 60);
131
            this.textBox1.TabIndex = 0;
132
            this.textBox1.Text = "あ\r\nあ\r\nあ";
133
            // 
134
            // btnDataEntry
135
            // 
136
            this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
137
            this.btnDataEntry.BackColor = System.Drawing.Color.Green;
138
            this.btnDataEntry.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
139
            this.btnDataEntry.ForeColor = System.Drawing.Color.White;
140
            this.btnDataEntry.Location = new System.Drawing.Point(329, 177);
141
            this.btnDataEntry.Margin = new System.Windows.Forms.Padding(4);
142
            this.btnDataEntry.Name = "btnDataEntry";
143
            this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
144
            this.btnDataEntry.TabIndex = 11;
145
            this.btnDataEntry.Text = "登 録";
146
            this.btnDataEntry.UseVisualStyleBackColor = false;
147
            this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
148
            // 
149
            // btnEnd
150
            // 
151
            this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
152
            this.btnEnd.BackColor = System.Drawing.Color.Blue;
153
            this.btnEnd.DialogResult = System.Windows.Forms.DialogResult.Cancel;
154
            this.btnEnd.ForeColor = System.Drawing.Color.White;
155
            this.btnEnd.Location = new System.Drawing.Point(457, 177);
156
            this.btnEnd.Margin = new System.Windows.Forms.Padding(4);
157
            this.btnEnd.Name = "btnEnd";
158
            this.btnEnd.Size = new System.Drawing.Size(120, 30);
159
            this.btnEnd.TabIndex = 12;
160
            this.btnEnd.Text = "終 了";
161
            this.btnEnd.UseVisualStyleBackColor = false;
162
            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
163
            // 
164
            // FrmRowDetail
165
            // 
166
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
167
            this.BackColor = System.Drawing.Color.Black;
168
            this.CancelButton = this.btnEnd;
169
            this.ClientSize = new System.Drawing.Size(584, 211);
170
            this.Controls.Add(this.btnDataEntry);
171
            this.Controls.Add(this.btnEnd);
172
            this.Controls.Add(this.groupBoxEx2);
173
            this.Controls.Add(this.groupBoxEx1);
174
            this.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
175
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
176
            this.Margin = new System.Windows.Forms.Padding(4);
177
            this.MaximizeBox = false;
178
            this.MinimizeBox = false;
179
            this.Name = "FrmRowDetail";
180
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
181
            this.Text = "請求明細編集";
182
            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmRowDetail_FormClosing);
183
            this.Load += new System.EventHandler(this.FrmRowDetail_Load);
184
            this.groupBoxEx1.ResumeLayout(false);
185
            this.groupBoxEx2.ResumeLayout(false);
186
            this.groupBoxEx2.PerformLayout();
187
            this.ResumeLayout(false);
188

  
189
        }
190

  
191
        #endregion
192

  
193
        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBoxEx1;
194
        private System.Windows.Forms.Label label1;
195
        private System.Windows.Forms.Label label2;
196
        private System.Windows.Forms.Label label4;
197
        private System.Windows.Forms.Label label3;
198
        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBoxEx2;
199
        private System.Windows.Forms.TextBox textBox1;
200
        private System.Windows.Forms.Button btnDataEntry;
201
        private System.Windows.Forms.Button btnEnd;
202

  
203
    }
204
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmRowDetail.cs
1
using System;
2
using System.Collections.Generic;
3
using System.ComponentModel;
4
using System.Data;
5
using System.Drawing;
6
using System.Linq;
7
using System.Text;
8
using System.Threading.Tasks;
9
using System.Windows.Forms;
10
using ProcessManagement.DataModel;
11
using ProcessManagement.Common;
12
using ProcessManagement.Forms.SubForms;
13
using System.Collections;
14
using ProcessManagement.DB.IOAccess;
15

  
16
using System.Diagnostics;
17
using System.Threading;
18
using System.Text.RegularExpressions;
19

  
20
using log4net;
21
using log4net.Appender;
22
using log4net.Repository.Hierarchy;
23

  
24
using ProcessManagement.DB.Core;
25
using ProcessManagement.Forms.Master;
26
using ProcessManagement.Forms.CustomControls;
27
using ProcessManagement.Forms.ControlsAction;
28

  
29
namespace ProcessManagement.Forms.DataEntry
30
{
31
    public partial class FrmRowDetail : Form
32
    {
33
        #region ログ使用定義
34
        //log4netログを使用する
35
        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
36
        #endregion
37

  
38
        #region 定数
39

  
40
        #endregion
41

  
42
        #region 変数
43
        
44
        /// <summary>
45
        /// 現場名称
46
        /// </summary>
47
        private string m_title01 = string.Empty;
48
        /// <summary>
49
        /// 業者名称
50
        /// </summary>
51
        private string m_title02 = string.Empty;
52
        /// <summary>
53
        /// 編集文字列
54
        /// </summary>
55
        private string m_EditString = string.Empty;
56

  
57
        /// <summary>
58
        /// 終了ステータス
59
        /// </summary>
60
        private DialogResult m_ResultVal = DialogResult.Cancel;
61
        #endregion
62

  
63
        #region プロパティ
64
        /// <summary>
65
        /// 現場名称
66
        /// </summary>
67
        public string title01
68
        {
69
            get { return m_title01; }
70
            set { m_title01 = value; }
71
        }
72
        /// <summary>
73
        /// 業者名称
74
        /// </summary>
75
        public string title02
76
        {
77
            get { return m_title02; }
78
            set { m_title02 = value; }
79
        }
80
        /// <summary>
81
        /// 編集文字列
82
        /// </summary>
83
        public string EditString
84
        {
85
            get { return m_EditString; }
86
            set { m_EditString = value; }
87
        }
88

  
89
        /// <summary>
90
        /// 終了ステータス
91
        /// </summary>
92
        public DialogResult ResultVal
93
        {
94
            get { return m_ResultVal; }
95
            set { m_ResultVal = value; }
96
        }
97
        #endregion
98

  
99
        #region コンストラクタ
100
        public FrmRowDetail()
101
        {
102
            InitializeComponent();
103
        }
104
        #endregion
105

  
106
        #region フォームロード
107
        /// <summary>
108
        /// フォームロード
109
        /// </summary>
110
        /// <param name="sender"></param>
111
        /// <param name="e"></param>
112
        private void FrmRowDetail_Load(object sender, EventArgs e)
113
        {
114
            try
115
            {
116
                // パラメータ値セット
117
                SetParameter();
118
            }
119
            catch (System.Exception ex)
120
            {
121
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
122
            }
123
        }
124
        #endregion
125

  
126
        #region フォームクロージング
127
        /// <summary>
128
        /// フォームクロージング
129
        /// </summary>
130
        /// <param name="sender"></param>
131
        /// <param name="e"></param>
132
        private void FrmRowDetail_FormClosing(object sender, FormClosingEventArgs e)
133
        {
134
            try
135
            {
136
            }
137
            catch (System.Exception ex)
138
            {
139
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
140
            }
141
        }
142
        #endregion
143

  
144
        #region 登録ボタン
145
        /// <summary>
146
        /// 登録ボタン
147
        /// </summary>
148
        /// <param name="sender"></param>
149
        /// <param name="e"></param>
150
        private void btnDataEntry_Click(object sender, EventArgs e)
151
        {
152
            if (MessageBox.Show("明細内容を反映します、よろしいでしょうか。",
153
                                "登録確認",
154
                                MessageBoxButtons.OKCancel,
155
                                MessageBoxIcon.Question) == DialogResult.Cancel) return;
156

  
157
            GetParameter();
158
            m_ResultVal = DialogResult.OK;
159
            this.Close();
160
        }
161
        #endregion
162

  
163
        #region 終了ボタン
164
        /// <summary>
165
        /// 終了ボタン
166
        /// </summary>
167
        /// <param name="sender"></param>
168
        /// <param name="e"></param>
169
        private void btnEnd_Click(object sender, EventArgs e)
170
        {
171
            m_ResultVal = DialogResult.Cancel;
172
            this.Close();
173
        }
174
        #endregion
175

  
176
        #region パラメータ値セット
177
        /// <summary>
178
        /// パラメータ値セット
179
        /// </summary>
180
        private void SetParameter()
181
        {
182
            try
183
            {
184
                label3.Text = m_title01;
185
                label4.Text = m_title02;
186
                textBox1.Text = m_EditString;
187
            }
188
            catch (System.Exception ex)
189
            {
190
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
191
            }
192
        }
193
        #endregion
194

  
195
        #region パラメータ値取得
196
        /// <summary>
197
        /// パラメータ値取得
198
        /// </summary>
199
        private void GetParameter()
200
        {
201
            try
202
            {
203
                m_title01 = label3.Text;
204
                m_title02 = label4.Text;
205
                m_EditString = textBox1.Text;
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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