Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new1

Merge Request: 修改排程单bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1553?initial=true

jikimo_sale_multiple_supply_methods/controllers/main.py

@@ -1,5 +1,7 @@
 import logging
 import json
+import traceback
+
 from odoo import http
 from odoo.http import request
 from odoo.addons.sf_bf_connect.controllers.controllers import Sf_Bf_Connect
@@ -44,7 +46,8 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                 i += 1
             res['factory_order_no'] = order_id.name
         except Exception as e:
-            _logger.info('get_bfm_process_order_list error:%s' % e)
+            traceback_error = traceback.format_exc()
+            logging.error('get_bfm_process_order_list error: %s' % traceback_error)
             res['status'] = -1
             res['message'] = '工厂创建销售订单和产品失败，请联系管理员'
             request.cr.rollback()

jikimo_sale_multiple_supply_methods/models/sale_order.py

@@ -155,3 +155,10 @@ class SaleOrderLine(models.Model):
         ('purchase', "外购"),
         ('outsourcing', "委外加工"),
     ], string='供货方式')
+
+    def write(self, vals):
+        if 'supply_method' in vals:
+            for line in self:
+                if vals['supply_method'] == 'automation' and line.manual_quotation:
+                    raise UserError('当前（%s）产品为人工编程产品，不能选择自动化产线加工' % ','.join(line.mapped('product_id.name')))
+        return super(SaleOrderLine, self).write(vals)

sf_bf_connect/controllers/controllers.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import json
 import logging
+import traceback
+
 from odoo import http
 from odoo.http import request
 
@@ -123,7 +125,8 @@ class Sf_Bf_Connect(http.Controller):
             res['factory_order_no'] = order_id.name
             return json.JSONEncoder().encode(res)
         except Exception as e:
-            logging.info('get_bfm_process_order_list error:%s' % e)
+            traceback_error = traceback.format_exc()
+            logging.error('get_bfm_process_order_list error: %s' % traceback_error)
             res['status'] = -1
             res['message'] = '工厂创建销售订单和产品失败，请联系管理员'
             request.cr.rollback()

sf_dlm/models/stock_rule_inherit.py

@@ -1,4 +1,5 @@
 import logging
+from itertools import groupby
 from odoo import models, fields, api, _
 
 
@@ -7,11 +8,10 @@ class StockRuleInherit(models.Model):
 
     @api.model
     def _run_buy(self, procurements):
-        # 首先调用父类的 _run_buy 方法，以保留原有逻辑
-        super(StockRuleInherit, self)._run_buy(procurements)
-
-        # 然后在这里添加自定义的逻辑
+        # 判断补货组的采购类型
+        procurements_group = {'standard': [], 'consignment': []}
         for procurement, rule in procurements:
+            is_consignment = False
             product = procurement.product_id
             # 获取主 BOM
             bom = self.env['mrp.bom'].search([('product_tmpl_id', '=', product.product_tmpl_id.id)], limit=1)
@@ -23,21 +23,65 @@ class StockRuleInherit(models.Model):
                     # 检查路线
                     for route in raw_material.route_ids:
                         # print('route.name:', route.name)
