SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SDA/iWareSda/Model/StationLocationEnum.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SDA/iWareSda/iWareSda.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -150,11 +150,16 @@ public string W_Destination_In { get; set; } /// <summary> /// ä»»å¡å· /// å ¥åºä»»å¡å· /// </summary> [Description("ä»»å¡å·")] public string W_TaskID { get; set; } [Description("å ¥åºä»»å¡å·")] public string W_Inbound_TaskID { get; set; } /// <summary> /// åºåºä»»å¡å· /// </summary> [Description("åºåºä»»å¡å·")] public string W_Outbound_TaskID { get; set; } /// <summary> /// æ¥æé¿åº¦ @@ -186,6 +191,12 @@ /// </summary> [Description("åé åºåºåºä½å·")] public string W_Destination_Out { get; set; } /// <summary> /// 模å¼ï¼1ï¼å ¥åºï¼ 2ï¼åºåº 3ï¼å¼ºå¶åºåºï¼ /// </summary> [Description("模å¼ï¼1ï¼å ¥åºï¼ 2ï¼åºåº 3ï¼å¼ºå¶åºåºï¼")] public string W_Mode { get; set; } /// <summary> /// æ¯å¦æè½¬ @@ -231,6 +242,20 @@ /// </summary> [Description("æ¾æYåç§»")] public string W_Y_Offset { get; set; } /// <summary> /// å ¥åºå®æå·²ç¡®è®¤ /// </summary> [Description("å ¥åºå®æå·²ç¡®è®¤")] public string W_InboundFinishConfirm { get; set; } ///// <summary> ///// ä»»å¡å· ///// </summary> //[Description("ä»»å¡å·")] //public string W_TaskID { get; set; } } @@ -357,57 +382,28 @@ public String R_ReadCodeResult { get; set; } /// <summary> /// å çµ1ç¶æ /// æºå¨äººå ¥åºå®æ /// </summary> [Description("å çµ1ç¶æ")] public string R_PH_1 { get; set; } [Description("æºå¨äººå ¥åºå®æ")] public string R_InboundFinish { get; set; } /// <summary> /// å çµ2ç¶æ /// æºå¨äººå ¥åºåºä½å· /// </summary> [Description("å çµ2ç¶æ")] public string R_PH_2 { get; set; } [Description("æºå¨äººå ¥åºåºä½å·")] public string R_InboundNumber { get; set; } /// <summary> /// æ¶å°ä»»å¡ä¸ååé¦ /// æºå¨äººåºåºå®æ /// </summary> [Description("æ¶å°ä»»å¡ä¸ååé¦")] public string R_ACK { get; set; } [Description("æºå¨äººåºåºå®æ")] public string R_OutboundFinish { get; set; } /// <summary> /// æ¨¡å¼ /// æºå¨äººåºåºåºä½å· /// </summary> [Description("模å¼")] public string R_Model { get; set; } [Description("æºå¨äººåºåºåºä½å·")] public string R_OutboundNumber { get; set; } /// <summary> /// è¿è¡ç¶æ /// </summary> [Description("è¿è¡ç¶æ")] public string R_State { get; set; } /// <summary> /// æ¥è¦ä»£ç /// </summary> [Description("æ¥è¦ä»£ç ")] public string R_AlarmCode { get; set; } /// <summary> /// å½åç®æ å°å /// </summary> [Description("å½åç®æ å°å")] public string R_Destination { get; set; } /// <summary> /// å¤å½¢æ£æµ /// </summary> [Description("å¤å½¢æ£æµ")] public string R_Shape { get; set; } /// <summary> /// å½åä»»å¡å· /// </summary> [Description("å½åä»»å¡å·")] public string R_TaskID { get; set; } } } SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -92,56 +92,58 @@ /// <returns></returns> public bool SendTask(int deviceId, int taskId, string sourcePlce, string toPlace, out string msg) { try { msg = ""; if (!CanSendTask(deviceId, out msg)) { return false; } msg = ""; return false; //try //{ // msg = ""; // if (!CanSendTask(deviceId, out msg)) // { // return false; // } //è¿éç¹æ®è½¬æ¢ä¸ä¸ if (toPlace == ((int)EDevice.åºåºå£1012).ToString()) { toPlace = ((int)EDevice.æåæº1030).ToString(); } // //è¿éç¹æ®è½¬æ¢ä¸ä¸ // if (toPlace == ((int)EDevice.åºåºå£1012).ToString()) // { // toPlace = ((int)EDevice.æåæº1030).ToString(); // } StationDBForWriteComm w_db_source = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce); StationDB2ObjForWriteComm w_dbObj_source = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce); // StationDBForWriteComm w_db_source = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce); // StationDB2ObjForWriteComm w_dbObj_source = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce); //StationDBForWriteComm w_db_to = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace); //StationDB2ObjForWriteComm w_dbObj_to = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace); //妿ACK为trueï¼è¡¨ç¤ºä¸è½åä»»å¡ var readObj = this.View.R_StationForReadCommList.FirstOrDefault(x => x.StationCode == sourcePlce); if (readObj.R_ACK == true) { msg = "ACK为TRUEï¼ä¸å 许åä»»å¡"; return false; } // //StationDBForWriteComm w_db_to = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace); // //StationDB2ObjForWriteComm w_dbObj_to = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace); // //妿ACK为trueï¼è¡¨ç¤ºä¸è½åä»»å¡ // var readObj = this.View.R_StationForReadCommList.FirstOrDefault(x => x.StationCode == sourcePlce); // if (readObj.R_ACK == true) // { // msg = "ACK为TRUEï¼ä¸å 许åä»»å¡"; // return false; // } MessageModel b2 = null; if (!b2.result) { msg = string.Format("åStation{0},èµ·ç¹{1}åéä»»å¡{2},åå ¥ç®æ ç«ç¹{3}失败,è¿åç»æ:" + b2.resMsg, this.View.DeviceName, sourcePlce, taskId, toPlace); return false; } b2 = this.plcService.WriteValuePoint(w_db_source.W_TaskID, Convert.ToInt32(taskId), w_dbObj_source.W_TaskID); if (!b2.result) { msg = string.Format("åStation{0},èµ·ç¹{1}ï¼ç®æ ç¹{2},åå ¥ä»»å¡å·{3}失败,è¿åç»æ:" + b2.resMsg, this.View.DeviceName, sourcePlce, toPlace, taskId); return false; } // MessageModel b2 = null; // if (!b2.result) // { // msg = string.Format("åStation{0},èµ·ç¹{1}åéä»»å¡{2},åå ¥ç®æ ç«ç¹{3}失败,è¿åç»æ:" + b2.resMsg, this.View.DeviceName, sourcePlce, taskId, toPlace); // return false; // } // b2 = this.plcService.WriteValuePoint(w_db_source.W_TaskID, Convert.ToInt32(taskId), w_dbObj_source.W_TaskID); // if (!b2.result) // { // msg = string.Format("åStation{0},èµ·ç¹{1}ï¼ç®æ ç¹{2},åå ¥ä»»å¡å·{3}失败,è¿åç»æ:" + b2.resMsg, this.View.DeviceName, sourcePlce, toPlace, taskId); // return false; // } return true; } catch (Exception ex) { msg = ex.Message; Log4NetHelper.WriteErrorLog(Station_CacheEntity.curLogType, "åéä»»å¡åºç°å¼å¸¸:" + ex.Message, ex); return false; } // return true; //} //catch (Exception ex) //{ // msg = ex.Message; // Log4NetHelper.WriteErrorLog(Station_CacheEntity.curLogType, "åéä»»å¡åºç°å¼å¸¸:" + ex.Message, ex); // return false; //} } SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -19,7 +19,9 @@ /// <summary> /// åå ¥DB /// </summary> public static string W_DBHeaderWithSeparate = "610" + WareSdaStruct.PLCDBADDRESS_SEPARATE; public static string W_DBHeaderWithSeparate_BZ39 = "3002" + WareSdaStruct.PLCDBADDRESS_SEPARATE; public static string W_DBHeaderWithSeparate_BZ01 = "3001" + WareSdaStruct.PLCDBADDRESS_SEPARATE; /// <summary> /// 读åDB /// </summary> @@ -133,35 +135,45 @@ { //TODO:è¿éåé ç½®çDBå°å #region åå ¥ W_HandShake = W_DBHeaderWithSeparate + "0.0", W_1015_ReScan = R_DBHeader_ScanWithSeparate + "302.0", //1015ä½ç½®éæ°æ«ç ãEditBy shaocx,2022-05-02ã W_1019_ReScan = R_DBHeader_ScanWithSeparate + "368.0", //1019ä½ç½®éæ°æ«ç ï¼ ãEditBy shaocx,2022-05-02ã W_Station_FinishACK = W_DBHeaderWithSeparate + "146.0", // W_HandShake = W_DBHeaderWithSeparate + "0.0", W_1002_ScanFailACK = R_DBHeader_ScanWithSeparate + "66.1", W_1004_ScanFailACK = R_DBHeader_ScanWithSeparate + "126.1", W_1006_ScanFailACK = R_DBHeader_ScanWithSeparate + "186.1", W_1007_ScanFailACK = R_DBHeader_ScanWithSeparate + "246.1", W_1002_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "66.0", W_1004_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "126.0", W_1006_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "186.0", W_1007_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "246.0", W_Out_MaterialModel = W_DBHeaderForXigangGetDataWithSeparate + "0.0", W_Out_OrderNo = W_DBHeaderForXigangGetDataWithSeparate + "18.0", W_Out_SerialNumber = W_DBHeaderForXigangGetDataWithSeparate + "36.0", #endregion }; //åå ¥å°å _dbBlockForWrite.W_StationForWriteCommList = new List<StationDBForWriteComm>(); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = "1001", W_TaskID = W_DBHeaderWithSeparate + "6.0" }); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = "1002", W_TaskID = W_DBHeaderWithSeparate + "14.0" }); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = "1003", W_TaskID = W_DBHeaderWithSeparate + "22.0" }); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = StationLocationEnum.馿¬¡æ«ç å·¥ä½.ToString(), }); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = StationLocationEnum.BZ01.ToString(), W_DataFinish = W_DBHeaderWithSeparate_BZ01 + "0.0", W_KittingInfo = W_DBHeaderWithSeparate_BZ01 + "2.0", }); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = StationLocationEnum.BZ39.ToString(), W_DataFinish = W_DBHeaderWithSeparate_BZ39 + "0.0", W_InboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.1", W_Destination_In = W_DBHeaderWithSeparate_BZ39 + "2.0", W_Length = W_DBHeaderWithSeparate_BZ39 + "6.0", W_Width = W_DBHeaderWithSeparate_BZ39 + "8.0", W_Height = W_DBHeaderWithSeparate_BZ39 + "10.0", //åºåº W_ReqOut = W_DBHeaderWithSeparate_BZ39 + "12.0", W_Destination_Out = W_DBHeaderWithSeparate_BZ39 + "14.0", W_Mode = W_DBHeaderWithSeparate_BZ39 + "18.0", }); return _dbBlockForWrite; } @@ -244,67 +256,26 @@ #endregion }; //读åå°å double default_PH_1 = 2.0; double default_PH_2 = 2.1; double default_ACK = 2.2; double default_Model = 4.0; double default_State = 6.0; double default_AlarmCode = 8.0; double default_Destination = 10.0; double default_Shape = 12.0; double default_TaskID = 14.0; int addValue = 16; _dbBlockForRead.R_StationForReadCommList = new List<StationDBForReadComm>(); for (int i = 0; i < WareSdaStruct.StationStationList.Count; i++) _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm() { var stationCode = WareSdaStruct.StationStationList[i]; if (stationCode == "1019") { _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm() { StationCode = stationCode, R_PH_1 = R_DBHeaderWithSeparate + "350.0", R_PH_2 = R_DBHeaderWithSeparate + "350.1", R_ACK = R_DBHeaderWithSeparate + "350.2", R_Model = R_DBHeaderWithSeparate + ("352.0"), R_State = R_DBHeaderWithSeparate + ("354.0"), R_AlarmCode = R_DBHeaderWithSeparate + ("356.0"), R_Destination = R_DBHeaderWithSeparate + ("358.0"), R_Shape = R_DBHeaderWithSeparate + ("360.0"), R_TaskID = R_DBHeaderWithSeparate + ("362.0") }); } else { if (i > 0) { default_PH_1 += addValue; default_PH_2 += addValue; default_ACK += addValue; default_Model += addValue; default_State += addValue; default_AlarmCode += addValue; default_Destination += addValue; default_Shape += addValue; default_TaskID += addValue; } _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm() { StationCode = stationCode, R_PH_1 = R_DBHeaderWithSeparate + default_PH_1.ToString("0.0"), R_PH_2 = R_DBHeaderWithSeparate + default_PH_2.ToString("0.0") , R_ACK = R_DBHeaderWithSeparate + default_ACK.ToString("0.0"), R_Model = R_DBHeaderWithSeparate + default_Model.ToString("0.0"), R_State = R_DBHeaderWithSeparate + default_State.ToString("0.0"), R_AlarmCode = R_DBHeaderWithSeparate + default_AlarmCode.ToString("0.0"), R_Destination = R_DBHeaderWithSeparate + default_Destination.ToString("0.0"), R_Shape = R_DBHeaderWithSeparate + default_Shape.ToString("0.0"), R_TaskID = R_DBHeaderWithSeparate + default_TaskID.ToString("0.0") }); } } StationCode = StationLocationEnum.BZ01.ToString(), R_ReqParseData = W_DBHeaderWithSeparate_BZ01 + "50.0", R_ReadCodeResult = W_DBHeaderWithSeparate_BZ01 + "52.0", }); _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm() { StationCode = StationLocationEnum.BZ39.ToString(), R_ReqParseData = W_DBHeaderWithSeparate_BZ39 + "0.0", R_InboundFinish = W_DBHeaderWithSeparate_BZ39 + "50.1", R_OutboundFinish = W_DBHeaderWithSeparate_BZ39 + "50.2", R_ReadCodeResult = W_DBHeaderWithSeparate_BZ39 + "52.0", R_InboundNumber = W_DBHeaderWithSeparate_BZ39 + "104.0", R_OutboundNumber = W_DBHeaderWithSeparate_BZ39 + "108.0" }); return _dbBlockForRead; SDA/iWareSda/Model/StationLocationEnum.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,33 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace iWareModel { /// <summary> /// ç«ç¹æä¸¾ /// </summary> public enum StationLocationEnum { /// <summary> /// 269å·¥ä½ /// </summary> 馿¬¡æ«ç å·¥ä½ = 100, /// <summary> /// æ¸ ç°ï¼æ´æ¿åå·¥ä½ /// </summary> BZ01 = 101, /// <summary> /// è¡¥æ¿åå·¥ä½ /// </summary> BZ39 = 102, BZ12 = 103, BZ21 = 104 } } SDA/iWareSda/iWareSda.csproj
@@ -139,6 +139,7 @@ <Compile Include="Interface\IDevice.cs" /> <Compile Include="Model\DeviceWarningInfo.cs" /> <Compile Include="Model\SdaResEntity.cs" /> <Compile Include="Model\StationLocationEnum.cs" /> <Compile Include="PLCService\Default\AB_HslCommunicationService.cs" /> <Compile Include="PLCService\Default\Siemens_HslCommunicationService.cs" /> <Compile Include="PLCService\Models\BasePlcParam.cs" />