询价单查询

Merge Request: 修复制造订单问题

Created By: @杨金灵
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1544

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_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')):
@@ -1397,7 +1402,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 +1418,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 +1428,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 +1461,7 @@ class MrpProduction(models.Model):
                 ])
                 order.delivery_count = len(order.picking_ids)
 
+
 class sf_detection_result(models.Model):
     _name = 'sf.detection.result'
     _description = "检测结果"

sf_manufacturing/models/mrp_workorder.py

@@ -281,7 +281,8 @@ 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)),
+                          ('state', '!=', 'cancel')]
                 purchase = self.env['purchase.order'].search(domain)
                 if not purchase:
                     order.surface_technics_purchase_count = 0
@@ -307,7 +308,8 @@ class ResMrpWorkOrder(models.Model):
         # if technology_design.is_auto is False:
         #     domain = [('origin', '=', self.production_id.name)]
         # else:
-        domain = [('origin', '=', ','.join(production_list)), ('purchase_type', '=', 'consignment')]
+        domain = [('origin', '=', ','.join(production_list)), ('purchase_type', '=', 'consignment'),
+                  ('state', '!=', 'cancel')]
         purchase_orders = self.env['purchase.order'].search(domain)
         result = {
             "type": "ir.actions.act_window",
@@ -1062,7 +1064,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:

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/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_workorder_view.xml

@@ -251,7 +251,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_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,