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

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)

jikimo_workorder_exception/views/mrp_workorder_views.xml

@@ -7,6 +7,7 @@
             <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[last()]" position="after">
+                    <field name="routing_type" invisible="1"/>
                     <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
                         <field name="exception_ids" nolabel="1" readonly="1">
                             <tree create="false" delete="false" edit="false">

sf_manufacturing/controllers/controllers.py

@@ -596,6 +596,9 @@ class Manufacturing_Connect(http.Controller):
                                                 if panel_workorder:
                                                     panel_workorder.write({'production_line_state': '已下产线'})
                                                     workorder.write({'state': 'to be detected'})
+                                                    workorder.check_ids.filtered(
+                                                        lambda ch: ch.quality_state == 'waiting').write(
+                                                        {'quality_state': 'none'})
                                     else:
                                         res = {'Succeed': False, 'ErrorCode': 204,
                                                'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}

sf_manufacturing/models/mrp_production.py

@@ -350,7 +350,7 @@ class MrpProduction(models.Model):
             if any((wo.test_results == '返工' and wo.state == 'done' and
                     (production.programming_state in ['已编程'] or wo.individuation_page_PTD is True))
                    or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
-                   for wo in production.workorder_ids):
+                   for wo in production.workorder_ids) or production.is_rework is True:
                 production.state = 'rework'
             if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
                 production.state = 'scrap'
@@ -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)])
-            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:
@@ -1674,13 +1674,13 @@ class MrpProduction(models.Model):
             url = '/api/intelligent_programming/reset_state_again'
             config_url = configsettings['sf_url'] + url
             ret = requests.post(config_url, json=res, data=None, headers=config_header)
-            ret = ret.json()
-            result = json.loads(ret['result'])
-            logging.info('update_programming_state-ret:%s' % result)
-            if result['status'] == 1:
-                self.write({'is_rework': True})
-            else:
-                raise UserError(ret['message'])
+            # ret = ret.json()
+            # result = json.loads(ret['result'])
+            # logging.info('update_programming_state-ret:%s' % result)
+            # if result['status'] == 1:
+            #     self.write({'is_rework': True})
+            # else:
+            #     raise UserError(ret['message'])
         except Exception as e:
             logging.info('update_programming_state error:%s' % e)
             raise UserError("更新编程单状态失败,请联系管理员")

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程序")
@@ -1543,7 +1543,8 @@ class ResMrpWorkOrder(models.Model):
         # 修改工单状态
         self.write({'state': 'to be detected'})
         # 若关联的【质量检查_需送检】=true，则质量检查单的状态从“等待”更新为“待处理”
-        self.check_ids.filtered(lambda ch: ch.is_inspect is True).write({'quality_state': 'none'})
+        self.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
+            {'quality_state': 'none'})
 
 
 class CNCprocessing(models.Model):

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 = {}
-            for index, production in enumerate(productions):
-                if production.product_id.id not in product_group_id.keys():
-                    product_group_id[production.product_id.id] = production.procurement_group_id.id
-                else:
-                    productions_values[index].update({'name': production.name})
-                    procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
-                    production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
+            # product_group_id = {}
+            # for index, production in enumerate(productions):
+            #     if production.product_id.id not in product_group_id.keys():
+            #         product_group_id[production.product_id.id] = production.procurement_group_id.id
+            #     else:
+            #         productions_values[index].update({'name': production.name})
+            #         procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
+            #         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/views/mrp_production_addional_change.xml

@@ -74,7 +74,9 @@
                 <xpath expr="//field[@name='production_real_duration']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
-
+                <xpath expr="//field[@name='state']" position="after">
+                     <field name="programming_state" optional="hide"/>
+                </xpath>
             </field>
         </record>
 

sf_manufacturing/views/mrp_workorder_view.xml

@@ -126,9 +126,9 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
-            <xpath expr="//sheet" position="inside">
+            <xpath expr="//form" position="inside">
                 <!-- 其他可见字段 -->
-                <field name="_barcode_scanned" widget="barcode_handler" invisible="1"/>
+                <field name="_barcode_scanned" widget="barcode_handler"/>
             </xpath>
             <!--             <xpath expr="//form" position="inside"> -->
             <!--                 <script src="sf_manufacturing/static/src/js/customRFID.js"/> -->
@@ -182,7 +182,7 @@
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"
-                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|',('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False),'&amp;','&amp;',('state', 'in', ('progress')), ('is_inspect', '=', True), ('routing_type','!=','CNC加工')]}"/>
 
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
@@ -312,7 +312,7 @@
             <xpath expr="//page[1]" position="before">
                 <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
-                        <field name="_barcode_scanned" widget="barcode_handler"/>
+<!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
                         </group>
@@ -533,7 +533,7 @@
                 <page string="后置三元检测" attrs='{"invisible": [("individuation_page_PTD", "=", False)]}'>
                     <group>
                         <field name="test_results"
