プロジェクト

全般

プロフィール

リビジョン 411

堀内6年以上前に追加

CommonDefine:データ削除フラグ(DataDeleteDef)変更における修正
担当者マスタ:所属部署登録修正・退職者自動削除機能追加
部署経費一覧:退職者判定を修正
担当者コンボボックス対象検索SQL修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
333 333
        /// <summary>
334 334
        /// データ削除フラグ
335 335
        /// </summary>
336
        public enum DataRowDeleteDef
336
        public enum DataDeleteDef
337 337
        {
338 338
            /// <summary>
339 339
            /// 存在中
trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
3669 3669
                    strSQL.Append(" WHERE");
3670 3670

  
3671 3671
                    // 削除されていないもの
3672
                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
3672
                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
3673 3673
                    DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false);
3674 3674

  
3675 3675
                    strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
......
3712 3712
        /// </summary>
3713 3713
        /// <param name="strSQL"></param>
3714 3714
        /// <param name="nTargetYear"></param>
3715
        public static void CreateManCombBoxSQL(ref StringBuilder strSQL, int nTargetYear, int nDepCode = 0, int nLEDGERFLG = -1)
3715
        public static void CreateManCombBoxSQL(ref StringBuilder strSQL, int nTargetYear, int nDepCode = 0)
