jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化agv相关页面及对应接口

Browse Source
This commit is contained in:
jinling.yang
2024-04-22 22:30:05 +08:00
parent b526565ac4
commit 9a157125ba
20 changed files with 213 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sf_mrs_connect/models/res_config_setting.py
View File

@@ -15,6 +15,8 @@ class ResConfigSettings(models.TransientModel):
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')
wbcode = fields.Char('地码')
agv_code = fields.Char(string='agv编号')
task_type_no = fields.Char('任务单类型编号')
@@ -99,7 +101,7 @@ class ResConfigSettings(models.TransientModel):
agv_rcs_url = config.get_param('agv_rcs_url', default='')
wbcode = config.get_param('wbcode', default='')
agv_code = config.get_param('agv_code', default='')
task_type_no = config.get_param('task_type_no', default='')
center_control_url = config.get_param('center_control_url', default='')
ftp_host = config.get_param('ftp_host', default='')
ftp_port = config.get_param('ftp_port', default='')
ftp_user = config.get_param('ftp_user', default='')
@@ -112,7 +114,7 @@ class ResConfigSettings(models.TransientModel):
agv_rcs_url=agv_rcs_url,
wbcode=wbcode,
agv_code=agv_code,
task_type_no=task_type_no,
center_control_url=center_control_url,
ftp_host=ftp_host,
ftp_port=ftp_port,
ftp_user=ftp_user,
@@ -129,31 +131,8 @@ class ResConfigSettings(models.TransientModel):
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("task_type_no", self.task_type_no or "")
ir_config.set_param("center_control_url", self.center_control_url or "")
ir_config.set_param("ftp_host", self.ftp_host or "")
ir_config.set_param("ftp_port", self.ftp_port or "")
ir_config.set_param("ftp_user", self.ftp_user or "")
ir_config.set_param("ftp_password", self.ftp_password or "")
class ResAgvSite(models.Model):
_name = 'res.agv.site'
_description = 'agv站点'
number = fields.Integer('编号')
type = fields.Selection([('00', '位置编号'), ('01', '库区编号'), ('02', '货架编号')], '类型')
content = fields.Char('内容')
site_prop = fields.Selection([('上产线', '上产线'), ('下产线', '下产线')], '属性')
state_status = fields.Selection([('占用', '占用'), ('空闲', '空闲')], '状态')
# remark = fields.Char
active = fields.Boolean('有效', default=True)
# @api.model
# def create(self, vals):
# if vals.get('number', 'new') == 'new':
# vals['number'] = self.env['ir.sequence'].next_by_code('res.agv.site') or '/'
# return super(ResAgvSite, self).create(vals)
def unlink(self):
for item in self:
item.active == True

1
sf_mrs_connect/security/ir.model.access.csv
View File

@@ -1,6 +1,5 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_static_resource_datasync,sf_static_resource_datasync,model_sf_static_resource_datasync,base.group_user,1,1,1,1
access_res_agv_site,access_res_agv_site,model_res_agv_site,base.group_system,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_sf_static_resource_datasync sf_static_resource_datasync model_sf_static_resource_datasync base.group_user 1 1 1 1
access_res_agv_site access_res_agv_site model_res_agv_site base.group_system 1 1 1 1
3
4
5

42
sf_mrs_connect/views/res_config_settings_views.xml
View File

@@ -1,28 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="view_agv_site_tree" model="ir.ui.view">
<field name="name">agv站点集合</field>
<field name="model">res.agv.site</field>
<field name="arch" type="xml">
<tree editable="bottom">
<field name="number"/>
<field name="type"/>
<field name="content"/>
<field name="state_status"/>
</tree>
</field>
</record>
<record id="action_agv_site_form" model="ir.actions.act_window">
<field name="name">站点集合</field>
<field name="res_model">res.agv.site</field>
<field name="view_mode">tree</field>
</record>
<menuitem id="menu_action_agv_site_form" action="sf_mrs_connect.action_agv_site_form" name="站点集合"
sequence="11"/>
<record id="res_config_settings_view_form_sf_sync" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.sf_sync</field>
<field name="model">res.config.settings</field>
@@ -106,10 +84,6 @@
<label for="agv_rcs_url" string="访问地址"/>
<field name="agv_rcs_url"/>
</div>
<div class="text-muted">
<label for="task_type_no"/>
<field name="task_type_no"/>
</div>
<div class="text-muted">
<label for="agv_code" string="车辆编号"/>
<field name="agv_code"/>
@@ -118,9 +92,19 @@
<label for="wbcode"/>
<field name="wbcode"/>
</div>
<div class="mt8">
<button type="action" name="%(sf_mrs_connect.action_agv_site_form)d"
string="站点集合" class="btn-link" icon="fa-arrow-right"/>
</div>
</div>
</div>
</div>
<div>
<h2>中控参数配置</h2>
<div class="row mt16 o_settings_container">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<div class="text-muted">
<label for="center_control_url" string="访问地址"/>
<field name="center_control_url"/>
</div>
</div>
</div>