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

1.优化agv配置及接口：新增站点集合对象，agv车辆编号及任务单类型编号字段

Browse Source 
2.优化rfid和工单部分需求：点完工按钮，若为工件装夹工单，完工需校验工件坯料、RFID码、前置三元定位是否填写；若未填写，页面弹出对应提示，反之则需要二次确认弹窗
3.新增最初版的快速订单：为了工厂测试下单走流程
4.工单优化：新增检测结果和是否重新生成制造订单字段
This commit is contained in:
jinling.yang
2024-04-08 16:39:26 +08:00
parent f4f1c9f839
commit 07230703d8
8 changed files with 397 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sf_mrs_connect/models/res_config_setting.py
View File

@@ -13,10 +13,11 @@ 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_rcms_url = fields.Char(string='avg_rcms访问地址',
default='http://IP:PORT/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
agv_rcs_url = fields.Char(string='avg_rcs访问地址', default='http://IP:PORT/xxx/agv/agvCallbackService/agvCallback')
agv_rcs_url = fields.Char(string='avg_rcs访问地址',
default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
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')
ftp_port = fields.Char(string='FTP端口')
@@ -95,8 +96,9 @@ 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_rcms_url = config.get_param('agv_rcms_url', default='')
agv_rcs_url = config.get_param('agv_rcs_url', default='')
agv_code = config.get_param('agv_code', default='')
task_type_no = config.get_param('task_type_no', 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='')
@@ -106,8 +108,9 @@ class ResConfigSettings(models.TransientModel):
token=token,
sf_secret_key=sf_secret_key,
sf_url=sf_url,
agv_rcms_url=agv_rcms_url,
agv_rcs_url=agv_rcs_url,
agv_code=agv_code,
task_type_no=task_type_no,
ftp_host=ftp_host,
ftp_port=ftp_port,
ftp_user=ftp_user,
@@ -121,9 +124,18 @@ 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_rcms_url", self.agv_rcms_url or "")
ir_config.set_param("agv_rcs_url", self.agv_rcs_url 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("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站点'
type = fields.Selection([('00', '位置编号'), ('01', '库区编号'), ('02', '货架编号')], '类型')
content = fields.Char('内容')

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

@@ -1,5 +1,6 @@
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
3 access_res_agv_site access_res_agv_site model_res_agv_site base.group_system 1 1 1 1
4
5
6

32
sf_mrs_connect/views/res_config_settings_views.xml
View File

@@ -1,6 +1,26 @@
<?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="type"/>
<field name="content"/>
</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>
@@ -84,10 +104,22 @@
<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"/>
</div>
<div class="text-muted">
<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>