diff --git a/sf_manufacturing/models/res_config_setting.py b/sf_manufacturing/models/res_config_setting.py
index d6b029c6..f3a87ca4 100644
--- a/sf_manufacturing/models/res_config_setting.py
+++ b/sf_manufacturing/models/res_config_setting.py
@@ -5,14 +5,25 @@ class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings'
is_agv_task_dispatch = fields.Boolean('是否下发AGV任务', default=False)
+ wbcode = fields.Char('地码')
+ agv_code = fields.Char(string='agv编号')
+ agv_rcs_url = fields.Char(string='avg_rcs访问地址',
+ default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
@api.model
def get_values(self):
values = super(ResConfigSettings, self).get_values()
config = self.env['ir.config_parameter'].sudo()
+ agv_rcs_url = config.get_param('agv_rcs_url', default='')
+ wbcode = config.get_param('wbcode', default='')
+ agv_code = config.get_param('agv_code', default='')
is_agv_task_dispatch = config.get_param('is_agv_task_dispatch')
+
values.update(
is_agv_task_dispatch=is_agv_task_dispatch,
+ agv_code=agv_code,
+ agv_rcs_url=agv_rcs_url,
+ wbcode=wbcode,
)
return values
@@ -20,3 +31,6 @@ class ResConfigSettings(models.TransientModel):
super(ResConfigSettings, self).set_values()
config = self.env['ir.config_parameter'].sudo()
config.set_param("is_agv_task_dispatch", self.is_agv_task_dispatch or False)
+ config.set_param("agv_rcs_url", self.agv_rcs_url or "")
+ config.set_param("wbcode", self.wbcode or "")
+ config.set_param("agv_code", self.agv_code or "")
diff --git a/sf_manufacturing/views/res_config_settings_views.xml b/sf_manufacturing/views/res_config_settings_views.xml
index 89738492..dbd29b41 100644
--- a/sf_manufacturing/views/res_config_settings_views.xml
+++ b/sf_manufacturing/views/res_config_settings_views.xml
@@ -6,8 +6,28 @@
res.config.settings
-
-
+
+
+
AGV参数配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index c6f19502..ca7c667e 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -16,13 +16,10 @@ class ResConfigSettings(models.TransientModel):
token = fields.Char(string='TOKEN', default='b811ac06-3f00-11ed-9aed-0242ac110003')
sf_secret_key = fields.Char(string='密钥', default='wBmxej38OkErKhD6')
sf_url = fields.Char(string='访问地址', default='https://sf.cs.jikimo.com')
- agv_rcs_url = fields.Char(string='avg_rcs访问地址',
- default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
center_control_url = fields.Char(string='中控访问地址',
default='http://172.16.21.50:8001')
center_control_Authorization = fields.Char(string='中控访问认证')
- wbcode = fields.Char('地码')
- agv_code = fields.Char(string='agv编号')
+
task_type_no = fields.Char('任务单类型编号')
model_parser_url = fields.Char('特征识别路径')
ftp_host = fields.Char(string='FTP的ip')
@@ -103,9 +100,7 @@ class ResConfigSettings(models.TransientModel):
token = config.get_param('token', default='')
sf_secret_key = config.get_param('sf_secret_key', default='')
sf_url = config.get_param('sf_url', default='')
- agv_rcs_url = config.get_param('agv_rcs_url', default='')
- wbcode = config.get_param('wbcode', default='')
- agv_code = config.get_param('agv_code', default='')
+
center_control_url = config.get_param('center_control_url', default='')
center_control_Authorization = config.get_param('center_control_Authorization', default='')
ftp_host = config.get_param('ftp_host', default='')
@@ -137,9 +132,6 @@ class ResConfigSettings(models.TransientModel):
ir_config.set_param("token", self.token or "")
ir_config.set_param("sf_secret_key", self.sf_secret_key or "")
ir_config.set_param("sf_url", self.sf_url or "")
- ir_config.set_param("agv_rcs_url", self.agv_rcs_url or "")
- ir_config.set_param("wbcode", self.wbcode or "")
- ir_config.set_param("agv_code", self.agv_code or "")
ir_config.set_param("center_control_url", self.center_control_url or "")
ir_config.set_param("center_control_Authorization", self.center_control_Authorization or "")
ir_config.set_param("ftp_host", self.ftp_host or "")
diff --git a/sf_mrs_connect/views/res_config_settings_views.xml b/sf_mrs_connect/views/res_config_settings_views.xml
index 651e6f15..a7327ed1 100644
--- a/sf_mrs_connect/views/res_config_settings_views.xml
+++ b/sf_mrs_connect/views/res_config_settings_views.xml
@@ -74,28 +74,7 @@
-
-
AGV参数配置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+