CNC工单返工

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'])

sf_manufacturing/models/mrp_workorder.py

@@ -455,32 +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')
+    # rework_flag = fields.Boolean(string='返工标志', compute='_compute_rework_flag')
-
+    #
-    @api.depends('state', 'production_line_state')
+    # @api.depends('state', 'production_line_state')
-    def _compute_rework_flag(self):
+    # def _compute_rework_flag(self):
-        for record in self:
+    #     for record in self:
-            if record.state == 'done' and record.routing_type == '装夹预调':
+    #         if record.state == 'done' and record.routing_type == '装夹预调':
-                next_workorder = record.production_id.workorder_ids.filtered(
+    #             next_workorder = record.production_id.workorder_ids.filtered(
-                    lambda w: w.sequence == record.sequence + 1)
+    #                 lambda w: w.sequence == record.sequence + 1)
-                if next_workorder and next_workorder.routing_type == 'CNC加工' and next_workorder.state in ['ready',
+    #             if next_workorder and next_workorder.routing_type == 'CNC加工' and next_workorder.state in ['ready',
-                                                                                                            'waiting',
+    #                                                                                                         'waiting',
-                                                                                                            'pending'] and next_workorder.production_line_state == '待上产线':
+    #                                                                                                         'pending'] and next_workorder.production_line_state == '待上产线':
-                    record.rework_flag = False
+    #                 record.rework_flag = False
-                elif next_workorder and next_workorder.routing_type == '表面工艺' and next_workorder.state in ['ready',
+    #             elif next_workorder and next_workorder.routing_type == '表面工艺' and next_workorder.state in ['ready',
-                                                                                                               'waiting',
+    #                                                                                                            'waiting',
-                                                                                                               'pending']:
+    #                                                                                                            'pending']:
-                    record.rework_flag = False
+    #                 record.rework_flag = False
-                else:
+    #             else:
-                    record.rework_flag = True
+    #                 record.rework_flag = True
-            else:
+    #         else:
-                record.rework_flag = True
+    #             record.rework_flag = True
-
+    #
-    def button_rework(self):
+    # def button_rework(self):
-        for item in self:
+    #     for item in self:
-            item.state = 'progress'
+    #         item.state = 'progress'
-            for time_id in item.time_ids:
+    #         for time_id in item.time_ids:
-                time_id.write({'date_end': None})
+    #             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,7 +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="rework_flag" invisible="1"/>-->
                 <!--                <field name='is_send_program_again' invisible="1"/>-->
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
@@ -212,9 +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"
+<!--                <button type="object" class="oe_highlight jikimo_button_confirm" name="button_rework"-->
-                        string="返工"
+<!--                        string="返工"-->
-                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>
+<!--                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>-->
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","not in",("切割", "线切割", "人工线下加工"))]}'>

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('无对应状态，不需更新编程记录')