fix

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -2036,6 +2036,58 @@ namespace IMCS.CCS.Services
                     return responseData;
                 }
 
+
+                //=========================上下料站请求判断 开始======================
+                // 目标点位是上下料站的判断下料请求是否为true，上料请求为false,
+                // 如果不是判断上料请求是否为true，
+                // 是提示状态不对，否则写下料请求状态
+
+                // 下料允许
+                if (cutterTakeRequest.ContainsKey(req.data.location))
+                {
+
+                    string shangliaoqingqiuDB = cutterPutRequest[req.data.location];
+                    string xialiaoqingqiuDB = cutterTakeRequest[req.data.location];
+                    string shangliaoyunxuDB = cutterPutStatus[req.data.location];
+                    string xialiaoyunxuDB = cutterTakeStatus[req.data.location];
+
+                    string shangliaoqingqiu = s7.ReadBool(shangliaoqingqiuDB).Content.ToString();
+                    string xialiaoqingqiu = s7.ReadBool(xialiaoqingqiuDB).Content.ToString();
+                    string shangliaoyunxu = s7.ReadBool(shangliaoyunxuDB).Content.ToString();
+                    string xialiaoyunxu = s7.ReadBool(xialiaoyunxuDB).Content.ToString();
+
+                    if (shangliaoqingqiu == "False" && xialiaoqingqiu == "False")
+                    {
+                        s7.Write(xialiaoqingqiuDB, true);
+                        s7.ConnectClose();
+                        Log.Instance.WriteLogAdd(ActionTypeEnum.CutterRobotAction + "====已发送下料请求，等待下料允许====" + JsonConvert.SerializeObject(req),
+                        EnumHelper.GetDescription(ActionTypeEnum.CutterRobotAction));
+                        responseData.result = "false";
+                        responseData.resultMsg = "已发送下料请求，等待下料允许";
+                        return responseData;
+                    }
+                    else if (shangliaoqingqiu == "True" && xialiaoqingqiu == "False")
+                    {
+                        s7.ConnectClose();
+                        Log.Instance.WriteLogAdd(ActionTypeEnum.CutterRobotAction + "====状态不对，现在上料请求状态，等待上料任务完成====" + JsonConvert.SerializeObject(req),
+                        EnumHelper.GetDescription(ActionTypeEnum.CutterRobotAction));
+                        responseData.result = "false";
+                        responseData.resultMsg = "已被上料请求占用，等待上料任务完成";
+                        return responseData;
+                    }
+                    else if (xialiaoqingqiu == "True" && xialiaoyunxu == "False")
+                    {
+                        s7.ConnectClose();
+                        Log.Instance.WriteLogAdd(ActionTypeEnum.CutterRobotAction + "====已经发送下料请求，下料允许状态不满足====" + JsonConvert.SerializeObject(req),
+                        EnumHelper.GetDescription(ActionTypeEnum.CutterRobotAction));
+                        responseData.result = "false";
+                        responseData.resultMsg = "已经发送下料请求，下料允许状态不满足";
+                        return responseData;
+                    }
+                }
+                //=========================上下料站请求判断 结束======================
+
+
                 // 查询需要操作的plc的db块
                 CcsActionAddress actionAddressQuery = new CcsActionAddress();
                 actionAddressQuery.ActionId = actionInfo.Id;
@@ -2120,6 +2172,58 @@ namespace IMCS.CCS.Services
                     return responseData;
                 }
 
+
+                //=========================上下料站请求判断 开始======================
+                // 目标点位是上下料站的判断下料请求是否为true，上料请求为false,
+                // 如果不是判断上料请求是否为true，
+                // 是提示状态不对，否则写下料请求状态
+                // 上料料请求
+                if (cutterPutRequest.ContainsKey(req.data.location))
+                {
+                    string shangliaoqingqiuDB = cutterPutRequest[req.data.location];
+                    string xialiaoqingqiuDB = cutterTakeRequest[req.data.location];
+                    string shangliaoyunxuDB = cutterPutStatus[req.data.location];
+                    string xialiaoyunxuDB = cutterTakeStatus[req.data.location];
+
+                    string shangliaoqingqiu = s7.ReadBool(shangliaoqingqiuDB).Content.ToString();
+                    string xialiaoqingqiu = s7.ReadBool(xialiaoqingqiuDB).Content.ToString();
+                    string shangliaoyunxu = s7.ReadBool(shangliaoyunxuDB).Content.ToString();
+                    string xialiaoyunxu = s7.ReadBool(xialiaoyunxuDB).Content.ToString();
+
+                    if (shangliaoqingqiu == "False" && xialiaoqingqiu == "False")
+                    {
+                        s7.Write(shangliaoqingqiuDB, true);
+                        s7.ConnectClose();
+                        Log.Instance.WriteLogAdd(ActionTypeEnum.CutterRobotAction + "====已发送上料请求，等待上料允许====" + JsonConvert.SerializeObject(req),
+                        EnumHelper.GetDescription(ActionTypeEnum.CutterRobotAction));
+                        responseData.result = "false";
+                        responseData.resultMsg = "已发送上料请求，等待上料允许";
+                        return responseData;
+                    }
+                    else if (shangliaoqingqiu == "False" && xialiaoqingqiu == "True")
+                    {
+                        s7.ConnectClose();
+                        Log.Instance.WriteLogAdd(ActionTypeEnum.CutterRobotAction + "====状态不对，现在下料请求状态，等待下料任务完成====" + JsonConvert.SerializeObject(req),
+                        EnumHelper.GetDescription(ActionTypeEnum.CutterRobotAction));
+                        responseData.result = "false";
+                        responseData.resultMsg = "已被下料请求占用，等待下料任务完成";
+                        return responseData;
+                    }
+                    else if (shangliaoqingqiu == "True" && shangliaoyunxu == "False")
+                    {
+                        s7.ConnectClose();
+                        Log.Instance.WriteLogAdd(ActionTypeEnum.CutterRobotAction + "====已经发送上料请求，上料允许状态不满足====" + JsonConvert.SerializeObject(req),
+                        EnumHelper.GetDescription(ActionTypeEnum.CutterRobotAction));
+                        responseData.result = "false";
+                        responseData.resultMsg = "已经发送上料请求，上料允许状态不满";
+                        return responseData;
+                    }
+
+                }
+                //=========================上下料站请求判断 结束======================
+
+
+
                 // 根据ip查询配置的字节数据
                 CcsAction actionQuery = new CcsAction();
                 actionQuery.OperateType = "CutterPut" + req.data.location.ToString();