プロジェクト

全般

プロフィール

リビジョン 43

堀内ほぼ8年前に追加

結合時日報不具合改修分

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
37 37
        /// <summary>
38 38
        /// パスを定数で定義する
39 39
        /// </summary>
40
        public const string s_UPDATE_FILE_PATH = @"D:\Work\Test";
41
        //public const string s_UPDATE_FILE_PATH = @"Z:\52GenbaKantokuHisyo";
40
        public const string s_UPDATE_FILE_PATH = @"Z:\52GenbaKantokuHisyo";
42 41
        //public const string s_UPDATE_FILE_PATH = @"Z:\5-2現場監督秘書";
43 42
        //private const string s_UPDATE_FILE_PATH = @"Z:\⑤IT事業部用\Debug";
44 43
        public const string s_UPDATECOPY_NAME = "UpDateCopy.exe";
......
1563 1562
            /// 作成中
1564 1563
            /// </summary>
1565 1564
            Making = 1,
1565
            /// <summary>
1566
            /// 作成しない
1567
            /// </summary>
1568
            NoMakeData = 9,
1566 1569
        }
1567 1570
        #endregion
1568 1571

  
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs
178 178
                    DB27.DeleteAction(strRemove, false);
179 179
                }
180 180

  
181
                // 結合工事リンク情報更新(1件目は削除済み)
181
                // 結合工事リンク情報更新
182 182
                if (ProcSuccess)
183 183
                {
184 184
                    // 増減工事親確認
185 185
                    if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Parent)
