人工线下加工工单下发通知修改

jikimo_workorder_exception/controllers/main.py

@@ -4,6 +4,7 @@ import json
 import logging
 from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
 from odoo.addons.sf_manufacturing.controllers.controllers import Manufacturing_Connect
+from datetime import datetime
 
 _logger = logging.getLogger(__name__)
 
@@ -30,6 +31,7 @@ class WorkorderExceptionConroller(http.Controller):
             workorder = request.env['mrp.workorder'].sudo().search([
                 ('rfid_code', '=', ret['RfidCode']),
                 ('routing_type', '=', 'CNC加工'),
+                ('state', '!=', 'rework')
             ])
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 401, 'Error': '无效的工单'}
@@ -41,7 +43,10 @@ class WorkorderExceptionConroller(http.Controller):
                 'exception_code': ret.get('coding'),
                 'exception_content': ret.get('Error', '')
             })
- 
+            # 申请重新编程
+            workorder.production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
+                                                             reprogramming_reason=ret.get('Error', ''))
+            workorder.production_id.write({'programming_state': '编程中', 'work_state': '编程中', 'is_rework': False})
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             _logger.info('workder_exception error:%s' % e)

sf_manufacturing/models/mrp_production.py

@@ -577,16 +577,19 @@ class MrpProduction(models.Model):
 
     # 编程单更新
     # 增加触发时间参数
-    def update_programming_state(self, trigger_time=None):
+    def update_programming_state(self, trigger_time=None, reprogramming_reason=None):
         try:
-            manufacturing_type = 'rework'
+            manufacturing_type = None
             if self.is_scrap:
                 manufacturing_type = 'scrap'
             elif self.tool_state == '2':
                 manufacturing_type = 'invalid_tool_rework'
+            elif self.is_rework:
+                manufacturing_type = 'rework'
             res = {'programming_no': self.programming_no,
                    'manufacturing_type': manufacturing_type,
-                   'trigger_time': trigger_time}
+                   'trigger_time': trigger_time,
+                   'reprogramming_reason': reprogramming_reason}
             logging.info('res=%s:' % res)
             configsettings = self.env['res.config.settings'].get_values()
             config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
