Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

sf_manufacturing/models/mrp_workorder.py

@@ -141,8 +141,8 @@ class ResMrpWorkOrder(models.Model):
 
     # 是否绑定托盘
     is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
-
     tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
+
     technology_design_id = fields.Many2one('sf.technology.design')
 
     def _compute_default_construction_period_status(self):

sf_manufacturing/models/stock.py

@@ -286,6 +286,8 @@ class StockRule(models.Model):
                     mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)], limit=1)
                     if mrp_production:
                         sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
+                else:
+                    mrp_production = production
                 if sale_order:
                     # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({
@@ -293,7 +295,7 @@ class StockRule(models.Model):
                         'order_deadline': sale_order.deadline_of_delivery,
                         'production_id': production.id,
                         'date_planned_start': production.date_planned_start,
-                        'origin': production.origin,
+                        'origin': mrp_production.origin,
                         'product_qty': production.product_qty,
                         'product_id': production.product_id.id,
                         'state': 'draft',