186 186
                    {
187
                        for (int i = 1; i < RemoveList.Count; i++)
187
                        for (int i = 0; i < RemoveList.Count; i++)
188 188
                        {
189 189
                            if (!DB01.UpdateFeild(RemoveList[i]
190 190
                                                , (int)IOConstructionBaseInfo.TableColumn.TyingFlg
......
199 199
                    // 結合工事親確認
200 200
                    if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
201 201
                    {
202
                        for (int i = 1; i < UpdateLinkList.Count; i++)
202
                        string strSQL = string.Empty;
203
                        for (int i = 0; i < UpdateLinkList.Count; i++)
203 204
                        {
204 205
                            if (!DB01.UpdateFeild(UpdateLinkList[i]
205 206
                                                , (int)IOConstructionBaseInfo.TableColumn.JoinFlg
......
209 210
                                ProcSuccess = false;
210 211
                                break;
211 212
                            }
213
                            strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO A SET A.JOINFLG = {0}", (int)CommonDefine.BaseInfoJoinFlg.Standard);
214
                            strSQL += " WHERE A.CONSTRUCTIONCODE IN (SELECT AA.FLUCTUATIONCODE FROM CONSTRUCTIONLINK AA";
215
                            strSQL += string.Format(" WHERE AA.CONSTRUCTIONCODE = {0}",UpdateLinkList[i]);
216
                            strSQL += string.Format(" AND AA.LINKTYPE = {0})", (int)CommonDefine.LinkDataType.FluctuationType);
217
                            DB01.ExecuteNonQuery(strSQL, false);
212 218
                        }
213 219
                    }
214 220
                }
trunk/src/ProcessManagement/ProcessManagement/DataModel/SystemMaster.cs
26 26
        private double      m_OfficeExpenses = 0;	            // 事務所経費
27 27
        private double      m_OperatingExpenses = 0;	        // 営業経費
28 28
        private double      m_ConsumptionTax = 0;	            // 消費税
29

  
29 30
        private string      m_ExcelSavePath = string.Empty;	    // Excel保存パス
30 31

  
31 32
        private int         m_BusinessPeriod = 0;               // 営業期数
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
1440 1440
                List<ConstructionLink> LinkList = new List<ConstructionLink>();
1441 1441
                if (!LinkDB.SelectAction(strLinkSQL, ref LinkList, false)) return false;
1442 1442

  
1443
                string strSelSQL = "SELECT COUNT(*) FROM DAILYDATACONSTRUCTION WHERE CONSTRUCTIONCODE IN (";
1443 1444
                string strDelSQL = string.Format("UPDATE DAILYDATACONSTRUCTION SET CONSTRUCTIONCODE = {0} WHERE CONSTRUCTIONCODE IN (", m_ConstructionCode);
1444 1445
                // 検索キー追加
1445 1446
                for (int i = 0; i < LinkList.Count; i++)
1446 1447
                {
1447 1448
                    if (i != 0) strDelSQL += " ,";
1449
                    if (i != 0) strSelSQL += " ,";
1448 1450
                    strDelSQL += string.Format("{0}", LinkList[i].FluctuationCode);
1451
                    strSelSQL += string.Format("{0}", LinkList[i].FluctuationCode);
1449 1452

  
1450 1453
                }
1451 1454
                strDelSQL += ")";
1455
                strSelSQL += ")";
1452 1456

  
1453
                string strSelSQL = string.Format("SELECT COUNT(*) FROM DAILYDATACONSTRUCTION WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
1454 1457
                int DataCount = GetDailyDataCount(DailyData1, strSelSQL);
1455 1458
                if (DataCount > 0)
1456 1459
                {
......
1462 1465
                }
1463 1466

  
1464 1467
                strSelSQL = strSelSQL.Replace("DAILYDATACONSTRUCTION", "DAILYDATADETAIL");
1465
                DataCount = 0;
1468
                strDelSQL = strDelSQL.Replace("DAILYDATACONSTRUCTION", "DAILYDATADETAIL");
1469
                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
1466 1470
                if (DataCount > 0)
1467 1471
                {
1468
                    strDelSQL = strDelSQL.Replace("DAILYDATACONSTRUCTION", "DAILYDATADETAIL");
1469 1472
                    if (!DailyData2.ExecuteNonQuery(strDelSQL, false))
1470 1473
                    {
1471 1474
                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
......
1474 1477
                }
1475 1478

  
1476 1479
                strSelSQL = strSelSQL.Replace("DAILYDATADETAIL", "DAILYDATAVEHICLES");
1477
                DataCount = 0;
1480
                strDelSQL = strDelSQL.Replace("DAILYDATADETAIL", "DAILYDATAVEHICLES");
1481
                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
1478 1482
                if (DataCount > 0)
1479 1483
                {
1480
                    strDelSQL = strDelSQL.Replace("DAILYDATADETAIL", "DAILYDATAVEHICLES");
1481 1484
                    if (!DailyData3.ExecuteNonQuery(strDelSQL, false))
1482 1485
                    {
1483 1486
                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
......
1486 1489
                }
1487 1490

  
1488 1491
                strSelSQL = strSelSQL.Replace("DAILYDATAVEHICLES", "DAILYDATAMATERIALS");
1489
                DataCount = 0;
1492
                strDelSQL = strDelSQL.Replace("DAILYDATAVEHICLES", "DAILYDATAMATERIALS");
1493
                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
1490 1494
                if (DataCount > 0)
1491 1495
                {
1492
                    strDelSQL = strDelSQL.Replace("DAILYDATAVEHICLES", "DAILYDATAMATERIALS");
1493 1496
                    if (!DailyData4.ExecuteNonQuery(strDelSQL, false))
1494 1497
                    {
1495 1498
                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
......
1498 1501
                }
1499 1502

  
1500 1503
                strSelSQL = strSelSQL.Replace("DAILYDATAMATERIALS", "DAILYDATASUBCONTRACTORS");
1501
                DataCount = 0;
1504
                strDelSQL = strDelSQL.Replace("DAILYDATAMATERIALS", "DAILYDATASUBCONTRACTORS");
1505
                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
1502 1506
                if (DataCount > 0)
1503 1507
                {
1504
                    strDelSQL = strDelSQL.Replace("DAILYDATAMATERIALS", "DAILYDATASUBCONTRACTORS");
1505 1508
                    if (!DailyData5.ExecuteNonQuery(strDelSQL, false))
1506 1509
                    {
1507 1510
                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
......
1510 1513
                }
1511 1514

  
1512 1515
                strSelSQL = strSelSQL.Replace("DAILYDATASUBCONTRACTORS", "DAILYDATAFIELD");
1513
                DataCount = 0;
1516
                strDelSQL = strDelSQL.Replace("DAILYDATASUBCONTRACTORS", "DAILYDATAFIELD");
1517
                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
1514 1518
                if (DataCount > 0)
1515 1519
                {
1516
                    strDelSQL = strDelSQL.Replace("DAILYDATASUBCONTRACTORS", "DAILYDATAFIELD");
1517 1520
                    if (!DailyData6.ExecuteNonQuery(strDelSQL, false))
1518 1521
                    {
1519 1522
                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs
797 797
                        OrderNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderNo].Value);
798 798
                    }
799 799

  
800

  
801 800
                    // データカウント取得
802 801
                    SelectCnt++;
803 802
                }
804 803
                
805 804
                if (bNoCreateData && bMakeingData && bApprovalData)
806 805
                {
807
                    MessageBox.Show("注文書:作成・編集・閲覧は同時にできません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
806
                    MessageBox.Show("注文書:新規作成・編集・閲覧は同時にできません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
808 807
                    return false;
809 808
                }
810 809
                if (bNoCreateData && bMakeingData)
811 810
                {
812
                    MessageBox.Show("注文書:作成・編集は同時にできません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
811
                    MessageBox.Show("注文書:新規作成・編集は同時にできません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
813 812
                    return false;
814 813
                }
815 814
                if (bMakeingData && bApprovalData)
......
819 818
                }
820 819
                if (bNoCreateData && bApprovalData)
821 820
                {
822
                    MessageBox.Show("注文書:作成・閲覧は同時にできません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
821
                    MessageBox.Show("注文書:新規作成・閲覧は同時にできません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
823 822
                    return false;
824 823
                }
825 824

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs
455 455
        /// </summary>
456 456
        private List<KeyValuePair<int, int>> m_ChangeCompany = new List<KeyValuePair<int, int>>();
457 457

  
458
        /// <summary>
459
        /// 新規プロセスフラグ
460
        /// </summary>
461
        private bool m_bNewProcess = false;
462 458
        #endregion
463 459

  
464 460
        #region プロパティ
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
126 126
        }
127 127
        #endregion
128 128

  
129
        #region 旧作成データと新作成データの判別処理
130
        /// <summary>
131
        /// 旧作成データと新作成データの判別処理
132
        /// </summary>
133
        /// <returns></returns>
134
        private bool DisplayTypeCheck()
135
        {
136
            IOConstructionLedgerDetail LDetailDB = new IOConstructionLedgerDetail();
137
            try
138
            {
139
                int ConstrSearchCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
140
                string strSQL = LDetailDB.CreatePrimarykeyString(ConstrSearchCode, (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
141
                if (ConstrSearchCode != m_ConstructionCode) strSQL += string.Format(" AND SOURCECODE = {0}", m_ConstructionCode);
142
                strSQL += " AND COMPANYCODE > 0";
143
                ConstructionLedgerDetail LDetailRec = new ConstructionLedgerDetail();
144
                if (!LDetailDB.SelectAction(strSQL, ref LDetailRec)) return false;
145
                
146
                if (LDetailRec.PurchaseOrderFlg < (int)CommonDefine.PurchaseOrderFlg.NoCreate)
147
                {
148
                    m_OrderNo = 1;
149
                    m_bNewProcess = false;
150
                    return true;
151
                }
152

  
153
                m_bNewProcess = true;
154

  
155
                return true;
156
            }
157
            catch (Exception ex)
158
            {
159
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
160
                return false;
161
            }
162
            finally
163
            {
164
                LDetailDB.close(); LDetailDB = null;
165
            }
166
        }
167
        #endregion
168

  
169 129
        #region 注文書明細選択画面表示
170 130
        /// <summary>
171 131
        /// 注文書明細選択画面表示
......
212 172
                // ヘッダー情報表示
213 173
                DispHeader();
214 174

  
215
                if (m_bNewProcess)
175
                object[] objRec = (object[])m_DetailList[0];
176
                if (CommonMotions.cnvInt(objRec[(int)FrmOrderEntryList.ReadDBColumn.OrderNo]) < 0)
177
                {   // 旧方式のデータ表示
178
                    OldType_SetPurchaseOrderData();
179
                }
180
                else
216 181
                {
217 182
                    // 注文書データを読み込む
218 183
                    if (m_CreateData)
......
228 193
                    // 承認データ受付番号セット
229 194
                    SetApprovalOrderNo();
230 195
                }
231
                else
232
                {   // 旧方式のデータ表示
233
                    OldType_SetPurchaseOrderData();
234
                }
235 196

  
236 197
                // 申請・承認表示処理
237 198
                InitApprovalDisplay();
......
734 695
                        binit = false;
735 696
                        continue;
736 697
                    }
737
                    // 会社コードが変わればデータセットへ行く
698
                    // 会社コードが変わればデータセットへ行く
738 699
                    if (Break_CompanyCode != DetailRec.CompanyCode)
739 700
                    {
740 701
                        // 協力業者発注合計が30万以上に注文書を発行する

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