Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废

# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv

sf_manufacturing/models/mrp_production.py

@@ -56,7 +56,8 @@ class MrpProduction(models.Model):
     reprogramming_num = fields.Integer('重新编程次数', default=0)
     work_state = fields.Char('业务状态')
     programming_state = fields.Selection(
-        [('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发')], string='编程状态',
+        [('编程中', '编程中'), ('已编程', '已编程'), ('已编程未下发', '已编程未下发'), ('已下发', '已下发')],
+        string='编程状态',
         tracking=True)
     glb_file = fields.Binary("glb模型文件")
     production_line_id = fields.Many2one('sf.production.line', string='生产线', tracking=True)
@@ -127,7 +128,8 @@ class MrpProduction(models.Model):
                 production.state = 'pending_cam'
 
             if production.state == 'progress':
-                if all(wo_state not in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
+                if all(wo_state not in ('progress', 'done', 'rework') for wo_state in
+                       production.workorder_ids.mapped('state')):
                     production.state = 'pending_cam'
             # if production.state == 'pending_cam':
             #     if all(wo_state in 'done' for wo_state in production.workorder_ids.mapped('state')):

sf_manufacturing/models/mrp_workorder.py

@@ -716,28 +716,37 @@ class ResMrpWorkOrder(models.Model):
             re_work = self.env['mrp.workorder'].search([('production_id', '=', workorder.production_id.id),
                                                         ('processing_panel', '=', workorder.processing_panel),
                                                         ('is_rework', '=', True), ('state', 'in', ['done', 'rework'])])
-            logging.info('re_work:%s' % re_work.state)
             if workorder.state not in ['cancel', 'progress', 'rework']:
-                logging.info('工序:%s' % workorder.routing_type)
-                logging.info('状态:%s' % workorder.state)
-                logging.info('is_rework:%s' % workorder.is_rework)
-                logging.info('面:%s' % workorder.processing_panel)
-                logging.info('编程状态:%s' % workorder.production_id.programming_state)
-                logging.info('制造状态:%s' % workorder.production_id.state)
-                # if workorder.state =='done' and workorder.is_rework is True:
-                #     workorder.state = 'rework'
-                # else:
-                #     if re_work:
-                #         workorder.state = 'rework'
                 if workorder.production_id.state == 'rework':
-                    if (workorder.routing_type == 'CNC加工' and workorder.state == 'done') or (
+                    logging.info('len(re_work):%s' % len(re_work))
-                            workorder.routing_type == '装夹预调' and workorder.production_id.programming_state == '编程中' and re_work):
+                    logging.info('工序:%s' % workorder.routing_type)
-                        logging.info('面111:%s' % workorder.processing_panel)
+                    logging.info('状态:%s' % workorder.state)
-                        workorder.state = 'waiting'
+                    logging.info('is_rework:%s' % workorder.is_rework)
+                    logging.info('面:%s' % workorder.processing_panel)
+                    logging.info('编程状态:%s' % workorder.production_id.programming_state)
+                    logging.info('制造状态:%s' % workorder.production_id.state)
+                    if re_work:
+                        if workorder.routing_type == '装夹预调' and workorder.state not in ['done', 'rework',
+                                                                                            'cancel'] and workorder.is_rework is False:
+                            workorder.state = 'waiting'
+                        if workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'rework', 'cancel']:
+                            pre_workorder = self.env['mrp.workorder'].search(
+                                [('production_id', '=', workorder.production_id.id),
+                                 ('processing_panel', '=', workorder.processing_panel),
+                                 ('routing_type', '=', '装夹预调'), ('state', '=', 'done')])
+                            if pre_workorder:
+                                workorder.state = 'waiting'
                 elif workorder.production_id.state == 'progress':
-                    logging.info('面222:%s' % workorder.processing_panel)
+                    logging.info('len(re_work):%s' % len(re_work))
-                    if workorder.routing_type == '装夹预调' and workorder.production_id.programming_state == '已下发' and re_work:
+                    logging.info('工序:%s' % workorder.routing_type)
-                        workorder.state = 'ready'
+                    logging.info('状态:%s' % workorder.state)
+                    logging.info('is_rework:%s' % workorder.is_rework)
+                    logging.info('面:%s' % workorder.processing_panel)
+                    logging.info('编程状态:%s' % workorder.production_id.programming_state)
+                    logging.info('制造状态:%s' % workorder.production_id.state)
+                    if workorder.routing_type == '装夹预调' and workorder.production_id.programming_state == '已下发':
+                        if re_work:
+                            workorder.state = 'ready'
                     # else:
                     #     if workorder.state not in ['cancel', 'rework']:
                     #         workorder.state = 'rework'
@@ -877,7 +886,7 @@ class ResMrpWorkOrder(models.Model):
             if record.routing_type == '装夹预调':
                 if not record.material_center_point and record.X_deviation_angle > 0:
                     raise UserError("请对前置三元检测定位参数进行计算定位")
-                if not record.rfid_code:
+                if not record.rfid_code and record.is_rework is False:
                     raise UserError("请扫RFID码进行绑定")
                 record.process_state = '待加工'
                 # record.write({'process_state': '待加工'})
