プロジェクト

全般

プロフィール

リビジョン 318

堀内ほぼ7年前に追加

承認処理コメント入力終了時プロセスカウント不正削除修正
工事日報・議事録画面画面パラメタ退避処理バグ修正
請求まとめ修正中
エクセルブック白黒印刷指定(シートで指定したので選択できているか不明)

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs
189 189
            this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Top;
190 190
            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
191 191
            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
192
            this.panel1.Controls.Add(this.pnlApproval);
193
            this.panel1.Controls.Add(this.pnlApprovalButton);
192 194
            this.panel1.Controls.Add(this.lblLabel06);
193 195
            this.panel1.Controls.Add(this.label23);
194 196
            this.panel1.Controls.Add(this.pnlGroup2);
......
200 202
            this.panel1.Controls.Add(this.label19);
201 203
            this.panel1.Controls.Add(this.label21);
202 204
            this.panel1.Controls.Add(this.label15);
203
            this.panel1.Controls.Add(this.pnlApproval);
204 205
            this.panel1.Controls.Add(this.label18);
205
            this.panel1.Controls.Add(this.pnlApprovalButton);
206 206
            this.panel1.Controls.Add(this.label17);
207 207
            this.panel1.Controls.Add(this.label16);
208 208
            this.panel1.Controls.Add(this.lblConstructionCodelabel);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs
83 83
                ClsExcute.ClearSaveParameter(NowPoint);
84 84
                // ----- ???????
85 85
                // ?????N
86
                ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(CommonMotions.cnvInt(numUDConstPro.Value));
86
                ClsExcute.ProcControlPara[NowPoint].StringSaveParameter.Add(numUDConstPro.Value.ToString());
87 87
                // ?S??????
88 88
                int depCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
89 89
                ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(depCode);
......
361 361
                strSub1.Append(", D.DEPARTMENTSTRING");
362 362
                strSub1.Append(", D.DISPLAYORDER");
363 363
                strSub1.Append(", C.DISPLAYORDER");
364
                
365
                // strSub1.Append(", E.COMPLATEFLG"); 2017/10/30 ?????o???????????????????????
366
                strSub1.Append(", 0");
367 364

  
365
                strSub1.Append(", 0 As COMPLATEFLG");
366

  
368 367
                strSub1.Append(" FROM CONSTRUCTIONBASEINFO A");
369 368
                strSub1.Append(", CONSTRUCTIONBASEINFODETAIL B");
370 369
                strSub1.Append(", PERSONINCHARGEMASTER C");
371 370
                strSub1.Append(", DEPARTMENTMASTER D");
372 371

  
373
                // strSub1.Append(", CONSTRUCTIONLEDGER E"); 2017/10/30 ?????o???????????????????????