3716 3716
        {
3717 3717
            try
3718 3718
            {
......
3733 3733

  
3734 3734
                if (nDepCode > 0) strSQL.AppendFormat(" AND (B.DEPARTMENTCODE = {0})", nDepCode);
3735 3735

  
3736
                if (nLEDGERFLG == -1) strSQL.AppendFormat(" AND A.LEDGERFLG = {0}", (int)PersonInChargeMaster.LedgerDivNoDef.CalcTarget);
3737
                else if (nLEDGERFLG > -1) strSQL.AppendFormat(" AND A.LEDGERFLG = {0}", nLEDGERFLG);
3738

  
3739 3736
                // 今期のデータかどうかを判定する
3740 3737
                string FieldName = string.Empty;
3741 3738
                if (CommonMotions.BasePeriodYear())
......
3877 3874
                    strSQL.Append(" On C.DepartmentCode = B.DEPARTMENTCODE");
3878 3875

  
3879 3876
                    strSQL.AppendFormat(" WHERE A.DIVISIONCODE = {0}", (int)DivisionMaster.DivisionMasterCodeDef.ConstructionExpenses);
3880
                    strSQL.AppendFormat(" AND A.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
3877
                    strSQL.AppendFormat(" AND A.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
3881 3878

  
3882 3879
                    strSQL.Append(" ORDER BY A.DISPLAYORDER, C.DISPLAYORDER");
3883 3880
                }
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
86 86
            {
87 87
                // 本日の初回起動がされている場合は処理しない
88 88
                if (!ExecuteCheck(ref m_lastsessionDate)) return;
89
                
89

  
90 90
                // 更新済みにするために日付の更新
91 91
                if (!(ProcessFlg = UpDateTargetDate(DateTime.Now))) return;
92 92

  
......
98 98
                if (!(ProcessFlg = MaterialLimitCheck(m_lastsessionDate))) return;
99 99

  
100 100
                // 日付の期限チェックを行う
101
                if(!(ProcessFlg = SubmittedDateCheck(m_lastsessionDate))) return;
101
                if (!(ProcessFlg = SubmittedDateCheck(m_lastsessionDate))) return;
102 102

  
103 103
                // 見積有効期限切れを非受注へ移行する
104 104
                if (!(ProcessFlg = ChangeNonOrdersData())) return;
......
106 106
                // 開始期日がきた給与を適用する
107 107
                if (!(ProcessFlg = SetNewPayrollCheck())) return;
108 108

  
109
                // 退職者を削除にする
110
                if (!SetRetireeFlg()) return;
111

  
109 112
                // 工事詳細台帳の給与を加算する
110 113
                //if (!(ProcessFlg = CalculateDaysSalary(m_lastsessionDate))) return;
111 114

  
......
154 157

  
155 158
                // 日付比較
156 159
                if (DateTime.Today == recordRec.TargetDate.Date) return false;
157
                
160

  
158 161
                return true;
159 162
            }
160 163
            catch (Exception ex)
......
270 273
                if (Target.Date == CriteriaDate.Date)
271 274
                {
272 275
                    TermMasterData.CheckSchdule = (int)TermMaster.TermDateCheckTimingDef.CheckSchdule1;
273
                    TermMasterData.TermDays     = CommonDefine.MaterualStatusCheckList[0].Value;
274
                    TermMasterData.SendTitle    = CommonDefine.MaterualLimitItem[0, 0];
275
                    TermMasterData.SendMessage  = CommonDefine.MaterualLimitItem[0, 1];
276
                    TermMasterData.BackColor    = CommonDefine.MaterualLimitItem[0, 2];
277
                    TermMasterData.ForeColor    = CommonDefine.MaterualLimitItem[0, 3];
276
                    TermMasterData.TermDays = CommonDefine.MaterualStatusCheckList[0].Value;
277
                    TermMasterData.SendTitle = CommonDefine.MaterualLimitItem[0, 0];
278
                    TermMasterData.SendMessage = CommonDefine.MaterualLimitItem[0, 1];
279
                    TermMasterData.BackColor = CommonDefine.MaterualLimitItem[0, 2];
280
                    TermMasterData.ForeColor = CommonDefine.MaterualLimitItem[0, 3];
278 281
                }
279 282
                // 後日以降継続のチェック 今日を基準に経過日(1日)が過ぎているか比較する
280 283
                else if (Target.AddDays(1).Date <= CriteriaDate.Date)
281 284
                {
282 285
                    TermMasterData.CheckSchdule = (int)TermMaster.TermDateCheckTimingDef.CheckSchdule3;
283
                    TermMasterData.TermDays     = CommonDefine.MaterualStatusCheckList[1].Value;
284
                    TermMasterData.SendTitle    = CommonDefine.MaterualLimitItem[1, 0];
285
                    TermMasterData.SendMessage  = CommonDefine.MaterualLimitItem[1, 1];
286
                    TermMasterData.BackColor    = CommonDefine.MaterualLimitItem[1, 2];
287
                    TermMasterData.ForeColor    = CommonDefine.MaterualLimitItem[1, 3];
286
                    TermMasterData.TermDays = CommonDefine.MaterualStatusCheckList[1].Value;
287
                    TermMasterData.SendTitle = CommonDefine.MaterualLimitItem[1, 0];
288
                    TermMasterData.SendMessage = CommonDefine.MaterualLimitItem[1, 1];
289
                    TermMasterData.BackColor = CommonDefine.MaterualLimitItem[1, 2];
290
                    TermMasterData.ForeColor = CommonDefine.MaterualLimitItem[1, 3];
288 291
                }
289 292

  
290 293
                TermRec = TermMasterData;
......
578 581
                for (int ix = 0; ix < diffDays; ix++)
579 582
                {
580 583
                    DateTime CriteriaDate = StartDate.AddDays((ix + 1));
581
                    foreach(object[] objRec in cbiList)
584
                    foreach (object[] objRec in cbiList)
582 585
                    {
583 586
                        // 工事情報データセット
584 587
                        cbiDB.Reader2Struct(objRec, ref wrkBaseRec);
......
862 865
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = P.SALESPERSONCODE");
863 866
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = P.CONSTRUCTIONPERSONCODE");
864 867
                strSQL.Append(", CONSTRUCTIONBASEINFODETAIL A");
865
                strSQL.AppendFormat(" WHERE P.CONSTRUCTIONCODE = {0}",wrkRec.ConstructionCode);
868
                strSQL.AppendFormat(" WHERE P.CONSTRUCTIONCODE = {0}", wrkRec.ConstructionCode);
866 869
                strSQL.AppendFormat(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
867 870
                ArrayList arList = new ArrayList();
868 871
                if (!cbiDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
869
                
872

  
870 873
                string DetailString = string.Empty;
871 874
                int SalesPersonCode = 0;
872 875
                string SalesPersonName = string.Empty;
......
1145 1148

  
1146 1149
                // 更新処理
1147 1150
                PersonDB.connect(); PersonDB.beginTran();
1148
                foreach(object[] objRec in arList)
1151
                foreach (object[] objRec in arList)
1149 1152
                {
1150 1153
                    // 月給与更新
1151 1154
                    if (!PersonDB.UpdateFeild(CommonMotions.cnvInt(objRec[0]),
......
1181 1184
        }
1182 1185
        #endregion
1183 1186

  
1187
        #region 退職者フラグセット
1188
        /// <summary>
1189
        /// 退職者フラグセット
1190
        /// </summary>
1191
        /// <returns></returns>
1192
        private bool SetRetireeFlg()
1193
        {
1194
            IOMPersonInCharge ManDB = new IOMPersonInCharge();
1195
            try
1196
            {
1197
                StringBuilder strSQL = new StringBuilder();
1198
                // 就業終了日が今日より小さくて削除されていないデータを検索する
1199
                strSQL.Append("Select * From personinchargemaster");
1200
                strSQL.AppendFormat(" Where (DATE(EndDate) != DATE('{0}')", DateTime.MinValue.ToShortDateString());
1201
                strSQL.Append("       And DATE(EndDate) < DATE(NOW()))");
1202
                strSQL.AppendFormat(" And DeleteFlg = {0}",(int)CommonDefine.DataDeleteDef.Exists);
1203

  
1204
                ArrayList ListData = new ArrayList();
1205
                if (!ManDB.ExecuteReader(strSQL.ToString(), ref ListData)) return false;
1206

  
1207
                bool bRet = true;
1208
                ManDB.connect(); ManDB.beginTran();
1209
                PersonInChargeMaster ManRec = new PersonInChargeMaster();
1210
                foreach(object[] objRec in ListData)
1211
                {
1212
                    // 削除フラグをONにする。
1213
                    ManDB.Reader2Struct(objRec, ref ManRec);
1214
                    if (!ManDB.UpdateFeild(ManRec.PersonCode
1215
                                            , (int)IOMPersonInCharge.ColumnCnt.DeleteFlg
1216
                                            , (int)CommonDefine.DataDeleteDef.Deleted
1217
                                            , false))
1218
                    {
1219
                        bRet = false;
1220
                        ManDB.rollback();
1221
                    }
1222
                }
1223
                ManDB.commit();
1224

  
1225
                return bRet;
1226
            }
1227
            catch (Exception ex)
1228
            {
1229
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1230
                return false;
1231
            }
1232
            finally
1233
            {
1234
                ManDB.close(); ManDB = null;
1235
            }
1236
        }
1237
        #endregion
1238

  
1184 1239
        #region 管理マスタ:営業期・工事年度変更
1185 1240
        /// <summary>
1186 1241
        /// 管理マスタ:営業期・工事年度変更
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMDivision.cs
303 303
                if (workList.Count == 0) return true;
304 304

  
305 305
                // 削除フラグ
306
                workList[0].DeleteFlg = (int)CommonDefine.DataRowDeleteDef.Deleted;
306
                workList[0].DeleteFlg = (int)CommonDefine.DataDeleteDef.Deleted;
307 307
                // データ更新
308 308
                if (!UpdateAction(strWhere.ToString(), workList[0], bConnect))
309 309
                {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
2269 2269
                // ?S????}?X?^??????????
2270 2270
                int nTargetCount = GetTargetYear();
2271 2271
                StringBuilder strSQL = new StringBuilder();
2272
                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, 0, -2);
2272
                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, 0);
2273 2273

  
2274 2274
                // ?S????}?X?^???
2275 2275
                ArrayList workList = new ArrayList();
......
2490 2490
                    strSQL.Append(" WHERE");
2491 2491

  
2492 2492
                    // ???????????????
2493
                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
2493
                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
2494 2494
                    DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false);
2495 2495

  
2496 2496
                    strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
......
2601 2601
            {
2602 2602
                // ?????}?X?^????
2603 2603
                StringBuilder strSQL = new StringBuilder();
2604
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
2604
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
2605 2605
                // ?????}?X?^???
2606 2606
                if (!dmDB.SelectAction(strSQL.ToString(), ref dmList)) return;
2607 2607
                // ?f?[?^?\??
......
2617 2617
                DataList.Add(new KeyValuePair<int, string>(0, ""));
2618 2618
                // ?S????}?X?^????
2619 2619
                strSQL.Clear();
2620
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC, PersonCode ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
2620
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC, PersonCode ASC", (int)CommonDefine.DataDeleteDef.Exists);
2621 2621
                // ?S????}?X?^???
2622 2622
                if (!picDB.SelectAction(strSQL.ToString(), ref workList)) return;
2623 2623
                // ?f?[?^?\??
......
2657 2657
                // Value????Key??????
2658 2658
                StringBuilder strSQL = new StringBuilder();
2659 2659
                strSQL.Append(dvDB.CreatePrimarykeyString((int)DivisionMaster.DivisionMasterCodeDef.OrderDivision));
2660
                strSQL.AppendFormat(" And DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataRowDeleteDef.Exists);
2660
                strSQL.AppendFormat(" And DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataDeleteDef.Exists);
2661 2661
                if (!dvDB.SelectAction(strSQL.ToString(), ref bvList)) return;
2662 2662
                if (bvList.Count == 0) return;
2663 2663

  
......
2704 2704
                // ??????}?X?^??????????
2705 2705
                StringBuilder strSQL = new StringBuilder();
2706 2706
                strSQL.Append(orDB.CreatePrimarykeyString(idivision));
2707
                strSQL.AppendFormat(" And DeleteFlg = {0} Order By DisplayOrder  ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
2707
                strSQL.AppendFormat(" And DeleteFlg = {0} Order By DisplayOrder  ASC", (int)CommonDefine.DataDeleteDef.Exists);
2708 2708

  
2709 2709
                // ??????}?X?^???
2710 2710
                if (!orDB.SelectAction(strSQL.ToString(), ref workList)) return false;
......
2820 2820
                List<ConstructionTypeMaster> typeList = new List<ConstructionTypeMaster>();
2821 2821

  
2822 2822
                StringBuilder strSQL = new StringBuilder();
2823
                strSQL.AppendFormat(" WHERE DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataRowDeleteDef.Exists);
2823
                strSQL.AppendFormat(" WHERE DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataDeleteDef.Exists);
2824 2824

  
2825 2825
                if (!TypeDB.SelectAction(strSQL.ToString(), ref typeList)) return;
2826 2826
                if (typeList.Count == 0) return;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistAuxiliary.cs
706 706
                int DivisionCode = (int)DivisionMaster.DivisionMasterCodeDef.OrderDivision;
707 707
                StringBuilder strSQL = new StringBuilder();
708 708
                strSQL.Append(dvDB.CreatePrimarykeyString(DivisionCode));
709
                strSQL.AppendFormat(" And DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataRowDeleteDef.Exists);
709
                strSQL.AppendFormat(" And DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataDeleteDef.Exists);
710 710
                if (!dvDB.SelectAction(strSQL.ToString(), ref bvList)) return;
711 711
                if (bvList.Count == 0) return;
712 712

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.cs
326 326
                    strSQL.Append(" AND");
327 327
                }
328 328
                strSQL.AppendFormat(" A.EMPLOYEECLASSFLG = {0}", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular);
329
                strSQL.AppendFormat(" AND A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
329
                strSQL.AppendFormat(" AND A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
330 330
                strSQL.Append(" ORDER BY A.DISPLAYORDER ASC");
331 331
            }
332 332
            catch (System.Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
1182 1182
                strSQL.Append(" Else DATE(EndDate) End As EndDate");
1183 1183
                strSQL.Append(", EmployeeClassFlg");
1184 1184
                strSQL.Append(", LedgerFlg");
1185
                strSQL.Append(", DeleteFlg");
1185 1186
                strSQL.Append(" From PERSONINCHARGEMASTER) AS C");
1186 1187
                strSQL.Append(" ON C.PersonCode = ChgDep.PersonCode");
1187 1188
                strSQL.AppendFormat(" And C.LedgerFlg = {0}", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular);
......
1236 1237
                    // ????E??E??
1237 1238
                    if (bExistsFlg)
1238 1239
                    {   // ?????????S????
1239
                        strSQL.AppendFormat(" AND (DATE('{0}') < DATE(C.EndDate)", strdtEnd);
1240
                        strSQL.AppendFormat(" OR DATE('{0}') = DATE(C.ENDDATE))", strdtMax);
1240
                        strSQL.AppendFormat(" AND ((DATE('{0}') <= DATE(C.EndDate)", strdtEnd);
1241
                        strSQL.AppendFormat("  OR DATE('{0}') = DATE(C.ENDDATE))", strdtMax);
1242
                        strSQL.AppendFormat(" OR (C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
1243
                        strSQL.AppendFormat("  AND DATE(NOW()) <= DATE(C.ENDDATE)))", strdtMax);
1241 1244
                    }
1242 1245
                    else
1243 1246
                    {   // ???????????S????
1244
                        strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(C.EndDate)", strdtStart);
1245
                        strSQL.AppendFormat(" AND DATE(C.EndDate) <= DATE('{0}'))", strdtEnd);
1247
                        strSQL.AppendFormat(" AND ((C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
1248
                        strSQL.AppendFormat("  AND DATE('{0}') <= DATE(C.EndDate)", strdtStart);
1249
                        strSQL.AppendFormat("  AND DATE(C.EndDate) <= DATE('{0}'))", strdtEnd);
1250
                        strSQL.AppendFormat(" OR (C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
1251
                        strSQL.AppendFormat("  AND DATE(C.ENDDATE) < DATE(NOW())))", strdtMax);
1246 1252
                    }
1247 1253

  
1248 1254
                    strSQL.Append(" GROUP BY D.DepartmentCode, C.PersonCode, F.NameCode");
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs
422 422

  
423 423
                    strSQL.Append("         Group By A.DepartmentCode) As C");
424 424
                    strSQL.Append("     On C.DepartmentCode = B.DepartmentCode");
425
                    strSQL.AppendFormat(" Where B.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
425
                    strSQL.AppendFormat(" Where B.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
426 426
                    strSQL.Append(" Order By B.DisplayOrder");
427 427
                }
428 428
                else
......
978 978
                    strSQL.Append(" WHERE");
979 979

  
980 980
                    // ???????????????
981
                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
981
                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
982 982
                    DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false);
983 983

  
984 984
                    strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PersonApprovalList/FrmPersonAppListAuxiliary.cs
227 227
                strSQL.Append(" LEFT JOIN ATTENDANCEDAILYDATA B ON B.PERSONCODE = A.PERSONCODE");
228 228
                strSQL.Append(" LEFT JOIN TRANCEPORTDAILYDATA C ON C.PERSONCODE = A.PERSONCODE");
229 229
                strSQL.AppendFormat(" WHERE A.EMPLOYEECLASSFLG = {0}", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular);
230
                strSQL.AppendFormat(" AND A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
230
                strSQL.AppendFormat(" AND A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
231 231
                strSQL.Append(" ORDER BY A.DISPLAYORDER");
232 232
            }
233 233
            catch (Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
2968 2968
            {
2969 2969
                // 担当者マスタを検索する
2970 2970
                StringBuilder strSQL = new StringBuilder();
2971
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
2971
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
2972 2972

  
2973 2973
                // 担当者マスタ読込
2974 2974
                if (!picDB.SelectAction(strSQL.ToString(), ref workList)) return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs
117 117
                /////////////////////////////////////////////////////////////////////////////
118 118

  
119 119
                sql.Append("WHERE ");
120
                sql.AppendFormat("DEPM.DeleteFlg = {0} ", (int)CommonDefine.DataRowDeleteDef.Exists);  // ?????}?X?^?D???t???O = 0
120
                sql.AppendFormat("DEPM.DeleteFlg = {0} ", (int)CommonDefine.DataDeleteDef.Exists);  // ?????}?X?^?D???t???O = 0
121 121
                sql.Append("ORDER BY  ");
122 122
                sql.Append("DEPM.DisplayOrder ASC");                                            // ?????}?X?^?D?\?????i?????j
123 123

  
......
191 191
                sql.Append("FROM ");
192 192
                sql.Append("personinchargemaster PERIM ");                              // ?S????}?X?^
193 193
                sql.Append("WHERE ");
194
                sql.AppendFormat("PERIM.DeleteFlg = {0} ", (int)CommonDefine.DataRowDeleteDef.Exists); // ?S????}?X?^?D???t???O = 0
194
                sql.AppendFormat("PERIM.DeleteFlg = {0} ", (int)CommonDefine.DataDeleteDef.Exists); // ?S????}?X?^?D???t???O = 0
195 195

  
196 196
                /////////////////////////////////////////////////////////////////////////////
197 197
                // ????????(???I)START
......
339 339
                sql.Append("WHERE ");
340 340
                sql.AppendFormat("DIVI.DivisionCode = {0} "                             // ???}?X?^?D???R?[?h
341 341
                                , (int)DivisionMaster.DivisionMasterCodeDef.OrderDivision);
342
                sql.AppendFormat("And DIVI.DeleteFlg = {0} ", (int)CommonDefine.DataRowDeleteDef.Exists);  // ???}?X?^?D???t???O = 0
342
                sql.AppendFormat("And DIVI.DeleteFlg = {0} ", (int)CommonDefine.DataDeleteDef.Exists);  // ???}?X?^?D???t???O = 0
343 343

  
344 344
                /////////////////////////////////////////////////////////////////////////////
345 345
                // ????????(???I)START
......
432 432
                sql.Append("FROM ");
433 433
                sql.Append("orderersmaster As Orm ");                                   // ??????}?X?^
434 434
                sql.Append("WHERE ");
435
                sql.AppendFormat("Orm.DeleteFlg = {0} ", (int)CommonDefine.DataRowDeleteDef.Exists);   // ?????}?X?^?D???t???O = 0
435
                sql.AppendFormat("Orm.DeleteFlg = {0} ", (int)CommonDefine.DataDeleteDef.Exists);   // ?????}?X?^?D???t???O = 0
436 436

  
437 437
                /////////////////////////////////////////////////////////////////////////////
438 438
                // ????????(???I)START
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalDispAux.cs
140 140
            {
141 141
                DataGridViewEX dgv = dgvProcess;
142 142
                StringBuilder strSQL = new StringBuilder();
143
                strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
143
                strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
144 144
                strSQL.Append(" Order by DisplayOrder");
145 145
                List<DepartmentMaster> DepList = new List<DepartmentMaster>();
146 146
                if (!DepDB.SelectAction(strSQL.ToString(), ref DepList)) return;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalRoute.cs
583 583
                strcmd.Append(", A.PersonName");
584 584
                strcmd.Append(", A.DisplayString");
585 585
                strcmd.Append(" FROM PersonInChargeMaster A, DepartmentMaster B");
586
                strcmd.AppendFormat(" Where A.DeleteFlg = {0} And A.DepartmentCode = B.DepartmentCode", (int)CommonDefine.DataRowDeleteDef.Exists);
586
                strcmd.AppendFormat(" Where A.DeleteFlg = {0} And A.DepartmentCode = B.DepartmentCode", (int)CommonDefine.DataDeleteDef.Exists);
587 587
                strcmd.Append(" Order By A.EmployeeClassFlg ASC, B.DisplayOrder ASC, A.DisplayOrder ASC");
588 588
                ArrayList arData = new ArrayList();
589 589
                if (!perDB.ExecuteReader(strcmd.ToString(), ref arData)) return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/BudgetItem/FrmBudgetItemAux.cs
697 697
            {
698 698
                // 構成項目マスタを検索する
699 699
                StringBuilder strSQL = new StringBuilder();
700
                strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
700
                strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
701 701
                strSQL.Append(" Order By DisplayOrder Asc, ComponentCode Asc");
702 702

  
703 703
                // 構成項目マスタ読込
......
758 758
                strSQL.Append(" On B.ItemCode = A.ItemCode");
759 759
                strSQL.Append(" Where");
760 760
                strSQL.AppendFormat(" A.ComponentCode = {0}", nCompCode);
761
                strSQL.AppendFormat(" And B.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
761
                strSQL.AppendFormat(" And B.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
762 762
                strSQL.Append(" Order By B.DisplayOrder");
763 763

  
764 764
                // 工種マスタ読込
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/CategoryName/FrmCategoryNameMaster.cs
536 536

  
537 537
                // SQL作成
538 538
                StringBuilder strSQL = new StringBuilder();
539
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
539
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
540 540
                // 表示順マスタ取得
541 541
                if (!cmDB.SelectAction(strSQL.ToString(), ref cm)) return;
542 542

  
......
763 763
                StringBuilder strSQL = new StringBuilder();
764 764
                strSQL.AppendFormat(" Where NameCode = {0} And DeleteFlg = {1} Order By DisplayOrder ASC"
765 765
                                                , CommonMotions.cnvInt(cmbDisplayType.SelectedValue.ToString())
766
                                                , (int)CommonDefine.DataRowDeleteDef.Exists);
766
                                                , (int)CommonDefine.DataDeleteDef.Exists);
767 767
                // 表示順マスタ取得
768 768
                if (!cmDB.SelectAction(strSQL.ToString(), ref cm)) return false;
769 769

  
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/CompTypeLink/FrmCompTypeLink.cs
800 800
                List<ConstructionTypeMaster> wrk = new List<ConstructionTypeMaster>();
801 801
                // 作業名称取得SQL
802 802
                StringBuilder strSql = new StringBuilder();
803
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
803
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
804 804

  
805 805
                // グリッドの行を0に戻す
806 806
                dgvTypeList.Rows.Clear();
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Component/FrmComponent.cs
897 897
                List<ComponentMaster> wrk = new List<ComponentMaster>();
898 898
                // 作業名称取得SQL
899 899
                StringBuilder strSql = new StringBuilder();
900
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
900
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
901 901

  
902 902
                // グリッドの行を0に戻す
903 903
                dgvWorkList.Rows.Clear();
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ComponentLink/FrmComponentLink.cs
785 785
                strSql.Append("           From componentlinkmaster As BB");
786 786
                strSql.Append("           Group By BB.ComponentCode) As B");
787 787
                strSql.Append(" On B.ComponentCode = A.ComponentCode");
788
                strSql.AppendFormat(" Where A.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
788
                strSql.AppendFormat(" Where A.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
789 789
                strSql.Append(" Order By A.DisplayOrder ASC");
790 790

  
791 791
                // グリッドの行を0に戻す
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionItem/FrmConstructionItem.cs
857 857
                List<ConstructionItemMaster> wrk = new List<ConstructionItemMaster>();
858 858
                // 作業名称取得SQL
859 859
                StringBuilder strSql = new StringBuilder();
860
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
860
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
861 861

  
862 862
                // グリッドの行を0に戻す
863 863
                dgvWorkList.Rows.Clear();
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionSpec/FrmConstructionSpec.cs
658 658
                StringBuilder strSql = new StringBuilder();
659 659
                strSql.AppendFormat(" Where ItemCode = {0} And DeleteFlg = {1} Order By DisplayOrder ASC"
660 660
                                    , m_ItemCode
661
                                    , (int)CommonDefine.DataRowDeleteDef.Exists);
661
                                    , (int)CommonDefine.DataDeleteDef.Exists);
662 662

  
663 663
                // 作業名称取得
664 664
                if (!csDB.SelectAction(strSql.ToString(), ref wrk)) return;
......
1017 1017
                // 作業名称取得SQL
1018 1018
                StringBuilder strSql = new StringBuilder();
1019 1019
                strSql.AppendFormat(" Where SubItemsFlg = {0}", (int)ConstructionItemMaster.SubitemsFlgDef.Exists);
1020
                strSql.AppendFormat(" And DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
1020
                strSql.AppendFormat(" And DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
1021 1021
                strSql.Append(" Order By DisplayOrder ASC");
1022 1022

  
1023 1023
                // グリッドの行を0に戻す
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.cs
941 941
                List<ConstructionTypeMaster> wrk = new List<ConstructionTypeMaster>();
942 942
                // 作業名称取得SQL
943 943
                StringBuilder strSql = new StringBuilder();
944
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
944
                strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
945 945

  
946 946
                // グリッドの行を0に戻す
947 947
                dgvWorkList.Rows.Clear();
......
1115 1115
                strSQL.Append("SELECT A.NAMECODE, A.NAMESTRING, B.TYPECODE, B.EXPENSESPERIOD, B.EXPENSESRAITO");
1116 1116
                strSQL.Append(" FROM DIVISIONMASTER A");
1117 1117
                strSQL.AppendFormat(" LEFT JOIN TYPEEXPENSESMASTER B ON B.TYPECODE = {0} AND B.NAMECODE = A.NAMECODE AND B.DELETEFLG = {1}"
1118
                                    , m_TypeCode, (int)CommonDefine.DataRowDeleteDef.Exists);
1118
                                    , m_TypeCode, (int)CommonDefine.DataDeleteDef.Exists);
1119 1119
                strSQL.AppendFormat(" WHERE A.DIVISIONCODE = {0}", DivCode);
1120
                strSQL.AppendFormat(" AND A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
1120
                strSQL.AppendFormat(" AND A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
1121 1121
                strSQL.Append(" ORDER BY A.DISPLAYORDER");
1122 1122
                
1123 1123
                if (!TypeExDB.ExecuteReader(strSQL.ToString(), ref wrklist)) return;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartmentAux.cs
469 469
                {
470 470
                    if (!dmDB.UpdateFeild(DepCodeKey
471 471
                                            , (int)IOMDepartment.NameColumn.DeleteFlg
472
                                            , (int)CommonDefine.DataRowDeleteDef.Deleted
472
                                            , (int)CommonDefine.DataDeleteDef.Deleted
473 473
                                            , false))
474 474
                    {
475 475
                        dmDB.rollback();
......
487 487
                    }
488 488
                    if (!expDB.UpdateFeild(DepCodeKey, 0, 0
489 489
                                            , (int)IOMDepartmentExpenses.NameColumn.DeleteFlg
490
                                            , (int)CommonDefine.DataRowDeleteDef.Deleted
490
                                            , (int)CommonDefine.DataDeleteDef.Deleted
491 491
                                            , false))
492 492
                    {
493 493
                        dmDB.rollback();
......
793 793

  
794 794
                // SQL作成
795 795
                StringBuilder strSQL = new StringBuilder();
796
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
796
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
797 797
                List<DepartmentMaster> dmList = new List<DepartmentMaster>();
798 798
                // 部署取得
799 799
                if (!dmDB.SelectAction(strSQL.ToString(), ref dmList)) return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Division/FrmDivisionMaster.cs
385 385
                int nNameCode = CommonMotions.cnvInt(dgvMaster.CurrentRow.Cells[(int)DispColumn.NameCode].Value);
386 386
                if (!nmDB.UpdateFeild(m_DivisionCode, nNameCode
387 387
                                    , (int)IOMDivision.NameColumn.DeleteFlg
388
                                    , (int)CommonDefine.DataRowDeleteDef.Deleted
388
                                    , (int)CommonDefine.DataDeleteDef.Deleted
389 389
                                    , false))
390 390
                {
391 391
                    nmDB.rollback();
......
398 398
                {
399 399
                    StringBuilder strSQL = new StringBuilder();
400 400
                    strSQL.Append("Update departmentexpensesmaster");
401
                    strSQL.AppendFormat(" Set DeleteFlg = {0}, UpdateDate = NOW()", (int)CommonDefine.DataRowDeleteDef.Deleted);
401
                    strSQL.AppendFormat(" Set DeleteFlg = {0}, UpdateDate = NOW()", (int)CommonDefine.DataDeleteDef.Deleted);
402 402
                    strSQL.AppendFormat(" Where ExpensesPeriod >= {0}", CommonMotions.GetPeriodYear());
403 403
                    strSQL.AppendFormat(" And NameCode = {0}", nNameCode);
404 404
                    if (!deDB.ExecuteNonQuery(strSQL.ToString(), false))
......
815 815
                // SQL作成
816 816
                StringBuilder strSQL = new StringBuilder();
817 817
                strSQL.AppendFormat(" Where DivisionCode = {0}", m_DivisionCode);
818
                strSQL.AppendFormat(" And DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
818
                strSQL.AppendFormat(" And DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
819 819
                strSQL.Append(" Order By DisplayOrder ASC");
820 820
                // 表示順マスタ取得
821 821
                if (!cmDB.SelectAction(strSQL.ToString(), ref cm)) return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Expenses/FrmExpenses.cs
564 564
                // SQL作成
565 565
                // ValueからKeyを検索
566 566
                StringBuilder strSQL = new StringBuilder();
567
                strSQL.AppendFormat(" And DeleteFlg = 0 Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
567
                strSQL.AppendFormat(" And DeleteFlg = 0 Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
568 568
                List<ConstructionTypeMaster> cm = new List<ConstructionTypeMaster>();
569 569
                // 区分マスタ取得
570 570
                if (!cmDB.SelectAction(strSQL.ToString(), ref cm)) return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Material/MaterialItemsMaster/FrmMaterialItemsMaster.cs
750 750

  
751 751
                StringBuilder strKindWhere = new StringBuilder();
752 752
                strKindWhere.Append(m_IoMtype.CreatePrimarykeyString(CommonMotions.cnvInt(cmbTypes.SelectedValue)));
753
                strKindWhere.AppendFormat(" and DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
753
                strKindWhere.AppendFormat(" and DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
754 754
                List<MaterialKindMaster> mKindList = new List<MaterialKindMaster>();
755 755
                // 資材種類マスタ存在確認
756 756
                if (!m_IoMtype.SelectAction(strKindWhere.ToString(), ref mKindList, false))
......
1117 1117
            {
1118 1118
                List<MaterialKindMaster> itemList = new List<MaterialKindMaster>();
1119 1119
                StringBuilder strsql = new StringBuilder();
1120
                strsql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
1120
                strsql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
1121 1121
                if (!IoMt.SelectAction(strsql.ToString(), ref itemList)) return;
1122 1122
                if (itemList.Count == 0) return;
1123 1123

  
......
1167 1167
                // 資材品目抽出条件
1168 1168
                StringBuilder strSQL = new StringBuilder();
1169 1169
                strSQL.AppendFormat(" Where MaterialKindCode = {0}", strMaterialKindCode);
1170
                strSQL.AppendFormat(" And DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
1170
                strSQL.AppendFormat(" And DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
1171 1171
                if (!m_IoMt.SelectAction(strSQL.ToString(), ref mim,false)) return;
1172 1172

  
1173 1173
                // データ表示
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Material/MaterialTypesMaster/FrmMaterialTypesMaster.cs
241 241
        {            
242 242
            // クリアデータセット
243 243
            dgvMaster[(int)DispColumn.RowState, iIndex].Value = DataRowState.Unchanged;
244
            dgvMaster[(int)DispColumn.DeleteFlg, iIndex].Value = (int)CommonDefine.DataRowDeleteDef.Exists;
244
            dgvMaster[(int)DispColumn.DeleteFlg, iIndex].Value = (int)CommonDefine.DataDeleteDef.Exists;
245 245
            dgvMaster[(int)DispColumn.DisplayOrder, iIndex].Value = "";
246 246
            dgvMaster[(int)DispColumn.MaterialTypesKey, iIndex].Value = "";
247 247
            dgvMaster[(int)DispColumn.NameString, iIndex].Value = "";
......
662 662
                            && CommonMotions.cnvString(r.Cells[(int)DispColumn.NameString].Value).Length == 0) continue;
663 663

  
664 664
                    // 削除行は処理しない
665
                    if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.DeleteFlg].Value) == (int)CommonDefine.DataRowDeleteDef.Deleted) continue;
665
                    if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.DeleteFlg].Value) == (int)CommonDefine.DataDeleteDef.Deleted) continue;
666 666

  
667 667
                    //名称
668 668
                    bAns = true;
......
835 835

  
836 836
                // SQL作成
837 837
                StringBuilder strSQL = new StringBuilder();
838
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
838
                strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
839 839
                // 表示順マスタ取得
840 840
                if (!m_IoMt.SelectAction(strSQL.ToString(), ref cm, false)) return false;
841 841

  
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.cs
1082 1082
                // 発注者取得SQL
1083 1083
                StringBuilder strSql = new StringBuilder();
1084 1084
                strSql.Append(orDB.CreatePrimarykeyString(CommonMotions.cnvInt(cmbDivision.SelectedValue.ToString())));
1085
                strSql.AppendFormat(" And DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
1085
                strSql.AppendFormat(" And DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
1086 1086
                // グリッドの行を0に戻す
1087 1087
                dgvMaster.Rows.Clear();
1088 1088
                // 作業名称取得
......
1182 1182

  
1183 1183
                cmbChangeOrdersDivision.SelectedValue = odList.OrderCotegory;
1184 1184

  
1185
                if (odList.DeleteFlg != (int)CommonDefine.DataRowDeleteDef.Exists)
1185
                if (odList.DeleteFlg != (int)CommonDefine.DataDeleteDef.Exists)
1186 1186
                {
1187 1187
                    label18.Visible = true;
1188 1188
                }
......
1258 1258
                int DivisionCode = (int)DivisionMaster.DivisionMasterCodeDef.OrderDivision;
1259 1259
                StringBuilder strSQL = new StringBuilder();
1260 1260
                strSQL.Append(dvDB.CreatePrimarykeyString(DivisionCode));
1261
                strSQL.AppendFormat(" And DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataRowDeleteDef.Exists);
1261
                strSQL.AppendFormat(" And DeleteFlg = {0} ORDER BY DISPLAYORDER", (int)CommonDefine.DataDeleteDef.Exists);
1262 1262
                if (!dvDB.SelectAction(strSQL.ToString(), ref bvList)) return;
1263 1263
                if (bvList.Count == 0) return;
1264 1264

  
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs
414 414
            this.label8.Name = "label8";
415 415
            this.label8.Size = new System.Drawing.Size(139, 25);
416 416
            this.label8.TabIndex = 28;
417
            this.label8.Text = "開始年月日";
417
            this.label8.Text = "就業開始日";
418 418
            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
419 419
            // 
420 420
            // txtInput2
......
439 439
            this.label9.Name = "label9";
440 440
            this.label9.Size = new System.Drawing.Size(139, 25);
441 441
            this.label9.TabIndex = 30;
442
            this.label9.Text = "終了年月日";
442
            this.label9.Text = "就業終了日";
443 443
            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
444 444
            // 
445 445
            // txtInput3
......
659 659
            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
660 660
            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
661 661
            this.cmbDepartment.FormattingEnabled = true;
662
            this.cmbDepartment.Location = new System.Drawing.Point(148, 362);
662
            this.cmbDepartment.Location = new System.Drawing.Point(148, 360);
663 663
            this.cmbDepartment.Name = "cmbDepartment";
664 664
            this.cmbDepartment.Size = new System.Drawing.Size(429, 24);
665 665
            this.cmbDepartment.TabIndex = 8;
......
706 706
            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
707 707
            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
708 708
            this.cmbLedgerFlg.FormattingEnabled = true;
709
            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 647);
709
            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 645);
710 710
            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
711 711
            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
712 712
            this.cmbLedgerFlg.TabIndex = 13;
......
732 732
            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
733 733
            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
734 734
            this.cmbSecManage.FormattingEnabled = true;
735
            this.cmbSecManage.Location = new System.Drawing.Point(148, 682);
735
            this.cmbSecManage.Location = new System.Drawing.Point(148, 680);
736 736
            this.cmbSecManage.Name = "cmbSecManage";
737 737
            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
738 738
            this.cmbSecManage.TabIndex = 14;
......
1020 1020
            this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
1021 1021
            this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1022 1022
            this.cmbRefDepartment.FormattingEnabled = true;
1023
            this.cmbRefDepartment.Location = new System.Drawing.Point(148, 967);
1023
            this.cmbRefDepartment.Location = new System.Drawing.Point(148, 965);
1024 1024
            this.cmbRefDepartment.Name = "cmbRefDepartment";
1025 1025
            this.cmbRefDepartment.Size = new System.Drawing.Size(429, 24);
1026 1026
            this.cmbRefDepartment.TabIndex = 19;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs
848 848
                        dgvAssignment.Rows[1].Selected = true;
849 849
                    }
850 850
                }
851
                // アンマッチエラー
852
                int nSelDepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
853
                int nDspDepCode = CommonMotions.cnvInt(dgvAssignment.Rows[0].Cells[2].Value);
854
                if (nSelDepCode!= nDspDepCode)
855
                {
856
                    bRet &= false;
857
                    foreach (DataGridViewCell Curcell in dgvAssignment.Rows[0].Cells)
858
                    {
859
                        CommonMotions.chgBackColor(Curcell, false);
860
                        dgvAssignment.Rows[1].Selected = true;
861
                    }
862
                }
863 851

  
864 852
                if (iLength == 0)
865 853
                {
......
872 860
                    return false;
873 861
                }
874 862

  
863
                // 所属部署アンマッチエラー
864
                int nSelDepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
865
                int nDspDepCode = CommonMotions.cnvInt(dgvAssignment.Rows[0].Cells[2].Value);
866
                if (nSelDepCode != nDspDepCode)
867
                {
868
                    bRet &= false;
869
                    foreach (DataGridViewCell Curcell in dgvAssignment.Rows[0].Cells)
870
                    {
871
                        CommonMotions.chgBackColor(Curcell, false);
872
                        dgvAssignment.Rows[1].Selected = true;
873
                    }
874
                    MessageBox.Show("現在の所属部署が追加されていません、\r\n配属年月日を入力して配属追加してください。"
875
                                    , "データ確認", MessageBoxButtons.OK, MessageBoxIcon.Warning);
876
                    return false;
877
                }
878

  
875 879
                return true;
876 880
            }
877 881
            catch (System.Exception ex)
......
1752 1756
                // 担当者マスタ:終了年月日・削除フラグ更新
1753 1757
                if (!picDB.UpdateFeild(workRec.PersonCode
1754 1758
                                        , (int)IOMPersonInCharge.ColumnCnt.DeleteFlg
1755
                                        , (int)CommonDefine.DataRowDeleteDef.Deleted
1759
                                        , (int)CommonDefine.DataDeleteDef.Deleted
1756 1760
                                        , false))
1757 1761
                {
1758 1762
                    picDB.rollback();
......
1906 1910
                // 部署マスタを検索する
1907 1911
                StringBuilder strSQL = new StringBuilder();
1908 1912
                if (bDspExistsData)
1909
                    strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC",(int)(int)CommonDefine.DataRowDeleteDef.Exists);
1913
                    strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC",(int)(int)CommonDefine.DataDeleteDef.Exists);
1910 1914
                else
1911 1915
                    strSQL.Append(" Order By DeleteFlg ASC, DisplayOrder ASC");
1912 1916
                List<DepartmentMaster> data = new List<DepartmentMaster>();
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.cs
420 420
                joblinkDB.connect(); joblinkDB.beginTran();
421 421

  
422 422
                // 削除フラグ
423
                workList[0].DeleteFlg = (int)CommonDefine.DataRowDeleteDef.Deleted;
423
                workList[0].DeleteFlg = (int)CommonDefine.DataDeleteDef.Deleted;
424 424

  
425 425
                // データ更新
426 426
                if (!sbDB.UpdateAction(strWhere, workList[0], false))
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs
1087 1087
        private string CreateSQL()
1088 1088
        {
1089 1089
            StringBuilder strSQL = new StringBuilder();
1090
            strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
1090
            strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
1091 1091
            try
1092 1092
            {
1093 1093
                string[] strArray = new string[3];
......
1178 1178

  
1179 1179
                StringBuilder strSQL = new StringBuilder();
1180 1180
                strSQL.Append("Select Distinct JapaneseSyllabary From SubContractorMaster");
1181
                strSQL.AppendFormat(" WHERE DELETEFLG = {0} Order By JapaneseSyllabary", (int)CommonDefine.DataRowDeleteDef.Exists);
1181
                strSQL.AppendFormat(" WHERE DELETEFLG = {0} Order By JapaneseSyllabary", (int)CommonDefine.DataDeleteDef.Exists);
1182 1182
                ArrayList arData = new ArrayList();
1183 1183
                if (!sbDB.ExecuteReader(strSQL.ToString(), ref arData)) return;
1184 1184
                if (arData.Count == 0) return;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Suppliers/FrmSuppliers.cs
336 336
                }
337 337
                // データ削除(論理削除)
338 338
                //if (!supDB.DeleteAction(strWhere))
339
                orData.DeleteFlg = (int)CommonDefine.DataRowDeleteDef.Deleted;
339
                orData.DeleteFlg = (int)CommonDefine.DataDeleteDef.Deleted;
340 340
                if (!supDB.UpdateAction(strWhere, orData))
341 341
                {
342 342
                    MessageBox.Show("削除に失敗しました。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
......
914 914
                List<SuppliersMaster> wrk = new List<SuppliersMaster>();
915 915
                // 仕入先取得SQL
916 916
                StringBuilder strSql = new StringBuilder();
917
                strSql.AppendFormat(" WHERE DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
917
                strSql.AppendFormat(" WHERE DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
918 918
                // グリッドの行を0に戻す
919 919
                dgvMaster.Rows.Clear();
920 920
                // データ取得
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Vehicle/FrmVehicle.cs
1494 1494
                cmbVehicleAdministrator.DataSource = null;
1495 1495
                List<DepartmentMaster> workList = new List<DepartmentMaster>();
1496 1496
                // 部署マスタを検索する
1497
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
1497
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
1498 1498
                // 担当者マスタ読込
1499 1499
                if (!dmDB.SelectAction(strSQL, ref workList)) return;
1500 1500

  
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmComponentDiag.cs
382 382
                strSQL.Clear();
383 383
                if (m_ConstrTypeCode < 1)
384 384
                {
385
                    strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
385
                    strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
386 386
                    strSQL.Append(" Order By DisplayOrder ASC");
387 387
                    if (!cmpDB.SelectAction(strSQL.ToString(), ref m_ciList)) return;
388 388
                }
......
397 397
                    strSQL.Append("               On B.ComponentCode = A.ComponentCode");
398 398
                    strSQL.Append("        Inner Join constructiontypemaster AS C");
399 399
                    strSQL.Append("               On C.TypeCode = B.TypeCode");
400
                    strSQL.AppendFormat(" Where A.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
400
                    strSQL.AppendFormat(" Where A.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
401 401
                    strSQL.AppendFormat(" And C.TypeCode = {0}", m_ConstrTypeCode);
402 402
                    strSQL.Append(" Order By A.DisplayOrder");
403 403
                    ArrayList arrayList = new ArrayList();
......
489 489
            {
490 490
                List<ComponentMaster> ciList = new List<ComponentMaster>();
491 491

  
492
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
492
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
493 493
                // 工種マスタ取得
494 494
                if (!cmpDB.SelectAction(strSQL, ref ciList)) return false;
495 495

  
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionItemDiag.cs
359 359
                StringBuilder strSQL = new StringBuilder(); ;
360 360
                if (m_AllDisplayFlg)
361 361
                {   // ----- 全表示
362
                    strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
362
                    strSQL.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
363 363
                }
364 364
                else
365 365
                {   // ----- 大項目キーが指定されてる場合
......
374 374
                    strSQL.Append(", DATE_FORMAT(B.EntryDate, '%Y/%m/%d %H:%i:%s')");
375 375
                    strSQL.Append(", DATE_FORMAT(B.UpdateDate, '%Y/%m/%d %H:%i:%s')");
376 376
                    strSQL.Append(" FROM ComponentLinkMaster A, ConstructionItemMaster B");
377
                    strSQL.AppendFormat(" Where B.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
377
                    strSQL.AppendFormat(" Where B.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
378 378
                    strSQL.AppendFormat(" And A.ComponentCode = {0}", m_ComponentCode);
379 379
                    strSQL.Append(" And A.ItemCode = B.ItemCode");
380 380
                    strSQL.Append(" Order By A.DisplayOrder ASC");
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionSpecDiag.cs
369 369
                strSQL.Append(", DATE_FORMAT(B.EntryDate, '%Y/%m/%d %H:%i:%s')");
370 370
                strSQL.Append(", DATE_FORMAT(B.UpdateDate, '%Y/%m/%d %H:%i:%s')");
371 371
                strSQL.Append(" FROM ComponentLinkMaster A, ConstructionItemMaster B");
372
                strSQL.AppendFormat(" Where B.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
372
                strSQL.AppendFormat(" Where B.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
373 373
                strSQL.AppendFormat(" And A.ComponentCode = {0}", m_ComponentCode);
374 374
                strSQL.Append(" And A.ItemCode = B.ItemCode");
375 375
                strSQL.Append(" Order By A.DisplayOrder ASC");
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardWriter.cs
557 557
                m_SenderList.Add(new KeyValuePair<int, string>(CommonDefine.s_AllMembersCode, CommonDefine.s_AllMembersString));
558 558

  
559 559
                // 部署マスタを追加
560
                string strSQL2 = String.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
560
                string strSQL2 = String.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
561 561
                // 部署マスタ読込
562 562
                if (!dmDB.SelectAction(strSQL2, ref dmList)) return false;
563 563
                // データ表示
......
573 573
                m_SenderList.Add(new KeyValuePair<int, string>(0, ""));
574 574

  
575 575
                // 担当者マスタを追加
576
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By EmployeeClassFlg ASC, DisplayOrder ASC, PersonCode ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
576
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By EmployeeClassFlg ASC, DisplayOrder ASC, PersonCode ASC", (int)CommonDefine.DataDeleteDef.Exists);
577 577
                // 担当者マスタ読込
578 578
                if (!picDB.SelectAction(strSQL, ref workList)) return false;
579 579
                // データ表示
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubConJobDiag.cs
520 520
        private string CreateSQL()
521 521
        {
522 522
            StringBuilder strSQL = new StringBuilder();
523
            strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
523
            strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
524 524
            try
525 525
            {
526 526
                string[] strArray = new string[3];
......
632 632
                    {
633 633
                        // 協力会社マスタ取得
634 634
                        strSQL = sbcDB.CreatePrimarykeyString(wrk.InputCode);
635
                        strSQL += string.Format(" AND DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
635
                        strSQL += string.Format(" AND DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
636 636
                        if (!sbcDB.SelectAction(strSQL, ref sbcRec)) continue;
637 637
                    }
638 638
                    int iRows = dgvHistory.Rows.Add(++i,
......
679 679

  
680 680
                // SQL作成
681 681
                string strSQL = sbcDB.CreatePrimarykeyString(SubContractorCode);
682
                strSQL += string.Format(" AND DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
682
                strSQL += string.Format(" AND DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
683 683
                // 協力会社マスタ取得
684 684
                if (!sbcDB.SelectAction(strSQL, ref DataRec)) return false;
685 685

  
......
770 770
            {
771 771
                StringBuilder strSQL = new StringBuilder(); ;
772 772
                strSQL.Append("Select Distinct JapaneseSyllabary From SubContractorMaster");
773
                strSQL.AppendFormat(" WHERE DELETEFLG = {0} Order By JapaneseSyllabary", (int)CommonDefine.DataRowDeleteDef.Exists);
773
                strSQL.AppendFormat(" WHERE DELETEFLG = {0} Order By JapaneseSyllabary", (int)CommonDefine.DataDeleteDef.Exists);
774 774
                ArrayList arData = new ArrayList();
775 775
                if (!sbDB.ExecuteReader(strSQL.ToString(), ref arData)) return;
776 776
                if (arData.Count == 0) return;
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubconstractorDiag.cs
814 814
                // SQL作成
815 815
                StringBuilder strSQL = new StringBuilder();
816 816
                strSQL.AppendFormat(" Where EmployeeClassFlg = {0}", (int)PersonInChargeMaster.EmployeeClassFlgDef.OutSource);
817
                strSQL.AppendFormat("  And DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
817
                strSQL.AppendFormat("  And DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
818 818
                // 担当者マスタ取得
819 819
                if (!personDB.SelectAction(strSQL.ToString(), ref personList)) return;
820 820

  
......
950 950
                    strSQL = personDB.CreatePrimarykeyString(SubContractorCode);
951 951
                    strSQL += string.Format(" AND EmployeeClassFlg = {0} And DeleteFlg = {1}"
952 952
                                            , (int)PersonInChargeMaster.EmployeeClassFlgDef.OutSource
953
                                            , (int)CommonDefine.DataRowDeleteDef.Exists);
953
                                            , (int)CommonDefine.DataDeleteDef.Exists);
954 954
                    // 担当者マスタ取得
955 955
                    if (!personDB.SelectAction(strSQL, ref personRec)) return false;
956 956
                    DataRec.CompanyCode = personRec.PersonCode;
......
1261 1261
        private string CreateSQL()
1262 1262
        {
1263 1263
            StringBuilder strSQL = new StringBuilder();
1264
            strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
1264
            strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
1265 1265
            try
1266 1266
            {
1267 1267
                string[] strArray = new string[3];
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSuppliersDiag.cs
305 305
            {
306 306
                dgvSearch.Rows.Clear();
307 307

  
308
                string strSearch = string.Format(" WHERE DELETEFLG = {0} ORDER BY DISPLAYORDER ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
308
                string strSearch = string.Format(" WHERE DELETEFLG = {0} ORDER BY DISPLAYORDER ASC", (int)CommonDefine.DataDeleteDef.Exists);
309 309
                List<SuppliersMaster> sbcList = new List<SuppliersMaster>();
310 310
                
311 311
                // SQL作成
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialList.cs
222 222
            try
223 223
            {
224 224
                List<MaterialKindMaster> itemList = new List<MaterialKindMaster>();
225
                string strsql = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
225
                string strsql = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
226 226
                if (!IoMt.SelectAction(strsql, ref itemList)) return;
227 227
                if (itemList.Count == 0) return;
228 228

  
......
337 337
                sql.AppendLine(" From MaterialItemMaster as Mim");
338 338
                sql.AppendLine("      left join MaterialInfo as Mi on Mim.MATERIALITEMCODE = Mi.MATERIALITEMCODE ");
339 339
                sql.AppendLine("      left join materialkindmaster as Mk on Mim.MATERIALKINDCODE = Mk.MATERIALKINDCODE ");
340
                sql.AppendLine(string.Format(" Where Mim.DELETEFLG <> {0} ", (int)CommonDefine.DataRowDeleteDef.Deleted));
340
                sql.AppendLine(string.Format(" Where Mim.DELETEFLG <> {0} ", (int)CommonDefine.DataDeleteDef.Deleted));
341 341

  
342 342
                // 条件追加
343 343
                //if (strMaterialKindCode.Length == 1 && strMaterialKindCode != "0") 
trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialSelect.cs
263 263
            try
264 264
            {
265 265
                List<MaterialKindMaster> itemList = new List<MaterialKindMaster>();
266
                string strsql = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
266
                string strsql = string.Format(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
267 267
                if (!IoMt.SelectAction(strsql, ref itemList)) return;
268 268
                if (itemList.Count == 0) return;
269 269

  
......
328 328

  
329 329
                strSQL.AppendLine(" Where");
330 330
                strSQL.AppendFormat(" A.MaterialKindCode = {0}", strMaterialKindCode);
331
                strSQL.AppendLine(string.Format(" And A.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists));
331
                strSQL.AppendLine(string.Format(" And A.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists));
332 332
                strSQL.AppendLine(" And B.MATERIALITEMCODE = A.MATERIALITEMCODE");
333 333
                strSQL.AppendLine(" And B.RENTCOUNT > 0");
334 334
                strSQL.AppendLine(" And C.MATERIALKINDCODE = A.MATERIALKINDCODE");
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.cs
338 338

  
339 339
                //コンボボックスのデータをセットする
340 340
                // SQL作成
341
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By EmployeeClassFlg ASC, DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists);
341
                string strSQL = string.Format(" Where DeleteFlg = {0} Order By EmployeeClassFlg ASC, DisplayOrder ASC", (int)CommonDefine.DataDeleteDef.Exists);
342 342
                // 工種マスタ取得
343 343
                if (!picDB.SelectAction(strSQL, ref m_PersonList)) return;
344 344

  
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
6378 6378
                strSQL.AppendFormat(" Where A.ACTIONSCHEDULEFLG = {0}", (int)DepartmentMaster.ActionScheduleFlgDef.OnDisplay);
6379 6379
                strSQL.Append(" AND A.DEPARTMENTCODE = B.DEPARTMENTCODE");
6380 6380
                strSQL.AppendFormat(" And B.EmployeeClassFlg = {0}", EmployeeClass);
6381
                strSQL.AppendFormat(" AND B.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists);
6381
                strSQL.AppendFormat(" AND B.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
6382 6382
                strSQL.Append(" Order By A.DISPLAYORDER ASC, B.DISPLAYORDER ASC, DateC ASC, DateD ASC, D.SeqNo ASC");
6383 6383
            }
6384 6384
            catch (Exception ex)
......
7474 7474
                        // ---------------担当者の取得
7475 7475
                        string strPerson = string.Format(" Where PersonCode = {0} And DeleteFlg = {1}"
7476 7476
                                                        , BaseConstructionPersonCode
7477
                                                        , (int)CommonDefine.DataRowDeleteDef.Exists);
7477
                                                        , (int)CommonDefine.DataDeleteDef.Exists);
7478 7478
                        if (!picDB.SelectAction(strPerson, ref picList)) continue;
7479 7479
                        if (picList.Count == 0) continue;
7480 7480
                        ipicDisp = BaseConstructionPersonCode;
......
7485 7485
                            // ---------------部署の取得
7486 7486
                            string strDepartment = string.Format(" Where DepartmentCode = {0} And DeleteFlg = {1}"
7487 7487
                                                                    , picList[0].DepartmentCode
7488
                                                                    , (int)CommonDefine.DataRowDeleteDef.Exists);
7488
                                                                    , (int)CommonDefine.DataDeleteDef.Exists);
7489 7489
                            if (!dmDB.SelectAction(strDepartment, ref dmList)) continue;
7490 7490
                            if (dmList.Count == 0) continue;
7491 7491
                            idmDisp = picList[0].DepartmentCode;

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