-                        if route.name == '按订单补给外包商':  # 或者用 route.id 检查精确的路线
-                            print("按订单补给外包商============是")
-                            # 使用 procurement.values['supplier'] 获取供应商
-                            supplier = procurement.values.get('supplier')
-                            if supplier:
-                                domain = rule._make_po_get_domain(procurement.company_id, procurement.values,
-                                                                  supplier.partner_id)
-                                logging.info("domain=============: %s", domain)
-                                po = self.env['purchase.order'].sudo().search([
-                                    ('partner_id', '=', supplier.partner_id.id),
-                                    ('company_id', '=', procurement.company_id.id),  # 保证公司一致
-                                    ('origin', '=', procurement.origin),  # 根据来源匹配
-                                    ('state', '=', 'draft')  # 状态为草稿
-                                ], limit=1)
-                                logging.info("po=: %s", po)
-                                if po:
-                                    po.write({'purchase_type': 'consignment'})
-                            break
+                        if route.name == '按订单补给外包商': 
+                            is_consignment = True
+  
+            if is_consignment:
+                procurements_group['consignment'].append((procurement, rule))
+            else:
+                procurements_group['standard'].append((procurement, rule))
+
+        for key, value in procurements_group.items():
+            super(StockRuleInherit, self)._run_buy(value)
+
+            if key == 'consignment':
+                for procurement, rule in value:
+                    supplier = procurement.values.get('supplier')
+                    if supplier:
+                        domain = rule._make_po_get_domain(procurement.company_id, procurement.values,
+                                                            supplier.partner_id)
+                        logging.info("domain=============: %s", domain)
+                    po = self.env['purchase.order'].sudo().search([
+                        ('partner_id', '=', supplier.partner_id.id),
+                        ('company_id', '=', procurement.company_id.id),  # 保证公司一致
+                        ('origin', '=', procurement.origin),  # 根据来源匹配
+                        ('state', '=', 'draft')  # 状态为草稿
+                    ], limit=1)
+                    logging.info("po=: %s", po)
+                    if po:
+                        po.write({'purchase_type': 'consignment'})
+
+        # # 首先调用父类的 _run_buy 方法，以保留原有逻辑
+        # super(StockRuleInherit, self)._run_buy(procurements)
+
+        # 然后在这里添加自定义的逻辑
+        # for procurement, rule in procurements:
+        #     product = procurement.product_id
+        #     # 获取主 BOM
+        #     bom = self.env['mrp.bom'].search([('product_tmpl_id', '=', product.product_tmpl_id.id)], limit=1)
+
+        #     if bom:
+        #         # 遍历 BOM 中的组件（即坯料等）
+        #         for line in bom.bom_line_ids:
+        #             raw_material = line.product_id
+        #             # 检查路线
+        #             for route in raw_material.route_ids:
+        #                 # print('route.name:', route.name)
+        #                 if route.name == '按订单补给外包商':  # 或者用 route.id 检查精确的路线
+        #                     print("按订单补给外包商============是")
+        #                     # 使用 procurement.values['supplier'] 获取供应商
+        #                     supplier = procurement.values.get('supplier')
+        #                     if supplier:
+        #                         domain = rule._make_po_get_domain(procurement.company_id, procurement.values,
+        #                                                           supplier.partner_id)
+        #                         logging.info("domain=============: %s", domain)
+        #                         po = self.env['purchase.order'].sudo().search([
+        #                             ('partner_id', '=', supplier.partner_id.id),
+        #                             ('company_id', '=', procurement.company_id.id),  # 保证公司一致
+        #                             ('origin', '=', procurement.origin),  # 根据来源匹配
+        #                             ('state', '=', 'draft')  # 状态为草稿
+        #                         ], limit=1)
+        #                         logging.info("po=: %s", po)
+        #                         if po:
+        #                             po.write({'purchase_type': 'consignment'})
+        #                     break

sf_machine_connect/views/WorkCenterBarcodes.xml

@@ -12,6 +12,7 @@
                     <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
 
                     <field name="construction_period_status" select="multi"  icon="fa-building" enable_counters="1"/>
+                    <field name="tag_type" select="multi"  icon="fa-building" enable_counters="1"/>
 <!--                    <field name="manual_quotation" select="multi" string="" icon="fa-building" enable_counters="1"/>-->
                 </searchpanel>
 

sf_manufacturing/models/mrp_production.py

@@ -278,7 +278,7 @@ class MrpProduction(models.Model):
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'tool_state',
-        'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state', 'programming_state')
+        'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state', 'programming_state', 'is_adjust')
     def _compute_state(self):
         for production in self:
             if not production.state or not production.product_uom_id:
@@ -314,11 +314,16 @@ class MrpProduction(models.Model):
                 if not production.workorder_ids or production.is_adjust is True:
                     production.state = 'technology_to_confirmed'
                 else:
-                    production.state = 'confirmed'
+                    if production.is_adjust is True:
+                        production.state = 'technology_to_confirmed'
+                    else:
+                        production.state = 'confirmed'
             elif production.state == 'pending_cam' and production.schedule_state == '未排':
                 production.state = 'confirmed'
             elif production.state == 'to_close' and production.schedule_state == '已排':
                 production.state = 'pending_cam'