372
                strSub1.Append(" WHERE NOT EXISTS (SELECT * FROM PROCEEDINGSDATA Z WHERE Z.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
374 373
                
375
                strSub1.Append(" WHERE NOT EXISTS (SELECT * FROM PROCEEDINGSDATA Z WHERE Z.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
376 374
                strSub1.AppendFormat(" And A.TyingFlg != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying);
377 375

  
378 376
                // ?????m?F??~????O
......
393 391

  
394 392
                strSub1.AppendFormat(" AND A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
395 393
                strSub1.Append(" AND C.DEPARTMENTCODE = D.DEPARTMENTCODE");
396
                // strSub1.Append(" AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"); 2017/10/30 ?????o???????????????????????
397 394
                // ????????H?????????H??
398
                strSub2.Append(" UNION (SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING , D.PERSONCODE, D.PERSONNAME, MAX(DATE_FORMAT(C.PROCEEDINGSDATADATE,'%Y/%m/%d'))");
399
                strSub2.Append(" , E.DEPARTMENTCODE, E.DEPARTMENTSTRING, E.DISPLAYORDER, D.DISPLAYORDER, F.COMPLATEFLG");
400
                strSub2.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PROCEEDINGSDATA C, PERSONINCHARGEMASTER D, DEPARTMENTMASTER E, CONSTRUCTIONLEDGER F");
395
                strSub2.Append(" UNION (");
396
                strSub2.Append("   SELECT");
397
                strSub2.Append("     A.CONSTRUCTIONCODE");
398
                strSub2.Append("     , B.DETAILSTRING");
399
                strSub2.Append("     , D.PERSONCODE");
400
                strSub2.Append("     , D.PERSONNAME");
401
                strSub2.Append("     , MAX(DATE_FORMAT(C.PROCEEDINGSDATADATE, '%Y/%m/%d'))");
402
                strSub2.Append("     , E.DEPARTMENTCODE");
403
                strSub2.Append("     , E.DEPARTMENTSTRING");
404
                strSub2.Append("     , E.DISPLAYORDER");
405
                strSub2.Append("     , D.DISPLAYORDER");
406
                strSub2.Append("     , F.COMPLATEFLG As COMPLATEFLG");
407
                strSub2.Append("   FROM");
408
                strSub2.Append("     CONSTRUCTIONBASEINFO A");
409
                strSub2.Append("     Inner Join CONSTRUCTIONBASEINFODETAIL B");
410
                strSub2.Append("       ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
411
                strSub2.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
412
                strSub2.Append("     left join CONSTRUCTIONLEDGER F");
413
                strSub2.Append("       on F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
414
                strSub2.Append("     , PROCEEDINGSDATA C");
415
                strSub2.Append("     , PERSONINCHARGEMASTER D");
416
                strSub2.Append("     , DEPARTMENTMASTER E");
417

  
401 418
                strSub2.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
402 419
                // ?S????I?????????
403 420
                if (PersonCode > 0)
404 421
                    strSub2.AppendFormat(" AND (A.ConstructionPersonCode = {0} OR A.ConstructionInstructor = {0} OR A.ConstrSubPersonCode = {0})", PersonCode);
405 422

  
406
                strSub2.AppendFormat(" AND (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
407 423
                strSub2.Append(" AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE");
408 424
                strSub2.Append(" AND D.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
409 425
                // ?????I????????
410 426
                if (DepartmentCode > 0)
411 427
                    strSub2.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
412 428
                strSub2.Append(" AND D.DEPARTMENTCODE = E.DEPARTMENTCODE");
413
                strSub2.Append(" AND F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
414 429

  
415
                strSQL.Append(strSub1.ToString() + strSecurity.ToString() + strSub2.ToString() + strSecurity.ToString());
416
                strSQL.Append(" GROUP BY A.CONSTRUCTIONCODE, B.DETAILSTRING, D.PERSONCODE, D.PERSONNAME, E.DEPARTMENTCODE, E.DEPARTMENTSTRING, E.DISPLAYORDER, D.DISPLAYORDER, F.COMPLATEFLG)");
430
                strSQL.Append(strSub1.ToString());
431
                strSQL.Append(strSecurity.ToString());
432
                strSQL.Append(strSub2.ToString());
433
                strSQL.Append(strSecurity.ToString());
434
                strSQL.Append(" GROUP BY A.CONSTRUCTIONCODE");
435
                strSQL.Append(", B.DETAILSTRING");
436
                strSQL.Append(" , D.PERSONCODE");
437
                strSQL.Append(" , D.PERSONNAME");
438
                strSQL.Append(" , E.DEPARTMENTCODE");
439
                strSQL.Append(" , E.DEPARTMENTSTRING");
440
                strSQL.Append(" , E.DISPLAYORDER");
441
                strSQL.Append(" , D.DISPLAYORDER");
442
                strSQL.Append(" , F.COMPLATEFLG)");
417 443
                // Order by ?t??
418
                strSQL.Append(" ORDER BY 10 ASC, 8 ASC, 9 ASC, 6 ASC, 7 ASC, 3 ASC");
444
                strSQL.Append(" ORDER BY ifnull(COMPLATEFLG, 0) ASC, 8 ASC, 9 ASC, 6 ASC, 7 ASC, 3 ASC");
419 445

  
420 446
            }
421 447
            catch (Exception ex)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
1186 1186
                int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
1187 1187

  
1188 1188
                // ----- ?_?C?A???O?\???p?????^?Z?b?g
1189
                // ?N?????Z?b?g
1190
                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
1191
                // ?H??????Z?b?g
1189 1192
                frm.ConstructionCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
1190
                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
1193
                // ?x?????Z?b?g
1191 1194
                frm.SelectLabourKind = m_Labourkind;
1192

  
1193
                // ????P??????s???{?^???\??
1194
                if (rdbProject.Checked)
1195
                {   // ????s???????_?C?A???O??\???????
1196
                    if (nConstrCode < 0)
1197
                    {
1198
                        MessageBox.Show("???????????????????A????I??????????B",
1199
                                        "?I??s?\???b?Z?[?W",
1200
                                        MessageBoxButtons.OK,
1201
                                        MessageBoxIcon.Error);
1202
                        return;
1203
                    }
1204
                    frm.DispAddUnknown = true;
1205
                }
1206

  
1207
                // ?s????????R?[?h???Z?b?g????
1195
                // ?s???{?^???\??
1196
                frm.DispAddUnknown = true;
1197
                // ?s??????????R?[?h???Z?b?g????
1208 1198
                frm.SelectData.CompanyCode = nCompanyCode;
1209 1199

  
1210 1200
                // ??????I??\??
......
1228 1218

  
1229 1219
                int[] nRowCol = new int[2];
1230 1220
                Array.Clear(nRowCol, 0, nRowCol.Length);
1231
                // ?s???I??????O????\??????
1232
                if (!DialogResult.Yes.Equals(frm.EndButton))
1233
                {
1234
                    if (!DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol))
1235
                    {
1236
                        // ?I?????N???A
1237
                        selRec = new SubContractorMaster();
1238
                    }
1239
                }
1240
                
1241 1221
                if (rdbCompany.Checked)
1242 1222
                {
1243 1223
                    // ----- ???
......
1245 1225
                }
1246 1226
                else
1247 1227
                {
1228
                    // ???s????O????\??
1229
                    if (selRec.CompanyCode > 0)
1230
                    {
1231
                        // ?????s??I??
1232
                        DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol);
1233
                    }
1248 1234
                    // ----- ????
1249 1235
                    InsdgvProject2Project(selRec, nRowCol);
1250 1236
                }
......
1272 1258
            int No = 0;
1273 1259
            try
1274 1260
            {
1275
                // ????I????????????????
1261
                // ?_?C?A???O??I???????????????????????
1276 1262
                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
1277 1263
                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
1278 1264
                                                                                && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
......
2158 2144
                DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
2159 2145
                                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.????
2160 2146
                                                                                            && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Added)
2161
                                                                                .ToArray();
2147
                                                                                            .ToArray();
2162 2148

  
2163 2149
                if (ExistenceData.Count() == 0)
2164 2150
                {
......
2166 2152

  
2167 2153
                    DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
2168 2154
                                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.????)
2169
                            .ToArray();
2155
                                                                                    .ToArray();
2170 2156
                    int escSeqNo = 0;
2171 2157
                    int LineCount = 1;
2172 2158
                    foreach (DataGridViewRow r in Rows)
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs
249 249
                if (m_EndButton == DialogResult.None) m_EndButton = DialogResult.No;
250 250
            }
251 251
            // 前プロセスに戻る
252
            ClsExcute.BackProcess();
252
            //ClsExcute.BackProcess();
253 253
        }
254 254
        #endregion
255 255

  
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.39")]
36
[assembly: AssemblyFileVersion("1.0.1.39")]
35
[assembly: AssemblyVersion("1.0.1.40")]
36
[assembly: AssemblyFileVersion("1.0.1.40")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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