修复返工-工件配送

sf_manufacturing/models/mrp_production.py

@@ -734,7 +734,7 @@ class MrpProduction(models.Model):
 
         for production in self:
             logging.info('qty_produced:%s' % production.qty_produced)
-            if production.qty_produced == '0.0':
+            if production.qty_produced == 0.0:
                 production.qty_produced = 1.0
             production.write({
                 'date_finished': fields.Datetime.now(),
@@ -897,6 +897,7 @@ class MrpProduction(models.Model):
                                                                                                 result),
                                  'cmm_ids': panel_workorder.cmm_ids.sudo()._json_cmm_program(processing_panel, result),
                                  'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                            logging.info('len(cnc_worksheet):%s' % len(panel_workorder.cnc_worksheet))
                             pre_workorder = production.workorder_ids.filtered(lambda
                                                                                   ap: ap.routing_type == '装夹预调' and ap.processing_panel == processing_panel and ap.state not in (
                                 'rework', 'done'))

sf_manufacturing/models/mrp_workorder.py

@@ -1404,7 +1404,8 @@ class WorkPieceDelivery(models.Model):
         [('上产线', '上产线'), ('下产线', '下产线'), ('运送空料架', '运送空料架')], string='类型')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
     status = fields.Selection(
-        [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态', default='待下发',
+        [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送'), ('已取消', '已取消')], string='状态',
+        default='待下发',
         tracking=True)
     is_cnc_program_down = fields.Boolean('程序是否下发', default=False, tracking=True)
     is_manual_work = fields.Boolean('人工操作', default=False)