+            elif production.state == 'confirmed' and production.is_adjust is True:
+                production.state = 'technology_to_confirmed'
             if production.state == 'progress':
                 if all(wo_state not in ('progress', 'done', 'rework', 'scrap') for wo_state in
                        production.workorder_ids.mapped('state')):
@@ -383,9 +388,12 @@ class MrpProduction(models.Model):
     def technology_confirm(self):
         process_parameters = []
         account_moves = []
+        parameters_not = []
         special_design = self.technology_design_ids.filtered(
             lambda a: a.routing_tag == 'special' and a.is_auto is False)
         for special in special_design:
+            if special.route_id.routing_type == '表面工艺' and not special.process_parameters_id:
+                parameters_not.append(special.route_id.name)
             if special.process_parameters_id:
                 product_production_process = self.env['product.template'].search(
                     [('server_product_process_parameters_id', '=', special.process_parameters_id.id)])
@@ -399,6 +407,8 @@ class MrpProduction(models.Model):
                     account_moves.append(purchase.name)
         if account_moves:
             raise UserError(_("请联系工厂生产经理对采购订单为%s生成的账单进行取消", ", ".join(account_moves)))
+        if parameters_not:
+            raise UserError(_("【工艺设计】-【工序】为%s未选择参数，请选择", ", ".join(parameters_not)))
         if process_parameters:
             raise UserError(_("【工艺设计】-【参数】为%s的在【产品】中不存在，请先创建", ", ".join(process_parameters)))
         # 判断同一个加工面的标准工序的顺序是否依次排序
@@ -1296,6 +1306,7 @@ class MrpProduction(models.Model):
                                               raise_user_error=not self.env.context.get('from_orderpoint'))
             productions = self.env['mrp.production'].sudo().search(
                 [('origin', '=', self.origin)], order='id desc', limit=1)
+            productions.write({'programming_no': self.programming_no, 'is_remanufacture': True})
             move = self.env['stock.move'].search([('origin', '=', productions.name)], order='id desc')
             for mo in move:
                 domain = []
@@ -1322,7 +1333,6 @@ class MrpProduction(models.Model):
                 mo_move.write({'reference': sfp_move.reference, 'partner_id': sfp_move.partner_id.id,
                                'picking_id': sfp_move.picking_id.id, 'picking_type_id': sfp_move.picking_type_id.id,
                                'production_id': False})
-            productions.write({'programming_no': self.programming_no, 'is_remanufacture': True})
             # 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)])
@@ -1397,7 +1407,7 @@ class MrpProduction(models.Model):
     def _compute_production_type(self):
         for production in self:
             production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
