1.优化产品页面

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

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()