1.优化产品页面

2.优化agv回调接口且新增agv参数配置
3.优化工件配送

sf_base/security/ir.model.access.csv

@@ -74,10 +74,14 @@ access_sf_cutting_speed_admin,sf_cutting_speed_admin,model_sf_cutting_speed,base
 access_sf_cutting_speed_group_purchase_director,sf_cutting_speed_group_purchase_director,model_sf_cutting_speed,sf_base.group_purchase_director,1,1,1,0
 access_sf_cutting_speed_group_sale_director,sf_cutting_speed_group_sale_director,model_sf_cutting_speed,sf_base.group_sale_director,1,1,1,0
 access_sf_cutting_speed_group_plan_director,sf_cutting_speed_group_plan_director,model_sf_cutting_speed,sf_base.group_plan_director,1,1,1,0
+access_sf_cutting_speed_group_quality_director,sf_cutting_speed_group_quality_director,model_sf_cutting_speed,sf_base.group_quality_director,1,1,1,0
+access_sf_cutting_speed_group_quality,sf_cutting_speed_group_quality,model_sf_cutting_speed,sf_base.group_quality,1,1,1,0
 access_sf_feed_per_tooth_group_purchase_director,sf_feed_per_tooth_group_purchase_director,model_sf_feed_per_tooth,sf_base.group_purchase_director,1,1,0,0
 access_sf_feed_per_tooth_group_sale_director,sf_feed_per_tooth_group_sale_director,model_sf_feed_per_tooth,sf_base.group_sale_director,1,1,0,0
 access_sf_feed_per_tooth_group_plan_director,sf_feed_per_tooth_group_plan_director,model_sf_feed_per_tooth,sf_base.group_plan_director,1,1,0,0
 access_sf_feed_per_tooth_group_sale_salemanager,sf_feed_per_tooth_group_sale_salemanager,model_sf_feed_per_tooth,sf_base.group_sale_salemanager,1,0,0,0
+access_sf_feed_per_tooth_group_quality,sf_feed_per_tooth_group_quality,model_sf_feed_per_tooth,sf_base.group_quality,1,1,1,0
+access_sf_feed_per_tooth_group_quality_director,sf_feed_per_tooth_group_quality_director,model_sf_feed_per_tooth,sf_base.group_quality_director,1,1,1,0
 access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,0
 access_sf_feed_per_tooth_admin,sf_feed_per_tooth_admin,model_sf_feed_per_tooth,base.group_system,1,1,1,0
 access_sf_ramping_angle,sf_ramping_angle,model_sf_ramping_angle,base.group_user,1,1,1,1
@@ -141,9 +145,7 @@ access_sf_cutting_width_depth,sf_cutting_width_depth,model_sf_cutting_width_dept
 access_sf_cutting_width_depth_group_purchase,sf_cutting_width_depth_group_purchase,model_sf_cutting_width_depth,sf_base.group_purchase,1,0,0,0
 access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1
 access_purchase_order_group_purchase,access_purchase_order_group_purchase,purchase.model_purchase_order,sf_base.group_purchase,1,1,1,0
-access_purchase_order_group_purchase_director,access_purchase_order_group_purchase_director,purchase.model_purchase_order,sf_base.group_purchase_director,1,1,1,0
 access_purchase_order_line_group_purchase,access_purchase_order_line_group_purchase,purchase.model_purchase_order_line,sf_base.group_purchase,1,1,1,0
-access_purchase_order_line_group_purchase_director,access_purchase_order_line_group_purchase_director,purchase.model_purchase_order_line,sf_base.group_purchase_director,1,1,1,0
 access_spindle_taper_type,spindle_taper_type,model_spindle_taper_type,base.group_user,1,1,1,1
 access_sf_tool_groups_group_plan_dispatch,sf_tool_groups,model_sf_tool_groups,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_tool_groups_group_sf_tool_user,sf_tool_groups,model_sf_tool_groups,sf_base.group_sf_tool_user,1,1,1,1

sf_dlm_management/views/product_template_management_view.xml

@@ -90,7 +90,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_product_template_form_inherit_sf">
+        <record model="ir.ui.view" id="view_product_template_only_form_inherit_sf">
             <field name="name">product.template.only.form.inherit.sf</field>
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
@@ -104,7 +104,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_product_template_only_form_inherit_sf">
+        <record model="ir.ui.view" id="view_product_template_only_dlm_form_inherit_sf">
             <field name="name">product.template.only.form.inherit.sf</field>
             <field name="model">product.template</field>
             <field name="inherit_id" ref="sf_dlm_management.view_sale_product_template_form_inherit_sf"/>

sf_manufacturing/controllers/__init__.py

@@ -1 +1,2 @@
 from . import controllers
+from . import workpiece

sf_manufacturing/controllers/workpiece.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+import logging
+import json
+from odoo import http
+from odoo.http import request
+
+
+class Workpiece(http.Controller):
+
+    @http.route('/agvApi/backfeed', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def backfeed(self, **kw):
+        """
+        agv小车反馈工单(工件)结果
+        :param kw:
+        :return:
+        """
+        logging.info('backfeed:%s' % kw)
+        try:
+            res = {'Succeed': True}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            logging.info('backfeed-ret:%s' % ret)
+            if 'reqCode' in ret:
+                if 'method' in ret:
+                    if ret['method'] == 'end':
+                        workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+                            [('production_id.name', '=', ret['reqCode'])])
+                        if workpiece_delivery:
+                            workpiece_delivery.write({'status': '已配送', 'task_completion_time': ret['reqTime']})
+                        else:
+                            res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该reqCode暂未查到对应的工件配送记录'}
+                else:
+                    res = {'Succeed': False, 'ErrorCode': 204, 'Error': '未传method字段'}
+            else:
+                res = {'Succeed': False, 'ErrorCode': 201, 'Error': '未传reqCode字段'}
+        except Exception as e:
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+            logging.info('backfeed error:%s' % e)
+        return json.JSONEncoder().encode(res)

sf_manufacturing/models/mrp_workorder.py

@@ -235,7 +235,16 @@ class ResMrpWorkOrder(models.Model):
                 # if not item.workpiece_code:
                 #     raise UserError('请对【同运工件】进行扫描')
                 else:
-                    item.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+                    if item.status == '待下发':
+                        return {
+                            'name': _('确认'),
+                            'type': 'ir.actions.act_window',
+                            'view_mode': 'form',
+                            'res_model': 'sf.workpiece.delivery.wizard',
+                            'target': 'new',
+                            'context': {
+                                'default_workorder_id': self.id,
+                            }}
 
     # 拼接工单对象属性值
     def json_workorder_str(self, k, production, route):
@@ -897,7 +906,25 @@ class WorkPieceDelivery(models.Model):
 
     # 配送至avg小车
     def _delivery_avg(self):
-        self.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+        res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '',
+               'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': '', 'positionCodePath': [], 'podCode': '',
+               'podDir': '', 'materialLot': '', 'priority': '', 'taskCode': '', 'agvCode': '', 'materialLot': '',
+               'data': ''}
+        config = self.env['res.config.settings'].get_values()
+        try:
+            logging.info('config-AGV请求路径:%s' % config['agv_rcms_url'])
+            logging.info('config-json:%s' % res)
+            ret = requests.post((config['agv_rcms_url']), json=res)
+            ret = ret.json()
+            logging.info('config-ret:%s' % ret)
+            if ret['code'] == 0:
+                if self.production_id.name == ret['reqCode']:
+                    self.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+            else:
+                raise UserError(ret['message'])
+        except Exception as e:
+            logging.info('config-e:%s' % e)
+            raise UserError("工件配送请求agv失败")
 
     @api.depends('production_id.production_line_id')
     def _compute_production_line_id(self):

sf_manufacturing/views/mrp_workorder_view.xml

@@ -539,7 +539,7 @@
         <field name="arch" type="xml">
             <tree string="工件配送">
                 <header>
-                    <button name="button_delivery" type="object" string="配送"/>
+                    <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
                 </header>
                 <field name="status" widget="badge"
                        decoration-success="status == '已配送'"

sf_manufacturing/wizard/workpiece_delivery_views.xml

@@ -6,6 +6,8 @@
         <field name="arch" type="xml">
             <form>
                 <field name="delivery_id" invisible="True"/>
+                <field name="workorder_id" invisible="True"/>
+
                 <div>
                     是否确定配送？
                 </div>

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -10,7 +10,11 @@ class WorkpieceDeliveryWizard(models.TransientModel):
     _description = '工件配送'
 
     delivery_id = fields.Many2one('sf.workpiece.delivery', string='配送')
+    workorder_id = fields.Many2one('mrp.workorder', string='工单')
 
     def confirm(self):
-        self.delivery_id._delivery_avg()
+        if self.workorder_id:
+            self.workorder_id.workpiece_delivery_ids._delivery_avg()
+        else:
+            self.delivery_id._delivery_avg()
 

sf_mrs_connect/models/res_config_setting.py

@@ -13,7 +13,9 @@ 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_url = fields.Char(string='avg访问地址', default='http://IP:PORT/rcms/services/rest')
+    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')
     model_parser_url = fields.Char('特征识别路径')
     ftp_host = fields.Char(string='FTP的ip')
     ftp_port = fields.Char(string='FTP端口')
@@ -90,6 +92,8 @@ 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='')
         ftp_host = config.get_param('ftp_host', default='')
         ftp_port = config.get_param('ftp_port', default='')
         ftp_user = config.get_param('ftp_user', default='')
@@ -99,6 +103,8 @@ 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,
             ftp_host=ftp_host,
             ftp_port=ftp_port,
             ftp_user=ftp_user,
@@ -112,6 +118,8 @@ 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("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 "")

sf_mrs_connect/views/res_config_settings_views.xml

@@ -74,9 +74,26 @@
                             </div>
                         </div>
                     </div>
+                    <div>
+                        <h2>AGV参数配置</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="agv_rcms_url" string="调度系统(cms)访问地址"/>
+                                        <field name="agv_rcms_url"/>
+                                    </div>
+                                    <div class="text-muted">
+                                        <label for="agv_rcs_url" string="RCS-2000系统访问地址"/>
+                                        <field name="agv_rcs_url"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </xpath>
             </field>
         </record>
-
     </data>
 </odoo>