-    
+
     @api.model_create_multi
     def create(self, vals_list):
         """
@@ -1413,7 +1423,7 @@ class MrpProduction(models.Model):
                 vals['name'] = self.env['stock.picking.type'].browse(picking_type_id).sequence_id.next_by_id()
             if not vals.get('procurement_group_id'):
                 product_id = self.env['product.product'].browse(vals['product_id'])
-                if product_id.product_tmpl_id.single_manufacturing: 
+                if product_id.product_tmpl_id.single_manufacturing:
                     if product_id.id not in product_group_id.keys():
                         procurement_group_vals = self._prepare_procurement_group_vals(vals)
                         group_id = self.env["procurement.group"].create(procurement_group_vals).id
@@ -1423,23 +1433,29 @@ class MrpProduction(models.Model):
                         vals['procurement_group_id'] = product_group_id[product_id.id]
         return super(MrpProduction, self).create(vals_list)
 
-    @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id', 'procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id')
+    @api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',
+                 'procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id')
     def _compute_purchase_order_count(self):
         for production in self:
             # 找到来源的第一张制造订单的采购组
             if production.product_id.product_tmpl_id.single_manufacturing == True:
-                first_production = self.env['mrp.production'].search([('origin', '=', production.origin), ('product_id', '=', production.product_id.id)], limit=1, order='id asc')
-                production.purchase_order_count = len(first_production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
-                                                  first_production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id)
+                first_production = self.env['mrp.production'].search(
+                    [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)], limit=1,
+                    order='id asc')
+                production.purchase_order_count = len(
+                    first_production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
+                    first_production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id)
             else:
-                production.purchase_order_count = len(production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
-                                                  production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id)                                
+                production.purchase_order_count = len(
+                    production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
+                    production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id)
 
     @api.depends('procurement_group_id', 'procurement_group_id.stock_move_ids.group_id')
     def _compute_picking_ids(self):
         for order in self:
             if order.product_id.product_tmpl_id.single_manufacturing == True:
-                first_order = self.env['mrp.production'].search([('origin', '=', order.origin), ('product_id', '=', order.product_id.id)], limit=1, order='id asc')
+                first_order = self.env['mrp.production'].search(
+                    [('origin', '=', order.origin), ('product_id', '=', order.product_id.id)], limit=1, order='id asc')
                 order.picking_ids = self.env['stock.picking'].search([
                     ('group_id', '=', first_order.procurement_group_id.id), ('group_id', '!=', False),
                 ])
@@ -1450,6 +1466,30 @@ class MrpProduction(models.Model):
                 ])
                 order.delivery_count = len(order.picking_ids)
 
+    def action_view_purchase_orders(self):
+        self.ensure_one()
+        if self.product_id.product_tmpl_id.single_manufacturing == True:
+            production = self.env['mrp.production'].search([('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
+        else:
+            production = self   
+        purchase_order_ids = (production.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id | production.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id).ids
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(purchase_order_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': purchase_order_ids[0],
+            })
+        else:
+            action.update({
+                'name': _("Purchase Order generated from %s", self.name),
+                'domain': [('id', 'in', purchase_order_ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
 class sf_detection_result(models.Model):
     _name = 'sf.detection.result'
     _description = "检测结果"

sf_manufacturing/models/mrp_workorder.py

@@ -141,8 +141,8 @@ class ResMrpWorkOrder(models.Model):
 
     # 是否绑定托盘
     is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
-
     tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
+
     technology_design_id = fields.Many2one('sf.technology.design')
 
     def _compute_default_construction_period_status(self):
@@ -281,7 +281,7 @@ class ResMrpWorkOrder(models.Model):
                 # if technology_design.is_auto is False:
                 #     domain = [('origin', '=', order.production_id.name)]
                 # else:
-                domain = [('purchase_type', '=', 'consignment'),('origin', '=', ','.join(production_list))]
+                domain = [('purchase_type', '=', 'consignment'), ('origin', '=', ','.join(production_list))]
                 purchase = self.env['purchase.order'].search(domain)
                 if not purchase:
                     order.surface_technics_purchase_count = 0
@@ -1062,7 +1062,7 @@ class ResMrpWorkOrder(models.Model):
             if workorder.production_id.workorder_ids.filtered(lambda wk: wk.sequence == 0):
                 continue
             # ===== 对所有按序号排序的非[进行中、完成、返工、取消]状态的工单，除了第一条之外的工单状态都设置为[等待其他工单] =====
-            logging.info(workorder.state)
+            # logging.info(workorder.state)
             work_ids = workorder.production_id.workorder_ids.filtered(
                 lambda wk: wk.state not in ['done', 'rework', 'cancel'])
             if not work_ids:
@@ -1075,6 +1075,13 @@ class ResMrpWorkOrder(models.Model):
                     if workorder.state != 'pending':
                         workorder.state = 'pending'
                     continue
+            # ================= 如果制造订单制造类型为【人工线下加工】==========================
+            if (workorder.production_id.production_type == '人工线下加工'
+                    and workorder.production_id.schedule_state == '已排'
+                    and len(workorder.production_id.picking_ids.filtered(
+                        lambda w: w.state not in ['done', 'cancel'])) == 0):
+                workorder.state = 'ready'
+                continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
                     or workorder.production_id.schedule_state != '已排'
@@ -1195,11 +1202,12 @@ class ResMrpWorkOrder(models.Model):
                 raise UserError('制造订单【%s】缺少组件的序列号信息！' % self.production_id.name)
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
             # cnc校验
-            cnc_workorder = self.search(
-                [('production_id', '=', self.production_id.id), ('routing_type', '=', 'CNC加工')],
-                limit=1, order='id asc')
-            if not cnc_workorder.cnc_ids:
-                raise UserError(_('该制造订单还未下发CNC程序，请稍后再试'))
+            if self.production_id.production_type == '自动化产线加工':
+                cnc_workorder = self.search(
+                    [('production_id', '=', self.production_id.id), ('routing_type', '=', 'CNC加工')],
+                    limit=1, order='id asc')
+                if not cnc_workorder.cnc_ids:
+                    raise UserError(_('该制造订单还未下发CNC程序，请稍后再试'))
             else:
                 if self.production_id.tool_state in ['1', '2']:
                     if self.production_id.tool_state == '1':

sf_manufacturing/models/product_template.py

@@ -874,8 +874,8 @@ class ResProductMo(models.Model):
             'height': item['model_height'],
             'volume': item['model_long'] * item['model_width'] * item['model_height'],
             'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
-            'model_name': attachment.name,
-            'upload_model_file': [(6, 0, [attachment.id])],
+            'model_name': attachment.name if attachment else None,
+            'upload_model_file': [(6, 0, [attachment.id])] if attachment else None,
             'list_price': item['price'],
             'materials_id': self.env['sf.production.materials'].search(
                 [('materials_no', '=', item['texture_code'])]).id,
@@ -924,6 +924,8 @@ class ResProductMo(models.Model):
         return [(6, 0, process_parameters_ids)]
 
     def attachment_create(self, name, data):
+        if not data:
+            return None
         attachment = self.env['ir.attachment'].create({
             'datas': base64.b64decode(data),
             'type': 'binary',

sf_manufacturing/models/stock.py

@@ -281,6 +281,13 @@ class StockRule(models.Model):
                     workorder_duration += workorder.duration_expected
 
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+                # 如果订单为空，则获取来源制造订单的销售单
+                if not sale_order:
+                    mrp_production = self.env['mrp.production'].sudo().search([('name', '=', production.origin)], limit=1)
+                    if mrp_production:
+                        sale_order = self.env['sale.order'].sudo().search([('name', '=', mrp_production.origin)])
+                else:
+                    mrp_production = production
                 if sale_order:
                     # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({
@@ -288,7 +295,7 @@ class StockRule(models.Model):
                         'order_deadline': sale_order.deadline_of_delivery,
                         'production_id': production.id,
                         'date_planned_start': production.date_planned_start,
-                        'origin': production.origin,
+                        'origin': mrp_production.origin,
                         'product_qty': production.product_qty,
                         'product_id': production.product_id.id,
                         'state': 'draft',
@@ -332,8 +339,8 @@ class StockRule(models.Model):
                         product_routing_workcenter = self.env[model].search(domain, order='sequence asc')
                         if production_item.production_type == '自动化产线加工':
                             for k in (production_item.product_id.model_processing_panel.split(',')):
-                                i += 1
                                 for route in product_routing_workcenter:
+                                    i += 1
                                     technology_design_values.append(
                                         self.env['sf.technology.design'].json_technology_design_str(k, route, i, False))
                         else:
@@ -970,19 +977,21 @@ class ReStockMove(models.Model):
             创建调拨单时，在此新增或修改调拨单的数据
         """
         res = super(ReStockMove, self)._get_new_picking_values()