-                               attrs='{"readonly":[("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True)],
+                               attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
                                "invisible":[("results","!=",False)]}'/>
                         <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
                         <!--                        <field name="is_fetchcnc"-->

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", "操机"),
@@ -48,7 +48,7 @@ class QualityCheck(models.Model):
     @api.depends('point_id.is_inspect')
     def _compute_quality_state(self):
         for qc in self:
-            if qc.point_id.is_inspect and qc.quality_state == 'none':
+            if qc.point_id.is_inspect and qc.quality_state == 'none' and qc.workorder_id.state != 'to be detected':
                 qc.quality_state = 'waiting'
             elif not qc.point_id.is_inspect and qc.quality_state == 'waiting':
                 qc.quality_state = 'none'
@@ -62,7 +62,9 @@ class QualityCheck(models.Model):
     def do_pass(self):
         self.ensure_one()
         super().do_pass()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if self.test_results in ['返工', '报废']:
                 raise ValidationError('请重新选择【判定结果】-【检测结果】')
@@ -74,7 +76,9 @@ class QualityCheck(models.Model):
     def do_fail(self):
         self.ensure_one()
         super().do_fail()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if not self.test_results:
                 raise ValidationError('请填写【判定结果】里的信息')

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

sf_quality/views/quality_check_view.xml

@@ -9,22 +9,24 @@
                 <field name="production_id" invisible="1"/>
                 <field name="work_state" invisible="1"/>
                 <field name="individuation_page_PTD" invisible="1"/>
-                <field name="production_line_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="equipment_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <field name="production_line_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="equipment_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
-                       attrs="{'invisible': ['|', '|',('model_file', '=', False), ('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': ['|',('model_file', '=', False), ('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="processing_panel" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <field name="processing_panel" attrs="{'invisible': [('production_id', '=', False)]}"/>
+<!--                <field name="production_id" string="制造订单" readonly="1"-->
+<!--                       attrs="{'invisible': [('production_id', '=', False)]}"/>-->
                 <field name="workorder_id" string="工单号" readonly="1"
-                       attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="is_inspect" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="is_inspect" attrs="{'invisible': [('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//page[@name='notes']" position="before">
-                <page string="检测报告" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="检测报告" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="detection_report" string="" widget="pdf_viewer"/>
                 </page>
-                <page string="判定结果" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="判定结果" attrs="{'invisible': [('production_id', '=', False)]}">
                     <group>
                         <group>
                             <field name="test_results" attrs="{'readonly': [('quality_state','in', ['pass', 'fail'])]}"/>
@@ -35,25 +37,33 @@
                         </group>
                     </group>
                 </page>
-                <page string="2D图纸" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="2D图纸" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="machining_drawings" string="" widget="adaptive_viewer"/>
                 </page>
-                <page string="客户质量标准" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="客户质量标准" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="quality_standard" string="" widget="adaptive_viewer"/>
                 </page>
                 <page string="其他"
-                      attrs="{'invisible': ['|','|', ('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False),('individuation_page_PTD', '=', False)]}">
+                      attrs="{'invisible': ['|',('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False)]}">
                     <group>
                         <field name="write_uid" widget='many2one_avatar_user' string="判定人" readonly="1"/>
                         <field name="write_date" string="判定时间" readonly="1"/>
                     </group>
                 </page>
             </xpath>
+            <xpath expr="//header//button[@name='do_pass'][1]" position="attributes">
+                <attribute name="string">合格</attribute>
+            </xpath>
             <xpath expr="//header//button[@name='do_pass'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'fail'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">合格</attribute>
+            </xpath>
+            <xpath expr="//header//button[@name='do_fail'][1]" position="attributes">
+                <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">不合格</attribute>
             </xpath>
         </field>
     </record>

sf_sale/models/sale_order.py

@@ -130,7 +130,10 @@ class ReSaleOrder(models.Model):
             'order_id': self.id,
             'product_id': product.id,
             'name': '%s/%s/%s/%s/%s/%s' % (
-                product.model_long, product.model_width, product.model_height, product.model_volume,
+                self.format_float(product.model_long),
+                self.format_float(product.model_width),
+                self.format_float(product.model_height), 
+                self.format_float(product.model_volume),
                 machining_accuracy_name,
                 product.materials_id.name),
             'price_unit': product.list_price,
@@ -143,6 +146,20 @@ class ReSaleOrder(models.Model):
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
+    def format_float(self, value):
+        # 将浮点数转换为字符串
+        value_str = str(value)
+        # 检查小数点的位置
+        if '.' in value_str:
+            # 获取小数部分
+            decimal_part = value_str.split('.')[1]
+            # 判断小数位数是否超过2位
+            if len(decimal_part) > 2:
+                # 超过2位则保留2位小数
+                return "{:.2f}".format(value)
+        # 否则保持原来的位数
+        return float(value_str)
+
     @api.constrains('order_line')
     def check_order_line(self):
         for item in self: