Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺外协

sf_manufacturing/models/mrp_production.py

@@ -68,7 +68,7 @@ class MrpProduction(models.Model):
         ('待加工', '待加工'),
         ('待解除装夹', '待解除装夹'),
         ('已完工', '已完工'),
-    ], string='工序状态')
+    ], string='工序状态', default='待装夹')
 
     # 零件图号
     part_number = fields.Char('零件图号')

sf_manufacturing/models/mrp_workorder.py

@@ -827,8 +827,8 @@ class ResMrpWorkOrder(models.Model):
             else:
                 if self.date_planned_start > start_date:
                     vals['date_planned_start'] = start_date
-                if self.date_planned_finished and self.date_planned_finished < start_date:
-                    vals['date_planned_finished'] = start_date
+                # if self.date_planned_finished and self.date_planned_finished < start_date:
+                #     vals['date_planned_finished'] = start_date
                 return self.write(vals)
         else:
             raise UserError(_('请先完成上一步工单'))
@@ -875,7 +875,11 @@ class ResMrpWorkOrder(models.Model):
                         'state': 'draft',
                         'order_line': order_line_ids,
                     })
+            tem_date_planned_finished = record.date_planned_finished
             super().button_finish()
+            record.write({
+                'date_planned_finished': tem_date_planned_finished  # 保持原值
+            })
             is_production_id = True
             for workorder in record.production_id.workorder_ids:
                 if workorder.state != 'done':

sf_manufacturing/models/stock.py

@@ -248,7 +248,7 @@ class StockRule(models.Model):
 
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
                 if sale_order:
-                    sale_order.write({'schedule_status': 'to schedule'})
+                    # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({
                         'name': production.name,
                         'order_deadline': sale_order.deadline_of_delivery,