-        if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨']:
-            production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
-            productions = self.env['mrp.production'].search(
-                [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
-            res['origin'] = ','.join(productions.mapped('name'))
-            res['retrospect_ref'] = production.product_id.name
+        ## 制造订单报废生成的新制造订单不走合并
+        production_remanufacture = None
+        if 'origin' in res:
+            if self.picking_type_id.name in ['生产发料', '内部调拨']:
+                production_remanufacture = self.env['mrp.production'].search(
+                    [('name', '=', res['origin']), ('is_remanufacture', '=', True)])
+        if not production_remanufacture:
+            if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨']:
+                production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
+                productions = self.env['mrp.production'].search(
+                    [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
+                res['origin'] = ','.join(productions.mapped('name'))
+                res['retrospect_ref'] = production.product_id.name
         return res
 
-    def _single_manufactuing_mo_generate_origin(self, res):
-        """
-            单个制造订单的完成move单据修改来源为该制造订单关联的销售订单下所有成品相同的制造订单
-        """
-
 
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'

sf_manufacturing/security/ir.model.access.csv

@@ -11,11 +11,11 @@ access_sf_model_type_group_sale_director,sf_model_type_group_sale_director,model
 access_sf_model_type_group_purchase_director,sf_model_type_group_purchase_director,model_sf_model_type,sf_base.group_purchase_director,1,0,0,0
 access_sf_model_type_group_plan_director,sf_model_type_group_plan_director,model_sf_model_type,sf_base.group_plan_director,1,0,0,0
 access_sf_product_model_type_routing_sort_group_sf_mrp_user,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
+access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
 access_sf_embryo_model_type_routing_sort_group_sf_mrp_user,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
+access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
+access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
 access_sf_production_line_group_sf_mrp_user,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,1,1,0
 access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,0
 access_maintenance_equipment_tool_group_sf_mrp_user,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_user,1,0,0,0
@@ -176,6 +176,6 @@ access_sf_production_technology_re_adjust_wizard_group_sf_mrp_manager,sf_product
 access_sf_production_technology_re_adjust_wizard_group_production_engineer,sf_production_technology_re_adjust_wizard_group_production_engineer,model_sf_production_technology_re_adjust_wizard,sf_base.group_production_engineer,1,1,1,0
 
 access_sf_manual_product_model_type_routing_sort_group_sf_mrp_user,sf_manual_product_model_type_routing_sort,model_sf_manual_product_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_manual_product_model_type_routing_sort_manager,sf_manual_product_model_type_routing_sort,model_sf_manual_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
+access_sf_manual_product_model_type_routing_sort_manager,sf_manual_product_model_type_routing_sort,model_sf_manual_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
 access_sf_manual_product_model_type_routing_sort_group_plan_dispatch,sf_manual_product_model_type_routing_sort_group_plan_dispatch,model_sf_manual_product_model_type_routing_sort,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_detection_result_manager,sf_detection_result_manager,model_sf_detection_result,,1,1,1,1

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -120,7 +120,8 @@
                     <!--                    <field name="production_line_state" readonly="1"/>-->
                     <field name="part_name"/>
                     <field name="part_number" string="零件图号"/>
-                    <field name="tool_state" attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
+                    <field name="tool_state"
+                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
                     <field name="tool_state_remark" string="备注" attrs="{'invisible': [('tool_state', '!=', '1')]}"/>
                     <field name="deadline_of_delivery" readonly="1"/>
                     <field name="tool_state_remark2" invisible="1"/>
@@ -365,7 +366,8 @@
                                 <field name="sequence" widget="handle"/>
                                 <field name="route_id" context="{'production_id': production_id}"
                                        attrs="{'readonly': [('id', '!=', False)]}" options="{'no_create': True}"/>
-                                <field name="process_parameters_id" attrs="{'readonly': [('id', '!=', False)]}"
+                                <field name="process_parameters_id"
+                                       attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
                                        string="参数" context="{'route_id':route_id}" options="{'no_create': True}"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
@@ -387,13 +389,16 @@
                     </page>
 
                 </xpath>
-                <xpath expr="//sheet/group/group/div[@class='d-flex flex-row align-items-start']/span[last()]" position="attributes">
+                <xpath expr="//sheet/group/group/div[@class='d-flex flex-row align-items-start']/span[last()]"
+                       position="attributes">
                     <attribute name="invisible">True</attribute>
                 </xpath>
-                <xpath expr="//sheet/group/group/div[@class='d-flex flex-row align-items-start']/button[@name='action_product_forecast_report']" position="attributes">
+                <xpath expr="//sheet/group/group/div[@class='d-flex flex-row align-items-start']/button[@name='action_product_forecast_report']"
+                       position="attributes">
                     <attribute name="invisible">True</attribute>
                 </xpath>
-                <xpath expr="//sheet/div[@class='oe_button_box']/button[@name='action_view_mrp_production_childs']/div/span[last()]" position="replace">
+                <xpath expr="//sheet/div[@class='oe_button_box']/button[@name='action_view_mrp_production_childs']/div/span[last()]"
+                       position="replace">
                     <span class="o_stat_text">子MO</span>
                 </xpath>
             </field>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -32,6 +32,7 @@
             </field>
             <xpath expr="//field[@name='qty_remaining']" position="after">
                 <field name="manual_quotation" optional="show"/>
+                <field name="tag_type" optional="show"/>
                 <field name="construction_period_status" optional="show" widget="badge"
                        decoration-success="construction_period_status == '正常'"
                        decoration-warning="construction_period_status == '预警'"
@@ -251,7 +252,7 @@
                        decoration-danger="tag_type == '重新加工'"/>
                 <field name="is_test_env" invisible="1"/>
                   <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"  />
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"  widget="qrcode_widget"/>
                 <field name="rfid_code" string="RFID码(手动输入框)" force_save="1" readonly="0" cache="True"
                        attrs="{'invisible': ['|',('rfid_code_old', '!=', False), ('is_test_env', '=', False)]}"/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>

sf_manufacturing/wizard/production_technology_re_adjust_wizard.py

@@ -14,7 +14,7 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
 
     def confirm(self):
         if self.is_technology_re_adjust is True:
-            domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'),
+            domain = [('origin', '=', self.origin), ('state', '=', 'confirmed'),
                       ('product_id', '=', self.production_id.product_id.id)]
         else:
             domain = [('id', '=', self.production_id.id)]

sf_manufacturing/wizard/rework_wizard.py

@@ -15,6 +15,8 @@ class ReworkWizard(models.TransientModel):
     production_id = fields.Many2one('mrp.production', string='制造订单号')
     workorder_ids = fields.Many2many('mrp.workorder', 'rework_wizard_to_work_order', string='所有工单',
                                      domain="[('production_id', '=', production_id),('state','=','done')]")
+    hidden_workorder_ids = fields.Many2many('mrp.workorder', 'rework_wizard_to_work_order_hidden',
+                                            string='所有工单(hidden)')
     rework_reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"),
          ("operate computer", "操机"),

sf_manufacturing/wizard/rework_wizard_views.xml

@@ -12,6 +12,7 @@
                     <field name="tool_state" invisible="True"/>
                     <field name="routing_type" invisible="True"/>
                     <field name="processing_panel_id" invisible="1"/>
+                    <field name="hidden_workorder_ids" invisible="1"/>
                     <group>
                         <field name="workorder_ids" string="工序" attrs='{"invisible": [("routing_type","=","装夹预调")]}'>
                             <tree create="0" editable='bottom' delete="0">

sf_plan/models/custom_plan.py

@@ -259,10 +259,10 @@ class sf_production_plan(models.Model):
                 # sale_obj = self.env['sale.order'].search([('name', '=', record.origin)])
                 # if 'S' in sale_obj.name:
                 #     sale_obj.schedule_status = 'to process'
-                mrp_production_ids = record.production_id._get_children().ids
-                print('mrp_production_ids', mrp_production_ids)
-                for i in mrp_production_ids:
-                    record.env['mrp.production'].sudo().browse(i).schedule_state = '已排'
+                # mrp_production_ids = record.production_id._get_children().ids
+                # print('mrp_production_ids', mrp_production_ids)
+                # for i in mrp_production_ids:
+                #     record.env['mrp.production'].sudo().browse(i).schedule_state = '已排'
                 # record.production_id.date_planned_start = record.date_planned_start
                 # record.production_id.date_planned_finished = record.date_planned_finished
                 record.sudo().production_id.production_line_id = record.production_line_id.id

sf_sale/models/sale_order.py

@@ -131,7 +131,7 @@ class ReSaleOrder(models.Model):
                 product.materials_id.name),
             'price_unit': product.list_price,
             'product_uom_qty': item['number'],
-            'model_glb_file': base64.b64decode(item['model_file']),
+            'model_glb_file': base64.b64decode(item['model_file']) if item['model_file'] else None,
             'remark': item.get('remark'),
             'embryo_redundancy_id': item.get('embryo_redundancy_id'),
             'is_incoming_material': True if item.get('embryo_redundancy_id') else False,