@@ -1020,32 +1029,6 @@ class ResMrpWorkOrder(models.Model):
                     workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
                     return True
 
-    # 重新下发nc程序
-    # def button_send_program_again(self):
-    #     try:
-    #         res = {'programming_no': self.production_id.programming_no}
-    #         configsettings = self.env['res.config.settings'].get_values()
-    #         config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-    #         url = '/api/intelligent_programming/reset_state_again'
-    #         config_url = configsettings['sf_url'] + url
-    #         r = requests.post(config_url, json=res, data=None, headers=config_header)
-    #         r = r.json()
-    #         result = json.loads(r['result'])
-    #         if result['status'] == 1:
-    #             productions = self.env['mrp.production'].search(
-    #                 [('programming_no', '=', self.production_id.programming_no), ('programming_state', '=', '已编程')])
-    #             if productions:
-    #                 workorder = productions.workorder_ids.filtered(
-    #                     lambda ap: ap.routing_type in ['装夹预调', 'CNC加工'] and ap.state not in ['done', 'cancel',
-    #                                                                                                'progress'])
-    #                 if workorder:
-    #                     productions.write({'work_state': '编程中', 'programming_state': '编程中'})
-    #         else:
-    #             raise UserError(result['message'])
-    #     except Exception as e:
-    #         logging.info('button_send_program_again error:%s' % e)
-    #         raise UserError("重新下发nc程序失败,请联系管理员")
-
     def print_method(self):
         """
         解除装夹处调用关联制造订单的关联序列号的打印方法

sf_manufacturing/security/ir.model.access.csv

@@ -142,9 +142,13 @@ access_mrp_bom_byproduct_group_sf_stock_user,mrp_bom_byproduct_group_sf_stock_us
 access_mrp_bom_byproduct_group_sf_stock_manager,mrp_bom_byproduct_group_sf_mrp_manager,mrp.model_mrp_bom_byproduct,sf_base.group_sf_stock_manager,1,0,0,0
 
 access_sf_rework_wizard_group_sf_order_user,sf_rework_wizard_group_sf_order_user,model_sf_rework_wizard,sf_base.group_sf_order_user,1,1,1,0
+access_sf_rework_wizard_group_plan_dispatch,sf_rework_wizard_group_plan_dispatch,model_sf_rework_wizard,sf_base.group_plan_dispatch,1,1,1,0
 access_sf_detection_result_group_sf_order_user,sf_detection_result_group_sf_order_user,model_sf_detection_result,sf_base.group_sf_order_user,1,1,1,0
+access_sf_detection_result_group_plan_dispatch,sf_detection_result_group_plan_dispatch,model_sf_detection_result,sf_base.group_plan_dispatch,1,1,1,0
+access_sf_detection_result_group_sf_equipment_user,sf_detection_result_group_sf_equipment_user,model_sf_detection_result,sf_base.group_sf_equipment_user,1,1,1,0
 access_sf_processing_panel_group_sf_order_user,sf_processing_panel_group_sf_order_user,model_sf_processing_panel,sf_base.group_sf_order_user,1,1,1,0
 access_sf_production_wizard_group_sf_order_user,sf_production_wizard_group_sf_order_user,model_sf_production_wizard,sf_base.group_sf_order_user,1,1,1,0
+access_sf_processing_panel_group_plan_dispatch,sf_processing_panel_group_plan_dispatch,model_sf_processing_panel,sf_base.group_plan_dispatch,1,1,1,0
 
 
 

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -457,6 +457,9 @@
                 </xpath>
                 <xpath expr="//filter[@name='planning_issues']" position="before">
                     <separator/>
+                    <filter string="返工且已编程" name="filter_rework_programmed"
+                            domain="[('state', '=', 'rework'),('programming_state', '=', '已编程')]"/>
+                    <separator/>
                     <filter name="filter_programming" string="编程中"
                             domain="[('programming_state', '=', '编程中')]"/>
                     <filter name="filter_programmed" string="已编程"
@@ -557,7 +560,7 @@
             <field name="arch" type="xml">
                 <form>
                     <group>
-                        <field name="handle_result"/>
+                        <!--                        <field name="handle_result"/>-->
                         <field name="test_report" readonly="1" widget="pdf_viewer"/>
                     </group>
                 </form>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -185,7 +185,7 @@
             <xpath expr="//label[1]" position="before">
                 <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                <field name="rfid_code" cache="True"
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
                        attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>

sf_manufacturing/wizard/rework_wizard.py

@@ -81,10 +81,14 @@ class ReworkWizard(models.TransientModel):
             if production_id:
                 if self.env.user.has_group('sf_base.group_sf_order_user'):
                     panel_ids = []
+                    panel_arr = production_id.product_id.model_processing_panel
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
+                        if p.processing_panel not in panel_arr:
+                            panel_arr += ','.join(p.processing_panel)
+                    for item in panel_arr.split(','):
                         panel = self.env['sf.processing.panel'].search(
-                            [('name', 'ilike', p.processing_panel)])
+                            [('name', 'ilike', item)])
                         if panel:
                             panel_ids.append(panel.id)
                     domain = {'processing_panel_id': [('id', 'in', panel_ids)]}