1.修复重启后，由于PJ不是列队中，导致无法创建调度任务的问题。 2.修复CPjPage2点Port2的物料类型，Port1也跟着变的问题。

chenluhua1980

8 小时以前 867888458abdc029cbf31b6058edfefe30a20722

 SourceCode/Bond/Servo/Model.cpp

@@ -272,6 +272,9 @@
      int seed = m_configuration.getPortCassetteSnSeed(i + 1);
      m_master.setPortCassetteSnSeed(i + 1, seed);
   }

   // 按调度模式覆写生产端口配置
   m_master.applySchedulingModePortMapping();
}

void CModel::setPortType(unsigned int index, SERVO::PortType type)
@@ -302,7 +305,7 @@
   m_configuration.getUnitId(strUnitId);

   // 机器型号和软件版本号应从配置中读取，当前先固定值
   CString strModeType = _T("Master");
   CString strModeType = _T("Panel Bonder");
   CString strSoftRev = _T("1.0.2");


@@ -534,7 +537,7 @@
   m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
   setControlState(m_currentControlState);
   refreshDerivedSVs();
   m_hsmsPassive.init(this, "APP", 7000);
   m_hsmsPassive.init(this, "APP", 5000);
   strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
   m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
   strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -982,9 +985,10 @@
   };
   masterListener.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
      (void)pMaster;
      // Keep SV variable cache updated, but do not actively send S6F11 reports.
      const int eqId = pEquipment ? pEquipment->getID() : 0;

      auto sendSv = [&](const auto& vidMap, const char* evName) {
      auto cacheSv = [&](const auto& vidMap) {
         const size_t count = (std::min)(params.size(), vidMap.size());
         m_hsmsPassive.withVariableLock([&] {
            if (pEquipment != nullptr) {
@@ -996,34 +1000,40 @@
               const std::string val = formatParamValue(params[idx]);
               m_hsmsPassive.setVariableValue(std::to_string(vidMap[idx]).c_str(), val.c_str());
            }
            m_hsmsPassive.requestEventReportSend(evName);
         });
      };

      if (eqId == EQ_ID_Bonder1 || eqId == EQ_ID_Bonder2) {
      if (eqId == EQ_ID_Bonder1) {
         static constexpr std::array<int, 19> vids = {
            6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
            6010,6011,6012,6013,6014,6015,6016,6017,6018
         };
         sendSv(vids, "BonderSVData");
         cacheSv(vids);
      }
      else if (eqId == EQ_ID_Bonder2) {
         static constexpr std::array<int, 19> vids = {
            6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,
            6030,6031,6032,6033,6034,6035,6036,6037,6038
         };
         cacheSv(vids);
      }
      else if (eqId == EQ_ID_VACUUMBAKE) {
         static constexpr std::array<int, 18> vids = {
            6200,6201,6202,6203,6204,6205,6206,6207,6208,
            6209,6210,6211,6212,6213,6214,6215,6216,6217
         };
         sendSv(vids, "VacuumBakeSVData");
         cacheSv(vids);
      }
      else if (eqId == EQ_ID_BAKE_COOLING) {
         static constexpr std::array<int, 20> vids = {
            6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,
            6410,6411,6412,6413,6414,6415,6416,6417,6418,6419
         };
         sendSv(vids, "BakeCoolingSVData");
         cacheSv(vids);
      }
      else if (eqId == EQ_ID_MEASUREMENT) {
         static constexpr std::array<int, 2> vids = { 6600, 6601 };
         sendSv(vids, "MeasurementSVData");
         cacheSv(vids);
      }
   };
   masterListener.onProcessDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
@@ -1129,6 +1139,7 @@
   m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
   m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
   m_master.setJobMode(m_configuration.isJobMode());
   m_master.setSchedulingMode((SERVO::SchedulingMode)m_configuration.getSchedulingMode());

   // 加截Job
   strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);