1.新增工件配送向导2.修复采购审核按钮不可见3.配置中新增agv路径字段4.优化工单上按钮显示条件

sf_manufacturing/models/mrp_workorder.py

@@ -132,6 +132,7 @@ class ResMrpWorkOrder(models.Model):
     production_line = fields.Char(string="生产线")
     preset_program_information = fields.Char(string="预调程序信息")
     workpiece_delivery_ids = fields.One2many('sf.workpiece.delivery', 'workorder_id', '工件配送')
+    is_delivery = fields.Boolean('是否配送完成',default=False)
 
     @api.onchange('is_ok')
     def _onchange_inspection_user_id(self):
@@ -196,8 +197,10 @@ class ResMrpWorkOrder(models.Model):
             work = workorder.production_id.workorder_ids
             work.compensation_value_x = eval(self.material_center_point)[0]
             work.compensation_value_y = eval(self.material_center_point)[1]
+            workorder.workpiece_delivery_ids[0].write({
+                'status': '待下发'
+            })
             workorder.button_finish()
-
         except:
             raise UserError("参数计算有误")
 
@@ -212,7 +215,7 @@ class ResMrpWorkOrder(models.Model):
                     if not item.workpiece_code:
                         raise UserError('请对【同运工件】进行扫描')
                     else:
-                        item.write({'task_delivery_time': fields.Datetime.now()})
+                        item.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
 
     # 拼接工单对象属性值
     def json_workorder_str(self, k, production, route):
@@ -788,7 +791,7 @@ class WorkPieceDelivery(models.Model):
     workorder_id = fields.Many2one('mrp.workorder', string='工单', readonly=True)
     production_id = fields.Many2one('mrp.production', string='制造订单', readonly=True)
     production_line_id = fields.Many2one('sf.production.line', compute='_compute_production_line_id',
-                                         string='目标生产线', readonly=True,
+                                         string='目的生产线', readonly=True,
                                          store=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间', readonly=True)
     workpiece_code = fields.Char('同运工件编码')
@@ -797,8 +800,28 @@ class WorkPieceDelivery(models.Model):
     task_delivery_time = fields.Datetime('任务下发时间')
     task_completion_time = fields.Datetime('任务完成时间')
     delivery_time = fields.Char('配送时长', compute='_compute_delivery_time')
-    status = fields.Selection([('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态',
-                              default='待下发')
+    status = fields.Selection(
+        [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态',
+        default='待下发')
+
+    # 工件配送
+    def button_delivery(self):
+        if self.status == '待下发':
+            return {
+                'name': _('确认'),
+                'type': 'ir.actions.act_window',
+                'view_mode': 'form',
+                'res_model': 'sf.workpiece.delivery.wizard',
+                'target': 'new',
+                'context': {
+                    'default_delivery_id': self.id,
+                }}
+        else:
+            raise UserError('状态为【待下发】的工件记录可进行配送')
+
+    # 配送至avg小车
+    def _delivery_avg(self):
+        self.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
 
     @api.depends('production_id.production_line_id')
     def _compute_production_line_id(self):