@@ -1416,36 +1419,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)])
-            # for pick in stock_picking_remanufacture:
-            #     if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
-            #         if pick.move_ids:
-            #             product_type_id = pick.move_ids[0].product_id.categ_id
-            #             if product_type_id.name == '坯料':
-            #                 location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
-            #                 if not location_id:
-            #                     logging.info(f'没有搜索到【坯料存货区】: {location_id}')
-            #                     break
-            #                 if pick.picking_type_id.name == '内部调拨':
-            #                     if pick.location_dest_id.product_type != product_type_id:
-            #                         pick.location_dest_id = location_id.id
-            #                 elif pick.picking_type_id.name == '生产发料':
-            #                     if pick.location_id.product_type != product_type_id:
-            #                         pick.location_id = location_id.id
-            # scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
-            #     [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
-            #      ('is_subcontract', '=', True)])
-            # if scarp_process_parameter_workorder:
-            #     production_programming = self.env['mrp.production'].search(
-            #         [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
-            #     production_list = [production.name for production in production_programming]
-            #     purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
-            #     for purchase_item in purchase_orders.order_line:
-            #         for process_item in scarp_process_parameter_workorder:
-            #             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_orders.origin.find(productions.name) == -1:
-            #                         purchase_orders.origin += ',' + productions.name
+            stock_picking_remanufacture = self.env['stock.picking'].search([('origin', '=', productions.name)])
+            for pick in stock_picking_remanufacture:
+                if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
+                    if pick.move_ids:
+                        product_type_id = pick.move_ids[0].product_id.categ_id
+                        if product_type_id.name == '坯料':
+                            location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+                            if not location_id:
+                                logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+                                break
+                            if pick.picking_type_id.name == '内部调拨':
+                                if pick.location_dest_id.product_type != product_type_id:
+                                    pick.location_dest_id = location_id.id
+                            elif pick.picking_type_id.name == '生产发料':
+                                if pick.location_id.product_type != product_type_id:
+                                    pick.location_id = location_id.id
+            scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
+                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
+                 ('is_subcontract', '=', True)])
+            if scarp_process_parameter_workorder:
+                production_programming = self.env['mrp.production'].search(
+                    [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
+                production_list = [production.name for production in production_programming]
+                purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
+                for purchase_item in purchase_orders.order_line:
+                    for process_item in scarp_process_parameter_workorder:
+                        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_orders.origin.find(productions.name) == -1:
+                                    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程序")
@@ -455,6 +455,32 @@ class ResMrpWorkOrder(models.Model):
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因", tracking=True)
     detailed_reason = fields.Text('详细原因')
     is_rework = fields.Boolean(string='是否返工', default=False)
+    # rework_flag = fields.Boolean(string='返工标志', compute='_compute_rework_flag')
+    #
+    # @api.depends('state', 'production_line_state')
+    # def _compute_rework_flag(self):
+    #     for record in self:
+    #         if record.state == 'done' and record.routing_type == '装夹预调':
+    #             next_workorder = record.production_id.workorder_ids.filtered(
+    #                 lambda w: w.sequence == record.sequence + 1)
+    #             if next_workorder and next_workorder.routing_type == 'CNC加工' and next_workorder.state in ['ready',
+    #                                                                                                         'waiting',
+    #                                                                                                         'pending'] and next_workorder.production_line_state == '待上产线':
+    #                 record.rework_flag = False
+    #             elif next_workorder and next_workorder.routing_type == '表面工艺' and next_workorder.state in ['ready',
+    #                                                                                                            'waiting',
+    #                                                                                                            'pending']:
+    #                 record.rework_flag = False
+    #             else:
+    #                 record.rework_flag = True
+    #         else:
+    #             record.rework_flag = True
+    #
+    # def button_rework(self):
+    #     for item in self:
+    #         item.state = 'progress'
+    #         for time_id in item.time_ids:
+    #             time_id.write({'date_end': None})
 
     def button_change_env(self):
         self.is_test_env = not self.is_test_env

sf_manufacturing/views/mrp_workorder_view.xml

@@ -163,6 +163,7 @@
                 <field name='is_delivery' invisible="1"/>
                 <field name="is_trayed" invisible="1"/>
                 <field name="is_inspect" invisible="1"/>
+<!--                <field name="rework_flag" invisible="1"/>-->
                 <!--                <field name='is_send_program_again' invisible="1"/>-->
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
@@ -211,6 +212,9 @@
                         attrs="{'invisible': ['|', '|', '|', ('routing_type','!=','装夹预调'),('state','!=','progress'), ('is_trayed', '=', False), ('state', 'in', ('done'))]}"/>
                 <button name="print_method" type="object" string="打印二维码" class="btn-primary"
                         attrs="{'invisible': ['|',('routing_type','!=','解除装夹'),('state','!=','done')]}"/>
+<!--                <button type="object" class="oe_highlight jikimo_button_confirm" name="button_rework"-->
+<!--                        string="返工"-->
+<!--                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>-->
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","not in",("切割", "线切割", "人工线下加工"))]}'>

sf_manufacturing/wizard/production_technology_wizard.py

@@ -91,20 +91,4 @@ 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,5 +53,4 @@ 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_message/models/sf_message_product.py

@@ -16,6 +16,7 @@ class SFMessageProduct(models.Model):
                 mrp_production_list = self.env['mrp.production'].sudo().search(
                     [('product_id', '=', product_product.id)])
                 production_num = 0
+                routing_type = None
                 for mrp_production_info in mrp_production_list:
                     routing_type = '人工线下加工' if mrp_production_info.production_type == '人工线下加工' else '装夹预调'
                     mrp_production_ready = mrp_production_info.workorder_ids.filtered(
@@ -23,7 +24,7 @@ class SFMessageProduct(models.Model):
                     if mrp_production_ready:
                         production_num += 1
                 if production_num >= 1:
-                    url = self.get_request_url()
+                    url = self.get_request_url(routing_type)
                     content = content.replace('{{product_id}}', product_product.name).replace(
                         '{{number}}', str(production_num)).replace(
                         '{{request_url}}', url)
@@ -42,11 +43,15 @@ class SFMessageProduct(models.Model):
                     contents.append(content)
         return contents, message_queue_ids
 
-    def get_request_url(self):
+    def get_request_url(self, routing_type):
         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
         action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
         menu_id = self.env.ref('mrp.menu_mrp_root').id
-        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
+        if routing_type == '人工线下加工':
+            routing_name = '线下工作中心'
+        else:
+            routing_name = '工件装夹中心'
+        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', routing_name)]).id
         # 查询参数
         params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
                   'view_type': 'list', 'active_id': active_id}

sf_mrs_connect/controllers/controllers.py

@@ -200,6 +200,17 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                             'send_time': ret['send_time'],
                         })
                         logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
+                    elif ret['reprogramming_reason']:
+                        production.programming_record_ids.create({
+                            'number': len(production.programming_record_ids) + 1,
+                            'production_id': production.id,
+                            'reason': ret['reprogramming_reason'],
+                            'programming_method': ret['programme_way'],
+                            'current_programming_count': ret['reprogramming_num'],
+                            'target_production_id': productions_reprogram,
+                            'apply_time': ret['trigger_time'],
+                            'send_time': ret['send_time'],
+                        })
                     else:
                         logging.info('无对应状态，不需更新编程记录')
 

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="原因")