diff --git a/CU/Feeding.py b/CU/Feeding.py
index fa33d00..c487bb4 100644
--- a/CU/Feeding.py
+++ b/CU/Feeding.py
@@ -375,6 +375,7 @@ class Feeding(QObject):
logging.INFO,
f"[调试计数] 已进入 FMid 分支 {self.mid_take_count} 次"
)
+ #这里他写的中间点过完马上进行抓料，和整个流程不符合我就注释掉了，因为实际测试的时候还没到FTake的点他就进行了继电器关闭夹爪的抓取
#if self.feedStatus == FeedStatus.FTake:
#self.catch.catch_status = CatchStatus.CTake
diff --git a/CU/__pycache__/Feeding.cpython-39.pyc b/CU/__pycache__/Feeding.cpython-39.pyc
index d3bfb50..ef355e1 100644
Binary files a/CU/__pycache__/Feeding.cpython-39.pyc and b/CU/__pycache__/Feeding.cpython-39.pyc differ
diff --git a/MainWin.ui b/MainWin.ui
index 2bd935a..99ad8a8 100644
--- a/MainWin.ui
+++ b/MainWin.ui
@@ -6006,7 +6006,7 @@ font: 36pt "Microsoft YaHei UI";
color: rgb(255, 255, 255);
- 剩余袋数：
+ 已投袋数：
Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
diff --git a/Seting.ini b/Seting.ini
index 8c75d90..aee05bf 100644
--- a/Seting.ini
+++ b/Seting.ini
@@ -47,7 +47,7 @@ photo_v5 = 0.0
photo_w5 = 1.0
linecount = 2
remain_linename = 1
-remain_count = 999
+remain_count = 40
io_take_addr = 8
io_zip_addr = 11
io_shake_addr = 12
diff --git a/log/log.log b/log/log.log
index 45ae74d..8068bfb 100644
--- a/log/log.log
+++ b/log/log.log
@@ -9645,3 +9645,165 @@
2025-08-14 11:20:17 - ERROR - 发生报警：131
2025-08-14 11:20:17 - ERROR - 发生报警：131
2025-08-14 11:20:17 - ERROR - 发生报警：131
+2025-08-15 12:35:34 - INFO - 进入系统
+2025-08-15 12:35:38 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["switchTool","2"]}
+2025-08-15 12:35:38 - INFO - 切换到工具坐标
+2025-08-15 12:35:39 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["startButton","1"]}
+2025-08-15 12:35:39 - INFO - 切换到自动运行状态
+2025-08-15 12:35:47 - ERROR - 记录袋数失败
+2025-08-15 12:35:47 - ERROR - 'str' object has no attribute 'release'
+2025-08-15 12:36:13 - INFO - 进入系统
+2025-08-15 12:36:14 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["switchTool","2"]}
+2025-08-15 12:36:14 - INFO - 切换到工具坐标
+2025-08-15 12:36:15 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["startButton","1"]}
+2025-08-15 12:36:15 - INFO - 切换到自动运行状态
+2025-08-15 12:36:16 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["switchTool","2"]}
+2025-08-15 12:36:16 - INFO - 切换到工具坐标
+2025-08-15 12:36:16 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["startButton","1"]}
+2025-08-15 12:36:16 - INFO - 切换到自动运行状态
+2025-08-15 12:36:17 - INFO - 第一层确认生产
+2025-08-15 12:36:17 - INFO - 反应釜1:投料开始
+2025-08-15 12:36:17 - INFO - 发送命令{"dsID":"HCRemoteCommand","reqType":"AddRCC","emptyList":"0","instructions":[{"oneshot":"1","action":"200","type":"0","io_status":"1","point":"2","delay":"0"}]}
+2025-08-15 12:36:17 - INFO - 发送IO控制: 2，1
+2025-08-15 12:36:18 - INFO - 第一层确认生产
+2025-08-15 12:36:18 - INFO - 反应釜1:投料开始
+2025-08-15 12:36:19 - ERROR - 记录袋数失败
+2025-08-15 12:36:19 - ERROR - 'str' object has no attribute 'release'
+2025-08-15 12:36:27 - INFO - 进入系统
+2025-08-15 12:36:29 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["switchTool","2"]}
+2025-08-15 12:36:29 - INFO - 切换到工具坐标
+2025-08-15 12:36:29 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["startButton","1"]}
+2025-08-15 12:36:29 - INFO - 切换到自动运行状态
+2025-08-15 12:36:31 - INFO - 第一层确认生产
+2025-08-15 12:36:31 - INFO - 反应釜1:投料开始
+2025-08-15 12:36:32 - INFO - 发送命令{"dsID":"HCRemoteCommand","reqType":"AddRCC","emptyList":"0","instructions":[{"oneshot":"1","action":"200","type":"0","io_status":"1","point":"2","delay":"0"}]}
+2025-08-15 12:36:32 - INFO - 发送IO控制: 2，1
+2025-08-15 12:36:35 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["switchTool","2"]}
+2025-08-15 12:36:35 - INFO - 切换到工具坐标
+2025-08-15 12:36:35 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["startButton","1"]}
+2025-08-15 12:36:35 - INFO - 切换到自动运行状态
+2025-08-15 12:36:36 - INFO - 第一层确认生产
+2025-08-15 12:36:36 - INFO - 反应釜1:投料开始
+2025-08-15 12:36:36 - INFO - 发送命令{"dsID":"HCRemoteCommand","reqType":"AddRCC","emptyList":"0","instructions":[{"oneshot":"1","action":"200","type":"0","io_status":"0","point":"2","delay":"0"}]}
+2025-08-15 12:36:37 - INFO - 发送IO控制: 2，0
+2025-08-15 12:36:37 - INFO - 投料开始
+2025-08-15 12:36:47 - INFO - 增加投料次数
+2025-08-15 12:36:48 - INFO - 减少投料次数
+2025-08-15 12:36:52 - ERROR - 'str' object has no attribute 'release'
+2025-08-15 12:36:59 - ERROR - 无回复
+2025-08-15 12:37:10 - ERROR - 无回复
+2025-08-15 12:37:20 - ERROR - 无回复
+2025-08-15 12:37:30 - ERROR - 无回复
+2025-08-15 12:37:38 - INFO - 发送命令{"dsID":"HCRemoteCommand","reqType":"AddRCC","emptyList":"0","instructions":[{"oneshot":"1","action":"200","type":"0","io_status":"1","point":"2","delay":"0"}]}
+2025-08-15 12:37:38 - INFO - 发送IO控制: 2，1
+2025-08-15 12:37:41 - ERROR - 无回复
+2025-08-15 12:37:43 - INFO - 发送命令{"dsID":"HCRemoteCommand","reqType":"AddRCC","emptyList":"0","instructions":[{"oneshot":"1","action":"200","type":"0","io_status":"0","point":"2","delay":"0"}]}
+2025-08-15 12:37:43 - INFO - 发送IO控制: 2，0
+2025-08-15 12:37:51 - ERROR - 无回复
+2025-08-15 12:38:02 - ERROR - 无回复
+2025-08-15 12:38:12 - ERROR - 无回复
+2025-08-15 12:38:23 - ERROR - 无回复
+2025-08-15 12:38:33 - ERROR - 无回复
+2025-08-15 12:38:43 - ERROR - 无回复
+2025-08-15 12:38:54 - ERROR - 无回复
+2025-08-15 12:39:04 - ERROR - 无回复
+2025-08-15 12:39:15 - ERROR - 无回复
+2025-08-15 12:39:25 - ERROR - 无回复
+2025-08-15 12:39:35 - ERROR - 无回复
+2025-08-15 12:39:46 - ERROR - 无回复
+2025-08-15 12:39:56 - ERROR - 无回复
+2025-08-15 12:40:07 - ERROR - 无回复
+2025-08-15 12:40:17 - ERROR - 无回复
+2025-08-15 12:40:27 - ERROR - 无回复
+2025-08-15 12:40:38 - ERROR - 无回复
+2025-08-15 12:40:48 - ERROR - 无回复
+2025-08-15 12:40:59 - ERROR - 无回复
+2025-08-15 12:41:09 - ERROR - 无回复
+2025-08-15 12:41:19 - ERROR - 无回复
+2025-08-15 12:41:30 - ERROR - 无回复
+2025-08-15 12:41:40 - ERROR - 无回复
+2025-08-15 12:41:51 - ERROR - 无回复
+2025-08-15 12:42:01 - ERROR - 无回复
+2025-08-15 12:42:12 - ERROR - 无回复
+2025-08-15 12:42:22 - ERROR - 无回复
+2025-08-15 12:42:32 - ERROR - 无回复
+2025-08-15 12:42:43 - ERROR - 无回复
+2025-08-15 12:42:53 - ERROR - 无回复
+2025-08-15 12:43:04 - ERROR - 无回复
+2025-08-15 12:43:14 - ERROR - 无回复
+2025-08-15 12:43:24 - ERROR - 无回复
+2025-08-15 12:43:35 - ERROR - 无回复
+2025-08-15 12:43:45 - ERROR - 无回复
+2025-08-15 12:43:56 - ERROR - 无回复
+2025-08-15 12:44:06 - ERROR - 无回复
+2025-08-15 12:44:16 - ERROR - 无回复
+2025-08-15 12:44:27 - ERROR - 无回复
+2025-08-15 12:44:37 - ERROR - 无回复
+2025-08-15 12:44:48 - ERROR - 无回复
+2025-08-15 12:44:58 - ERROR - 无回复
+2025-08-15 12:45:09 - ERROR - 无回复
+2025-08-15 12:45:19 - ERROR - 无回复
+2025-08-15 12:45:29 - ERROR - 无回复
+2025-08-15 12:45:40 - ERROR - 无回复
+2025-08-15 12:45:50 - ERROR - 无回复
+2025-08-15 12:46:01 - ERROR - 无回复
+2025-08-15 12:46:11 - ERROR - 无回复
+2025-08-15 12:46:21 - ERROR - 无回复
+2025-08-15 12:46:32 - ERROR - 无回复
+2025-08-15 12:46:42 - ERROR - 无回复
+2025-08-15 12:46:53 - ERROR - 无回复
+2025-08-15 12:47:03 - ERROR - 无回复
+2025-08-15 12:47:13 - ERROR - 无回复
+2025-08-15 12:47:24 - ERROR - 无回复
+2025-08-15 12:47:34 - ERROR - 无回复
+2025-08-15 12:47:45 - ERROR - 无回复
+2025-08-15 12:47:55 - ERROR - 无回复
+2025-08-15 12:48:05 - ERROR - 无回复
+2025-08-15 12:48:16 - ERROR - 无回复
+2025-08-15 12:48:26 - ERROR - 无回复
+2025-08-15 12:48:37 - ERROR - 无回复
+2025-08-15 12:48:47 - ERROR - 无回复
+2025-08-15 12:48:58 - ERROR - 无回复
+2025-08-15 12:49:08 - ERROR - 无回复
+2025-08-15 12:49:18 - ERROR - 无回复
+2025-08-15 12:49:29 - ERROR - 无回复
+2025-08-15 12:49:39 - ERROR - 无回复
+2025-08-15 12:49:50 - ERROR - 无回复
+2025-08-15 12:50:00 - ERROR - 无回复
+2025-08-15 12:50:10 - ERROR - 无回复
+2025-08-15 12:50:21 - ERROR - 无回复
+2025-08-15 12:50:31 - ERROR - 无回复
+2025-08-15 12:50:42 - ERROR - 无回复
+2025-08-15 12:50:52 - ERROR - 无回复
+2025-08-15 12:51:02 - ERROR - 无回复
+2025-08-15 12:51:13 - ERROR - 无回复
+2025-08-15 12:51:23 - ERROR - 无回复
+2025-08-15 12:51:34 - ERROR - 无回复
+2025-08-15 12:51:44 - ERROR - 无回复
+2025-08-15 12:51:55 - ERROR - 无回复
+2025-08-15 12:52:05 - ERROR - 无回复
+2025-08-15 12:52:15 - INFO - 进入系统
+2025-08-15 12:52:20 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["switchTool","2"]}
+2025-08-15 12:52:20 - INFO - 切换到工具坐标
+2025-08-15 12:52:20 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["startButton","1"]}
+2025-08-15 12:52:20 - INFO - 切换到自动运行状态
+2025-08-15 12:52:23 - ERROR - 记录袋数失败
+2025-08-15 12:52:23 - ERROR - 'str' object has no attribute 'release'
+2025-08-15 12:52:48 - ERROR - 无回复
+2025-08-15 12:52:58 - ERROR - 无回复
+2025-08-15 12:53:08 - ERROR - 无回复
+2025-08-15 12:53:19 - ERROR - 无回复
+2025-08-15 12:53:29 - ERROR - 无回复
+2025-08-15 12:53:40 - ERROR - 无回复
+2025-08-15 12:53:50 - ERROR - 无回复
+2025-08-15 12:54:00 - ERROR - 无回复
+2025-08-15 12:54:11 - ERROR - 无回复
+2025-08-15 12:54:21 - ERROR - 无回复
+2025-08-15 12:54:32 - ERROR - 无回复
+2025-08-15 12:54:42 - ERROR - 无回复
+2025-08-15 12:54:52 - ERROR - 无回复
+2025-08-15 12:55:03 - ERROR - 无回复
+2025-08-15 12:55:13 - ERROR - 无回复
+2025-08-15 12:55:24 - ERROR - 无回复
+2025-08-15 12:55:34 - ERROR - 无回复
+2025-08-15 12:55:45 - ERROR - 无回复
diff --git a/main.py b/main.py
index 7f0df0e..bdd9d3c 100644
--- a/main.py
+++ b/main.py
@@ -909,7 +909,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
#提示
remain_messageBox = QMessageBox()
remain_messageBox.setIcon(QMessageBox.Icon.Warning)
- remain_messageBox.setText(f'还有{self.remain_Count}袋未投料，是否继续？')
+ remain_messageBox.setText(f'还有{self.remain_Count}袋未投料，是否继续？') # 这里返回多少袋没有投料
# remain_messageBox.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel)
ok_button = remain_messageBox.addButton("确定", PySide6.QtWidgets.QMessageBox.ButtonRole.AcceptRole)
cancel_button = remain_messageBox.addButton("取消", PySide6.QtWidgets.QMessageBox.ButtonRole.RejectRole)
@@ -922,9 +922,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
current_index = self.comboBox_lineIndex.findText(line_name)
self.comboBox_lineIndex.setCurrentIndex(current_index)
- #self.horizontalSlider_feedingNum.setMaximum(self.remain_Count)
self.horizontalSlider_feedingNum.setMaximum(self.remain_Count)
- self.label_maxNum.setText(str(self.remain_Count))
+ self.label_maxNum.setText(str(self.remain_Count)) #目标投料袋数设置为setini文件中保存的remain_count
self.horizontalSlider_feedingNum.setValue(0)
self.send_startFeed_button_click()
@@ -1499,8 +1498,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
else:
self.set_run_status_button(False)
if self.feeding.feedConfig!=None:
- self.label_remain_num.setText(str(self.feeding.feedConfig.num))
-
+ #修改点1：这里修改显示剩余袋数的逻辑
+ #原来的逻辑是显示剩余袋数：self.label_remain_num.setText(self.feeding.feedConfig.num))
+ #我改成了目标袋数减剩余袋数就是已经投料的袋数self.label_remain_num.setText(str(self.horizontalSlider_feedingNum.maximum()-self.feeding.feedConfig.num))
+ self.label_remain_num.setText(str(self.horizontalSlider_feedingNum.maximum()-self.feeding.feedConfig.num))
if self.feeding.feedStatus == FeedStatus.FNone:
self.stackedWidget_num.setCurrentIndex(0)
else:
@@ -2066,13 +2067,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if index == 3:
self.updateUI_Base_Set()
+ #修改点2：设置一键投料的目标袋数从999设置到40袋
def send_onekeyfeed_button_click(self):
# if self.feeding.feedStatus != FeedStatus.FNone:
# self.show_infomessage_box("正在执行")
# return
- self.horizontalSlider_feedingNum.setMaximum(999)
- self.label_maxNum.setText(str(999))
+ self.horizontalSlider_feedingNum.setMaximum(40)
+ self.label_maxNum.setText(str(40))
self.horizontalSlider_feedingNum.setValue(0)
self.send_startFeed_button_click()
@@ -2112,7 +2114,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.robotClient.close()
log.log_message(logging.INFO, Constant.str_sys_exit)
-
+ #记录投料袋数
def record_remain_num(self):
try:
self.configReader = configparser.ConfigParser()