Merge branch 'develop' into feature/验证合并的逻辑

Merge Request: 优化工件下产线，修改CNC加工工单状态为待检测时，同步修改对应质检单状态为待处理

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1785?initial=true

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -62,7 +62,7 @@ patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
                         const dom1 = buttonsDom.children('.o_form_button_save')
                         const dom2 = buttonsDom.children('.o_form_button_cancel')
                         dom1.append('保存')
-                        dom2.append('放弃保存')
+                        dom2.append('不保存')
                     }
                 } catch (e) {
                     console.log(e)

sf_manufacturing/models/stock.py

@@ -180,14 +180,14 @@ class StockRule(models.Model):
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 productions_values)
             # 将这一批制造订单的采购组根据成品设置为不同的采购组
-            product_group_id = {}
+            # product_group_id = {}
-            for index, production in enumerate(productions):
+            # for index, production in enumerate(productions):
-                if production.product_id.id not in product_group_id.keys():
+            #     if production.product_id.id not in product_group_id.keys():
-                    product_group_id[production.product_id.id] = production.procurement_group_id.id
+            #         product_group_id[production.product_id.id] = production.procurement_group_id.id
-                else:
+            #     else:
-                    productions_values[index].update({'name': production.name})
+            #         productions_values[index].update({'name': production.name})
-                    procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
+            #         procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
-                    production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
+            #         production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
 
             # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
             # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())