报废不申请重新编程时新生成的制造订单没有程序

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

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1786?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/mrp_production.py

@@ -1416,36 +1416,36 @@ class MrpProduction(models.Model):
             #                    'production_id': False})
             # productions.procurement_group_id.mrp_production_ids.move_dest_ids.write(
             #     {'group_id': self.env['procurement.group'].search([('name', '=', sale_order.name)])})
-            stock_picking_remanufacture = self.env['stock.picking'].search([('origin', '=', productions.name)])
+            # stock_picking_remanufacture = self.env['stock.picking'].search([('origin', '=', productions.name)])
-            for pick in stock_picking_remanufacture:
+            # for pick in stock_picking_remanufacture:
-                if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
+            #     if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
-                    if pick.move_ids:
+            #         if pick.move_ids:
-                        product_type_id = pick.move_ids[0].product_id.categ_id
+            #             product_type_id = pick.move_ids[0].product_id.categ_id
-                        if product_type_id.name == '坯料':
+            #             if product_type_id.name == '坯料':
-                            location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+            #                 location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
-                            if not location_id:
+            #                 if not location_id:
-                                logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+            #                     logging.info(f'没有搜索到【坯料存货区】: {location_id}')
-                                break
+            #                     break
-                            if pick.picking_type_id.name == '内部调拨':
+            #                 if pick.picking_type_id.name == '内部调拨':
-                                if pick.location_dest_id.product_type != product_type_id:
+            #                     if pick.location_dest_id.product_type != product_type_id:
-                                    pick.location_dest_id = location_id.id
+            #                         pick.location_dest_id = location_id.id
-                            elif pick.picking_type_id.name == '生产发料':
+            #                 elif pick.picking_type_id.name == '生产发料':
-                                if pick.location_id.product_type != product_type_id:
+            #                     if pick.location_id.product_type != product_type_id:
-                                    pick.location_id = location_id.id
+            #                         pick.location_id = location_id.id
-            scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
+            # scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
-                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
+            #     [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
-                 ('is_subcontract', '=', True)])
+            #      ('is_subcontract', '=', True)])
-            if scarp_process_parameter_workorder:
+            # if scarp_process_parameter_workorder:
-                production_programming = self.env['mrp.production'].search(
+            #     production_programming = self.env['mrp.production'].search(
-                    [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
+            #         [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
-                production_list = [production.name for production in production_programming]
+            #     production_list = [production.name for production in production_programming]
-                purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
+            #     purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
-                for purchase_item in purchase_orders.order_line:
+            #     for purchase_item in purchase_orders.order_line:
-                    for process_item in scarp_process_parameter_workorder:
+            #         for process_item in scarp_process_parameter_workorder:
-                        if purchase_item.product_id.categ_type == '表面工艺':
+            #             if purchase_item.product_id.categ_type == '表面工艺':
-                            if purchase_item.product_id.server_product_process_parameters_id == process_item.surface_technics_parameters_id:
+            #                 if purchase_item.product_id.server_product_process_parameters_id == process_item.surface_technics_parameters_id:
-                                if purchase_orders.origin.find(productions.name) == -1:
+            #                     if purchase_orders.origin.find(productions.name) == -1:
-                                    purchase_orders.origin += ',' + productions.name
+            #                         purchase_orders.origin += ',' + productions.name
             if item['is_reprogramming'] is False:
                 productions.programming_state = '已编程'
             else:

sf_manufacturing/models/mrp_workorder.py

@@ -145,7 +145,7 @@ class ResMrpWorkOrder(models.Model):
     Y10_axis = fields.Float(default=0)
     Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], default='合格',
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
                                     string="检测结果", tracking=True)
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")

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())

sf_manufacturing/wizard/production_technology_wizard.py

@@ -91,4 +91,20 @@ class ProductionTechnologyWizard(models.TransientModel):
             if workorder[0].state in ['pending']:
                 if workorder[0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
                     workorder[0].state = 'waiting'
+            if item.is_remanufacture and item.programming_state == '已编程':
+                mrp_production = self.env['mrp.production'].sudo().search(
+                    [('remanufacture_production_id', '=', item.name)])
+                workorder_ids = mrp_production.workorder_ids.filtered(
+                    lambda ap: ap.routing_type in ('装夹预调', 'CNC加工'))
+                for workorder_id in workorder_ids:
+                    workorder = item.workorder_ids.filtered(lambda
+                                                                ap: ap.routing_type == workorder_id.routing_type and ap.processing_panel == workorder_id.processing_panel)
+                    if workorder:
+                        if workorder.routing_type == '装夹预调':
+                            workorder.write(
+                                {'processing_drawing': workorder_id.processing_drawing})
+                        if workorder.routing_type == 'CNC加工':
+                            workorder.write(
+                                {'cnc_worksheet': workorder_id.cnc_worksheet, 'cnc_ids': workorder_id.cnc_ids,
+                                 'cmm_ids': workorder_id.cmm_ids})
         return productions

sf_manufacturing/wizard/production_wizard.py

@@ -53,4 +53,5 @@ class ProductionWizard(models.TransientModel):
             if self.is_reprogramming is True:
                 self.mrp_production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
             new_production = self.mrp_production_id.recreateManufacturing(ret)
+            new_production.technology_design_ids = self.mrp_production_id.technology_design_ids
             self.mrp_production_id.write({'remanufacture_production_id': new_production.id})

sf_quality/models/quality.py

@@ -27,7 +27,7 @@ class QualityCheck(models.Model):
     model_file = fields.Binary(related='workorder_id.glb_file', string='加工模型')
 
     detection_report = fields.Binary(related='workorder_id.detection_report', readonly=True, string='检测报告')
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果",
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果",
                                     default='合格')
     reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),

sf_quality/models/quality_cnc_test.py

@@ -25,7 +25,7 @@ class SfQualityCncTest(models.Model):
         ('pass', '合格'),
         ('fail', '不合格')], string='判定结果')
     number = fields.Integer('数量', default=1)
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果")
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
     reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")