1、优化工单解绑Rfid

Merge Request: 功能升级

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1081?initial=true

jikimo_frontend/static/src/scss/custom_style.scss

@@ -503,4 +503,27 @@ div:has(.o_required_modifier) > label::before {
   color: #fff;
   background-color: #4A4F59;
   border-color: #4A4F59;
+}
+
+// 功能刀具组装单 弹窗样式
+.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div.col-lg-6 .o_inner_group.col-lg-6 {
+  width: 100%;
+}
+.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div .o_inner_group .o_wrap_field.d-flex.d-sm-contents.flex-column{
+  display: flex!important;
+  flex-direction: row!important;
+  input {
+    border-bottom: 1px solid;
+  }
+}
+
+// 设置表格横向滚动
+.o_list_renderer.o_renderer  {
+  max-width: 100%;
+  overflow-x: auto;
+}
+
+// 设置表单页面label文本不换行
+.o_form_view .o_group .o_wrap_label .o_form_label {
+  white-space: nowrap;
 }

mrp_workorder/models/mrp_workorder.py

@@ -27,7 +27,7 @@ class MrpWorkcenter(models.Model):
 
 class MrpProductionWorkcenterLine(models.Model):
     _name = 'mrp.workorder'
-    _inherit = ['mrp.workorder', 'barcodes.barcode_events_mixin']
+    _inherit = ['mrp.workorder', 'barcodes.barcode_events_mixin', 'mail.thread', 'mail.activity.mixin']
 
     quality_point_ids = fields.Many2many('quality.point', compute='_compute_quality_point_ids', store=True)
     quality_point_count = fields.Integer('Steps', compute='_compute_quality_point_count')
@@ -47,14 +47,17 @@ class MrpProductionWorkcenterLine(models.Model):
 
     is_last_lot = fields.Boolean('Is Last lot', compute='_compute_is_last_lot')
     is_first_started_wo = fields.Boolean('Is The first Work Order', compute='_compute_is_last_unfinished_wo')
-    is_last_unfinished_wo = fields.Boolean('Is Last Work Order To Process', compute='_compute_is_last_unfinished_wo', store=False)
+    is_last_unfinished_wo = fields.Boolean('Is Last Work Order To Process', compute='_compute_is_last_unfinished_wo',
+                                           store=False)
     lot_id = fields.Many2one(related='current_quality_check_id.lot_id', readonly=False)
     move_id = fields.Many2one(related='current_quality_check_id.move_id', readonly=False)
     move_line_id = fields.Many2one(related='current_quality_check_id.move_line_id', readonly=False)
     move_line_ids = fields.One2many(related='move_id.move_line_ids')
-    quality_state = fields.Selection(related='current_quality_check_id.quality_state', string="Quality State", readonly=False)
+    quality_state = fields.Selection(related='current_quality_check_id.quality_state', string="Quality State",
+                                     readonly=False)
     qty_done = fields.Float(related='current_quality_check_id.qty_done', readonly=False)
-    test_type_id = fields.Many2one('quality.point.test_type', 'Test Type', related='current_quality_check_id.test_type_id')
+    test_type_id = fields.Many2one('quality.point.test_type', 'Test Type',
+                                   related='current_quality_check_id.test_type_id')
     test_type = fields.Char(related='test_type_id.technical_name')
     user_id = fields.Many2one(related='current_quality_check_id.user_id', readonly=False)
     worksheet_page = fields.Integer('Worksheet page')
@@ -65,7 +68,8 @@ class MrpProductionWorkcenterLine(models.Model):
     def _compute_quality_point_ids(self):
         for workorder in self:
             quality_points = workorder.operation_id.quality_point_ids
-            quality_points = quality_points.filtered(lambda qp: not qp.product_ids or workorder.production_id.product_id in qp.product_ids)
+            quality_points = quality_points.filtered(
+                lambda qp: not qp.product_ids or workorder.production_id.product_id in qp.product_ids)
             workorder.quality_point_ids = quality_points
 
     @api.depends('operation_id')
@@ -91,7 +95,8 @@ class MrpProductionWorkcenterLine(models.Model):
     @api.depends('check_ids')
     def _compute_finished_product_check_ids(self):
         for wo in self:
-            wo.finished_product_check_ids = wo.check_ids.filtered(lambda c: c.finished_product_sequence == wo.qty_produced)
+            wo.finished_product_check_ids = wo.check_ids.filtered(
+                lambda c: c.finished_product_sequence == wo.qty_produced)
 
     def write(self, values):
         res = super().write(values)
@@ -138,7 +143,8 @@ class MrpProductionWorkcenterLine(models.Model):
         self.finished_lot_id = self.env['stock.lot'].create({
             'product_id': self.product_id.id,
             'company_id': self.company_id.id,
-            'name': self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env['ir.sequence'].next_by_code('stock.lot.serial'),
+            'name': self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env[
+                'ir.sequence'].next_by_code('stock.lot.serial'),
         })
 
     def _create_subsequent_checks(self):
@@ -152,7 +158,7 @@ class MrpProductionWorkcenterLine(models.Model):
         """
         # Create another quality check if necessary
         next_check = self.current_quality_check_id.next_check_id
-        if next_check.component_id != self.current_quality_check_id.product_id or\
+        if next_check.component_id != self.current_quality_check_id.product_id or \
                 next_check.point_id != self.current_quality_check_id.point_id:
             # TODO: manage reservation here
 
@@ -279,7 +285,8 @@ class MrpProductionWorkcenterLine(models.Model):
         if self.current_quality_check_id:
             team = self.current_quality_check_id.team_id
         else:
-            team = self.env['quality.alert.team'].search(['|', ('company_id', '=', self.company_id.id), ('company_id', '=', False)], limit=1)
+            team = self.env['quality.alert.team'].search(
+                ['|', ('company_id', '=', self.company_id.id), ('company_id', '=', False)], limit=1)
         return {
             'type': 'ir.actions.act_window',
             'res_model': 'quality.check',
@@ -320,7 +327,8 @@ class MrpProductionWorkcenterLine(models.Model):
             production = wo.production_id
 
             move_raw_ids = wo.move_raw_ids.filtered(lambda m: m.state not in ('done', 'cancel'))
-            move_finished_ids = wo.move_finished_ids.filtered(lambda m: m.state not in ('done', 'cancel') and m.product_id != wo.production_id.product_id)
+            move_finished_ids = wo.move_finished_ids.filtered(
+                lambda m: m.state not in ('done', 'cancel') and m.product_id != wo.production_id.product_id)
             previous_check = self.env['quality.check']
             for point in wo.quality_point_ids:
                 # Check if we need a quality control for this point
@@ -342,11 +350,13 @@ class MrpProductionWorkcenterLine(models.Model):
                     if point.test_type == 'register_byproducts':
                         moves = move_finished_ids.filtered(lambda m: m.product_id == point.component_id)
                         if not moves:
-                            moves = production.move_finished_ids.filtered(lambda m: not m.operation_id and m.product_id == point.component_id)
+                            moves = production.move_finished_ids.filtered(
+                                lambda m: not m.operation_id and m.product_id == point.component_id)
                     elif point.test_type == 'register_consumed_materials':
                         moves = move_raw_ids.filtered(lambda m: m.product_id == point.component_id)
                         if not moves:
-                            moves = production.move_raw_ids.filtered(lambda m: not m.operation_id and m.product_id == point.component_id)
+                            moves = production.move_raw_ids.filtered(
+                                lambda m: not m.operation_id and m.product_id == point.component_id)
                     else:
                         check = self.env['quality.check'].create(values)
                         previous_check.next_check_id = check
@@ -363,8 +373,10 @@ class MrpProductionWorkcenterLine(models.Model):
                     processed_move |= moves
 
             # Generate quality checks associated with unreferenced components
-            moves_without_check = ((move_raw_ids | move_finished_ids) - processed_move).filtered(lambda move: (move.has_tracking != 'none' and not move.raw_material_production_id.use_auto_consume_components_lots) or move.operation_id)
-            quality_team_id = self.env['quality.alert.team'].search(['|', ('company_id', '=', wo.company_id.id), ('company_id', '=', False)], limit=1).id
+            moves_without_check = ((move_raw_ids | move_finished_ids) - processed_move).filtered(lambda move: (
+                                                                                                                          move.has_tracking != 'none' and not move.raw_material_production_id.use_auto_consume_components_lots) or move.operation_id)
+            quality_team_id = self.env['quality.alert.team'].search(
+                ['|', ('company_id', '=', wo.company_id.id), ('company_id', '=', False)], limit=1).id
             for move in moves_without_check:
                 values = {
                     'production_id': production.id,
@@ -412,7 +424,8 @@ class MrpProductionWorkcenterLine(models.Model):
 
         backorder = False
         # Trigger the backorder process if we produce less than expected
-        if float_compare(self.qty_producing, self.qty_remaining, precision_rounding=self.product_uom_id.rounding) == -1 and self.is_first_started_wo:
+        if float_compare(self.qty_producing, self.qty_remaining,
+                         precision_rounding=self.product_uom_id.rounding) == -1 and self.is_first_started_wo:
             backorder = self.production_id._split_productions()[1:]
             for workorder in backorder.workorder_ids:
                 if workorder.product_tracking == 'serial':
@@ -423,7 +436,8 @@ class MrpProductionWorkcenterLine(models.Model):
         else:
             if self.operation_id:
                 backorder = (self.production_id.procurement_group_id.mrp_production_ids - self.production_id).filtered(
-                    lambda p: p.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_id).state not in ('cancel', 'done')
+                    lambda p: p.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_id).state not in (
+                    'cancel', 'done')
                 )[:1]
             else:
                 index = list(self.production_id.workorder_ids).index(self)
@@ -442,7 +456,8 @@ class MrpProductionWorkcenterLine(models.Model):
                     wo.current_quality_check_id._update_component_quantity()
             if not self.env.context.get('no_start_next'):
                 if self.operation_id:
-                    return backorder.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_id).open_tablet_view()
+                    return backorder.workorder_ids.filtered(
+                        lambda wo: wo.operation_id == self.operation_id).open_tablet_view()
                 else:
                     index = list(self.production_id.workorder_ids).index(self)
                     return backorder.workorder_ids[index].open_tablet_view()
@@ -466,7 +481,8 @@ class MrpProductionWorkcenterLine(models.Model):
 
     def open_tablet_view(self):
         self.ensure_one()
-        if not self.is_user_working and self.working_state != 'blocked' and self.state in ('ready', 'waiting', 'progress', 'pending'):
+        if not self.is_user_working and self.working_state != 'blocked' and self.state in (
+        'ready', 'waiting', 'progress', 'pending'):
             self.button_start()
         action = self.env["ir.actions.actions"]._for_xml_id("mrp_workorder.tablet_client_action")
         action['target'] = 'fullscreen'
@@ -521,7 +537,8 @@ class MrpProductionWorkcenterLine(models.Model):
         data = {
             'mrp.workorder': self.read(self._get_fields_for_tablet(), load=False)[0],
             'quality.check': self.check_ids._get_fields_for_tablet(sorted_check_list),
-            'operation': self.operation_id.read(self.operation_id._get_fields_for_tablet())[0] if self.operation_id else {},
+            'operation': self.operation_id.read(self.operation_id._get_fields_for_tablet())[
+                0] if self.operation_id else {},
             'working_state': self.workcenter_id.working_state,
             'views': {
                 'workorder': self.env.ref('mrp_workorder.mrp_workorder_view_form_tablet').id,
@@ -553,7 +570,8 @@ class MrpProductionWorkcenterLine(models.Model):
 
         return {
             'duration': self.duration,
-            'position': bisect_left(last30op, self.duration), # which position regarded other workorders ranked by duration
+            'position': bisect_left(last30op, self.duration),
+            # which position regarded other workorders ranked by duration
             'quality_score': score,
             'show_rainbow': show_rainbow,
         }

mrp_workorder/views/mrp_workorder_views.xml

@@ -27,6 +27,13 @@
                     </field>
                 </page>
             </page>
+            <xpath expr="//sheet" position="after">
+               <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids" options="{'post_refresh': 'recipients'}"/>
+                </div>
+            </xpath>
         </field>
     </record>
 

sf_base/static/src/scss/format_img.scss

@@ -1,7 +1,7 @@
 .o_data_row .w-100 {
   width: 40px !important;
   height: 40px !important;
-  display: block !important;
+  //display: block !important;
 }
 
 .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) {

sf_bf_connect/models/jd_eclp.py

@@ -67,9 +67,10 @@ class JdEclp(models.Model):
         """
         判断是否为出库单
         """
-        if self.name:
-            is_check_out = self.name.split('/')
-            self.check_out = is_check_out[1]
+        for record in self:
+            if record.name:
+                is_check_out = record.name.split('/')
+                record.check_out = is_check_out[1]
 
     @api.depends('carrier_tracking_ref')
     def query_bill_pdf(self):

sf_dlm_management/views/product_template_management_view.xml

@@ -10,6 +10,7 @@
                     <field name='categ_id' class="custom_required" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
+                    <field name='part_number' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                     <field name='manual_quotation' attrs="{'invisible':[('upload_model_file', '=', [])]}"/>
                     <field name="upload_model_file"
                            widget="many2many_binary"
@@ -304,7 +305,7 @@
                                 <field name="cutting_tool_blade_type"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
-                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
                                 <!--整体式刀具-->
                                 <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>

sf_machine_connect/views/WorkCenterBarcodes.xml

@@ -25,6 +25,9 @@
                 <filter string="人工编程" name="manual_quotation" domain="[('manual_quotation', '=', True)]"/>
                 <filter string="自动编程" name="no_manual_quotation" domain="[('manual_quotation', '=', False)]"/>
             </xpath>
+            <xpath expr="//field[@name='production_id']" position="before">
+                <field name="product_tmpl_name"/>
+            </xpath>
         </field>
     </record>
 </odoo>

sf_manufacturing/controllers/controllers.py

@@ -8,7 +8,7 @@ from odoo.http import request
 
 class Manufacturing_Connect(http.Controller):
 
-    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def get_Work_Info(self, **kw):
         """
@@ -215,7 +215,9 @@ class Manufacturing_Connect(http.Controller):
             if workorder.state != 'progress':
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
                 return json.JSONEncoder().encode(res)
-            workorder.button_finish()
+            # workorder.write({'date_finished': datetime.now()})
+            if ret['IsComplete'] is True:
+                workorder.button_finish()
             # workorder.process_state = '待解除装夹'
             # workorder.sudo().production_id.process_state = '待解除装夹'
 

sf_manufacturing/models/agv_setting.py

@@ -2,7 +2,8 @@
 import requests
 import logging
 import time
-from odoo import fields, models
+from odoo import fields, models, api
+from odoo.exceptions import UserError
 
 
 class AgvSetting(models.Model):
@@ -59,11 +60,17 @@ class AgvTaskRoute(models.Model):
         ('F01', '搬运'), ], string='任务类型', default="F01")
     route_type = fields.Selection([
         ('上产线', '上产线'), ('下产线', '下产线'), ('运送空料架', '运送空料架')], string='类型')
-    start_site_id = fields.Many2one('sf.agv.site', '起点接驳站位置编号')
-    end_site_id = fields.Many2one('sf.agv.site', '终点接驳站位置编号')
+    start_site_id = fields.Many2one('sf.agv.site', '起点接驳站')
+    end_site_id = fields.Many2one('sf.agv.site', '终点接驳站')
     destination_production_line_id = fields.Many2one('sf.production.line', '目的生产线')
     active = fields.Boolean('有效', default=True)
 
+    @api.constrains('end_site_id')
+    def _check_end_site_id(self):
+        if self.end_site_id:
+            if self.end_site_id == self.start_site_id:
+                raise UserError("您选择的终点接驳站与起点接驳站重复,请重新选择")
+
 
 class Center_controlInterfaceLog(models.Model):
     _name = 'center_control.interface.log'

sf_manufacturing/models/mrp_production.py

@@ -5,7 +5,7 @@ import re
 import requests
 from itertools import groupby
 from odoo import api, fields, models, _
-from odoo.exceptions import UserError,ValidationError
+from odoo.exceptions import UserError, ValidationError
 from odoo.addons.sf_base.commons.common import Common
 from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
 
@@ -53,13 +53,13 @@ class MrpProduction(models.Model):
     active = fields.Boolean(string='已归档', default=True)
     programming_no = fields.Char('编程单号')
     work_state = fields.Char('业务状态')
-    programming_state = fields.Char('编程状态')
+    programming_state = fields.Char('编程状态', tracking=True)
     glb_file = fields.Binary("glb模型文件")
-    production_line_id = fields.Many2one('sf.production.line', string='生产线')
+    production_line_id = fields.Many2one('sf.production.line', string='生产线', tracking=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间')
     production_line_state = fields.Selection(
         [('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
-        string='上/下产线', default='待上产线')
+        string='上/下产线', default='待上产线', tracking=True)
     # 工序状态
     # Todo 研究下用法
     process_state = fields.Selection([
@@ -77,6 +77,7 @@ class MrpProduction(models.Model):
     part_drawing = fields.Binary('零件图纸')
 
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+    rework_production = fields.Many2one('mrp.production', string='返工的制造订单')
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
@@ -154,6 +155,28 @@ class MrpProduction(models.Model):
         for production in self:
             production.maintenance_count = len(production.request_ids)
 
+    # 制造订单报废:编程单更新
+    def updateCNC(self):
+        try:
+            res = {'production_no': self.name, 'programming_no': self.programming_no,
+                   'order_no': self.origin}
+            logging.info('res=%s:' % res)
+            configsettings = self.env['res.config.settings'].get_values()
+            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+            url = '/api/intelligent_programming/update_intelligent_programmings'
+            config_url = configsettings['sf_url'] + url
+            res['token'] = configsettings['token']
+            ret = requests.post(config_url, json={}, data=res, headers=config_header)
+            ret = ret.json()
+            logging.info('updateCNC-ret:%s' % ret)
+            if ret['status'] == 1:
+                self.write({'work_state': '已编程'})
+            else:
+                raise UserError(ret['message'])
+        except Exception as e:
+            logging.info('updateCNC error:%s' % e)
+            raise UserError("更新程单失败,请联系管理员")
+
     # cnc程序获取
     def fetchCNC(self, production_names):
         cnc = self.env['mrp.production'].search([('id', '=', self.id)])
@@ -171,6 +194,7 @@ class MrpProduction(models.Model):
                 'production_no': production_names,
                 'machine_tool_code': '',
                 'product_name': cnc.product_id.name,
+                'remanufacture_type': '',
                 'model_code': cnc.product_id.model_code,
                 'material_code': self.env['sf.production.materials'].search(
                     [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
@@ -316,6 +340,7 @@ class MrpProduction(models.Model):
                         else:
                             production.write({'programming_no': production_programming.programming_no,
                                               'programming_state': '编程中'})
+
                 # # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -406,20 +431,15 @@ class MrpProduction(models.Model):
 
     # 工单排序
     def _reset_work_order_sequence1(self, k):
-        sequen = 0
         for rec in self:
-            current_sequence = 10
+            cnc_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工")
+            cnc_back_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工(返工)")
             for work in rec.workorder_ids:
-                work.sequence = current_sequence
-                current_sequence += 10
-                if work.name == '后置三元质量检测' and work.processing_panel == k:
-                    sequen = work.sequence
-
-            for work in rec.workorder_ids:
-                if work.name == '后置三元质量检测(返工)' and work.processing_panel == k:
-                    work.sequence = sequen + 2
-                if work.name == 'CNC加工(返工)' and work.processing_panel == k:
-                    work.sequence = sequen + 1
+                if work.name == cnc_workorder.name and work.processing_panel == k:
+                    cnc_back_workorder.write({'sequence': work.sequence + 1})
+                    print(cnc_back_workorder.sequence)
+                elif work.routing_type not in ['装夹预调'] and work != cnc_back_workorder:
+                    work.sequence += 1
 
     # 在制造订单上新增工单
     def _create_workorder1(self, k):
@@ -459,13 +479,7 @@ class MrpProduction(models.Model):
                     order='sequence asc'
                 )
                 i += 1
-
                 for route in routingworkcenter:
-
-                    # if route.routing_type == '后置三元质量检测':
-                    #     workorders_values.append(
-                    #         self.env['mrp.workorder'].json_workorder_str1(k, production, route)
-                    #     )
                     if route.routing_type == 'CNC加工':
                         workorders_values.append(
                             self.env['mrp.workorder'].json_workorder_str1(k, production, route))

sf_manufacturing/models/mrp_workorder.py

@@ -21,6 +21,8 @@ class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
     _order = 'sequence asc,create_date desc'
 
+    product_tmpl_name = fields.Char('坯料产品名称', related='production_bom_id.bom_line_ids.product_id.name')
+
     product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True,
                                           string="坯料长度(mm)")
     product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True,
@@ -102,7 +104,7 @@ class ResMrpWorkOrder(models.Model):
     Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
     test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
-                                    string="检测结果")
+                                    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程序")
     tray_code = fields.Char(string="托盘编码")
@@ -133,7 +135,7 @@ class ResMrpWorkOrder(models.Model):
         return action
 
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
-    equipment_id = fields.Many2one('maintenance.equipment', string='加工设备')
+    equipment_id = fields.Many2one('maintenance.equipment', string='加工设备', tracking=True)
     is_ok = fields.Boolean(string='是否合格')
     # 加工人
     processing_user_id = fields.Many2one('res.users', string='加工人')
@@ -195,11 +197,16 @@ class ResMrpWorkOrder(models.Model):
     rfid_code_old = fields.Char('RFID码(已解除)')
 
     production_line_id = fields.Many2one('sf.production.line', related='production_id.production_line_id',
-                                         string='生产线', store=True)
+                                         string='生产线', store=True, tracking=True)
     production_line_state = fields.Selection(related='production_id.production_line_state',
-                                             string='上/下产线', store=True)
+                                             string='上/下产线', store=True, tracking=True)
     detection_report = fields.Binary('检测报告', readonly=True)
-    is_remanufacture = fields.Boolean(string='是否重新生成制造订单', default=True)
+    is_remanufacture = fields.Boolean(string='重新生成制造订单', default=False)
+    is_fetchcnc = fields.Boolean(string='重新获取NC程序', default=False)
+    reason = fields.Selection(
+        [("programming", "编程"), ("clamping", "返工"), ("cutter", "刀具"), ("operate computer", "操机"),
+         ("technology", "工艺"), ("customer redrawing", "客户改图"), ("other", "其他"), ], string="原因", tracking=True)
+    detailed_reason = fields.Text('详细原因')
 
     @api.onchange('rfid_code')
     def _onchange(self):
@@ -672,18 +679,64 @@ class ResMrpWorkOrder(models.Model):
         """
         重新生成制造订单或者重新生成工单
         """
-        if self.test_results == '报废':
+        if self.test_results in ['返工', '报废']:
             values = self.env['mrp.production'].create_production1_values(self.production_id)
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
                 self.production_id.company_id).create(
                 values)
-            self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
             self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
             productions._create_workorder()
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (
                                                    p.move_dest_ids.procure_method != 'make_to_order' and
                                                    not p.move_raw_ids and not p.workorder_ids)).action_confirm()
+            for production_item in productions:
+                process_parameter_workorder = self.env['mrp.workorder'].search(
+                    [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production_item.id),
+                     ('is_subcontract', '=', True)])
+                if process_parameter_workorder:
+                    is_pick = False
+                    consecutive_workorders = []
+                    m = 0
+                    sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
+                    for i in range(len(sorted_workorders) - 1):
+                        if m == 0:
+                            is_pick = False
+                        if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \
+                                sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \
+                                sorted_workorders[i].id == sorted_workorders[i + 1].id - 1:
+                            if sorted_workorders[i] not in consecutive_workorders:
+                                consecutive_workorders.append(sorted_workorders[i])
+                            consecutive_workorders.append(sorted_workorders[i + 1])
+                            m += 1
+                            continue
+                        else:
+                            if m == len(consecutive_workorders) - 1 and m != 0:
+                                self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
+                                                                                     production_item)
+                                if sorted_workorders[i] in consecutive_workorders:
+                                    is_pick = True
+                                consecutive_workorders = []
+                                m = 0
+                            # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
+                            if is_pick is False:
+                                self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
+                                                                                     production_item)
+                        if m == len(consecutive_workorders) - 1 and m != 0:
+                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
+                                                                                 production_item)
+                            if sorted_workorders[i] in consecutive_workorders:
+                                is_pick = True
+                            consecutive_workorders = []
+                            m = 0
+                    if m == len(consecutive_workorders) - 1 and m != 0:
+                        self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production_item)
+                    if is_pick is False and m == 0:
+                        if len(sorted_workorders) == 1:
+                            self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item)
+                        else:
+                            self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production_item)
 
             for production in productions:
                 origin_production = production.move_dest_ids and production.move_dest_ids[
@@ -704,13 +757,36 @@ class ResMrpWorkOrder(models.Model):
                         'mail.message_origin_link',
                         values={'self': production, 'origin': origin_production},
                         subtype_id=self.env.ref('mail.mt_note').id)
-        if self.test_results == '返工':
-            productions = self.production_id
-            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-            productions._create_workorder2(self.processing_panel)
-        else:
-            self.results = '合格'
+
+            '''
+            创建生产计划
+            '''
+            # 工单耗时
+            workorder_duration = 0
+            for workorder in productions.workorder_ids:
+                workorder_duration += workorder.duration_expected
+
+            sale_order = self.env['sale.order'].sudo().search([('name', '=', productions.origin)])
+            if sale_order:
+                sale_order.mrp_production_ids |= productions
+                # sale_order.write({'schedule_status': 'to schedule'})
+                self.env['sf.production.plan'].sudo().with_company(self.production_id.company_id).create({
+                    'name': productions.name,
+                    'order_deadline': sale_order.deadline_of_delivery,
+                    'production_id': productions.id,
+                    'date_planned_start': productions.date_planned_start,
+                    'origin': productions.origin,
+                    'product_qty': productions.product_qty,
+                    'product_id': productions.product_id.id,
+                    'state': 'draft',
+                })
+        # if self.test_results == '返工':
+        #     productions = self.production_id
+        #     # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+        #     # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+        #     productions._create_workorder2(self.processing_panel)
+        # else:
+        #     self.results = '合格'
 
     def json_workorder_str1(self, k, production, route):
         workorders_values_str = [0, '', {
@@ -720,7 +796,6 @@ class ResMrpWorkOrder(models.Model):
             'name': '%s(返工)' % route.route_workcenter_id.name,
             'processing_panel': k,
             'routing_type': route.routing_type,
-            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
                                                                                route.routing_type,
                                                                                production.product_id),
@@ -728,10 +803,37 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_finished': datetime.now() + timedelta(days=1),
             'duration_expected': 60,
             'duration': 0,
-
+            'manual_quotation': production.workorder_ids.filtered(
+                lambda t: t.routing_type == 'CNC加工').manual_quotation,
+            'rfid_code': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').rfid_code,
+            'cnc_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cnc_ids,
+            'cmm_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cmm_ids,
         }]
         return workorders_values_str
 
+    # @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state')
+    # def _compute_state(self):
+    #     super(ResMrpWorkOrder, self)._compute_state()
+    #     for item in self:
+    #         print(item.name)
+    #         print(item.state)
+    #         print(item.is_remanufacture)
+    #         scrap_workorder = self.env['mrp.workorder'].search(
+    #             [('production_id', '=', item.production_id.id), ('routing_type', '=', 'CNC加工'),
+    #              ('state', '=', 'done'), ('test_results', 'in', ['返工', '报废'])])
+    #         print(scrap_workorder)
+    #         # if item.routing_type == 'CNC加工' and item.state in ['done'] and item.test_results in ['返工', '报废']:
+    #         if item.routing_type == '解除装夹':
+    #             if scrap_workorder and item.state not in ['cancel']:
+    #                 item.state = 'cancel'
+    #         elif item.routing_type == '表面工艺':
+    #             if scrap_workorder:
+    #                 stock_move = self.env['stock.move'].search(
+    #                     [('origin', '=', item.production_id.name)])
+    #                 stock_move.write({'state': 'cancel'})
+    #                 item.picking_ids.write({'state': 'cancel'})
+    #                 item.state = 'cancel'
+
     # 重写工单开始按钮方法
     def button_start(self):
         if self.routing_type == '装夹预调':
@@ -749,12 +851,12 @@ class ResMrpWorkOrder(models.Model):
                 limit=1, order='id asc')
             if not cnc_workorder.cnc_ids:
                 raise UserError(_('该制造订单还未下发CNC程序，请稍后再试'))
-            else:
-                for item in cnc_workorder.cnc_ids:
-                    functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
-                        [('tool_name_id.name', '=', item.cutting_tool_name)])
-                    if not functional_cutting_tool:
-                        raise UserError(_('该制造订单的CNC程序为%s没有对应的功能刀具' % item.cutting_tool_name))
+            # else:
+            #     for item in cnc_workorder.cnc_ids:
+            #         functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
+            #             [('tool_name_id.name', '=', item.cutting_tool_name)])
+            #         if not functional_cutting_tool:
+            #             raise UserError(_('该制造订单的CNC程序为%s没有对应的功能刀具' % item.cutting_tool_name))
         if self.routing_type == '解除装夹':
             '''
             记录开始时间
@@ -887,6 +989,7 @@ class ResMrpWorkOrder(models.Model):
                             raise UserError(
                                 '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
             tem_date_planned_finished = record.date_planned_finished
+            tem_date_finished = record.date_finished
             logging.info('routing_type:%s' % record.routing_type)
             super().button_finish()
             logging.info('date_planned_finished:%s' % record.date_planned_finished)
@@ -895,14 +998,28 @@ class ResMrpWorkOrder(models.Model):
                 record.write({
                     'date_planned_finished': tem_date_planned_finished  # 保持原值
                 })
+                # if record.routing_type == 'CNC加工':
+                #     record.write({
+                #         'date_finished': tem_date_finished  # 保持原值
+                #     })
+            # if record.routing_type == 'CNC加工' and record.test_results in ['返工', '报废']:
+            #     record.production_id.action_cancel()
+            #     record.production_id.workorder_ids.write({'rfid_code': False, 'rfid_code_old': record.rfid_code})
+            #     if record.is_remanufacture is True:
+            #         record.recreateManufacturingOrWorkerOrder()
             is_production_id = True
             for workorder in record.production_id.workorder_ids:
                 if workorder.state != 'done':
                     is_production_id = False
-            if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺']:
+            if record.routing_type == '解除装夹':
                 for workorder in record.production_id.workorder_ids:
-                    workorder.rfid_code_old = workorder.rfid_code
-                    workorder.rfid_code = None
+                    if workorder.processing_panel == record.processing_panel:
+                        rfid_code = workorder.rfid_code
+                        workorder.write({'rfid_code_old': rfid_code,
+                                         'rfid_code': ''})
+                        workorder.rfid_code_old = rfid_code
+                        workorder.rfid_code = ''
+            if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺']:
                 for move_raw_id in record.production_id.move_raw_ids:
                     move_raw_id.quantity_done = move_raw_id.product_uom_qty
                 record.process_state = '已完工'
@@ -1035,8 +1152,10 @@ class CNCprocessing(models.Model):
     # 根据程序名和加工面匹配到ftp里对应的Nc程序名,可优化为根据cnc_processing.program_path进行匹配
     def get_cnc_processing_file(self, serverdir, cnc_processing, program_path):
         logging.info('serverdir:%s' % serverdir)
+        logging.info('cnc_processing:%s' % cnc_processing)
         for root, dirs, files in os.walk(serverdir):
             for f in files:
+                logging.info('splitext(f):%s' % os.path.splitext(f)[1])
                 if os.path.splitext(f)[1] == ".pdf":
                     full_path = os.path.join(serverdir, root, f)
                     cnc_processing.workorder_id.cnc_worksheet = base64.b64encode(
@@ -1142,11 +1261,12 @@ class SfWorkOrderBarcodes(models.Model):
                             workorder.write(val)
                             self.write(val)
                             workorder_rfid = self.env['mrp.workorder'].search(
-                                [('production_id', '=', workorder.production_id.id)])
+                                [('production_id', '=', workorder.production_id.id),
+                                 ('processing_panel', '=', workorder.processing_panel)])
                             if workorder_rfid:
                                 for item in workorder_rfid:
                                     item.write({'rfid_code': barcode})
-                            logging.info("Rfid绑定成功！！！")
+                            logging.info("Rfid[%s]绑定成功！！！" % barcode)
                         else:
                             raise UserError('该Rfid【%s】绑定的是【%s】, 不是托盘！！！' % (barcode, lot.product_id.name))
                     self.process_state = '待检测'
@@ -1206,17 +1326,18 @@ class SfWorkOrderBarcodes(models.Model):
 
 class WorkPieceDelivery(models.Model):
     _name = "sf.workpiece.delivery"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
     _description = '工件配送'
 
-    name = fields.Char('单据编号')
+    name = fields.Char('单据编码')
     workorder_id = fields.Many2one('mrp.workorder', string='工单', readonly=True)
     workorder_state = fields.Selection(related='workorder_id.state', string='工单状态')
     rfid_code = fields.Char(related='workorder_id.rfid_code', string='rfid码', store=True)
     production_id = fields.Many2one('mrp.production', string='制造订单号', readonly=True)
-    production_line_id = fields.Many2one('sf.production.line', string='目的生产线')
+    production_line_id = fields.Many2one('sf.production.line', string='目的生产线', tracking=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间', readonly=True)
 
-    route_id = fields.Many2one('sf.agv.task.route', '任务路线')
+    route_id = fields.Many2one('sf.agv.task.route', '任务路线', tracking=True)
     feeder_station_start_id = fields.Many2one('sf.agv.site', '起点接驳站')
     feeder_station_destination_id = fields.Many2one('sf.agv.site', '目的接驳站')
     task_delivery_time = fields.Datetime('任务下发时间')
@@ -1225,26 +1346,41 @@ class WorkPieceDelivery(models.Model):
         [('上产线', '上产线'), ('下产线', '下产线'), ('运送空料架', '运送空料架')], string='类型')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
     status = fields.Selection(
-        [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态', default='待下发')
-    is_cnc_program_down = fields.Boolean('程序是否下发', default=False)
+        [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态', default='待下发',
+        tracking=True)
+    is_cnc_program_down = fields.Boolean('程序是否下发', default=False, tracking=True)
     is_manual_work = fields.Boolean('人工操作', default=False)
     active = fields.Boolean(string="有效", default=True)
 
     @api.model
     def create(self, vals):
-        if vals.get('name', '/') == '/' or vals.get('name', '/') is False:
-            vals['name'] = self.env['ir.sequence'].next_by_code('sf.workpiece.delivery') or '/'
-        else:
+        if vals['route_id'] and vals.get('type') is None:
             vals['type'] = '运送空料架'
+        else:
+            if vals.get('name', '/') == '/' or vals.get('name', '/') is False:
+                vals['name'] = self.env['ir.sequence'].next_by_code('sf.workpiece.delivery') or '/'
         obj = super(WorkPieceDelivery, self).create(vals)
+        if obj.type == '运送空料架':
+            if obj.name is False:
+                obj.name = "运送空料架路线:%s-%s" % (
+                    obj.feeder_station_start_id.name, obj.feeder_station_destination_id.name)
         return obj
 
-    @api.constrains('name')
-    def _check_name(self):
+    @api.constrains('route_id')
+    def _check_route_id(self):
         if self.type == '运送空料架':
-            wd = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)])
-            if wd:
-                raise UserError("该名称已存在")
+            if self.route_id and self.name is False:
+                route = self.sudo().search(
+                    [('route_id', '=', self.route_id.id), ('id', '!=', self.id), ('name', 'ilike', '运送空料架路线')])
+                if route:
+                    raise UserError("该任务路线已存在，请重新选择")
+
+    # @api.constrains('name')
+    # def _check_name(self):
+    #     if self.type == '运送空料架':
+    #         wd = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)])
+    #         if wd:
+    #             raise UserError("该名称已存在")
 
     def action_delivery_history(self):
         return {

sf_manufacturing/models/product_template.py

@@ -539,6 +539,7 @@ class ResProductMo(models.Model):
 
     # bfm下单
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+    part_number = fields.Char(string='零件图号', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -635,6 +636,7 @@ class ResProductMo(models.Model):
             'model_remark': item['remark'],
             'default_code': '%s-%s' % (order_number, i),
             'manual_quotation': item['manual_quotation'] or False,
+            'part_number': item.get('part_number') or '',
             'active': True,
         }
         copy_product_id.sudo().write(vals)

sf_manufacturing/models/stock.py

@@ -632,8 +632,8 @@ class ReStockMove(models.Model):
             'reserved_uom_qty': 1.0,
             'lot_id': purchase.picking_ids.move_line_ids.lot_id.id,
             'company_id': self.company_id.id,
-            'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
-            'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id,
+            # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
+            # 'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id,
             'state': 'assigned',
         }
 
@@ -701,13 +701,36 @@ class ReStockMove(models.Model):
             ),
         }
 
+    def put_move_line(self):
+        """
+        确认订单时,自动分配序列号
+        """
+        if self.product_id.tracking == "serial":
+            if self.product_id.categ_id.name == '刀具':
+                self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
+            else:
+                self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
+            self._generate_serial_numbers()
+            for item in self.move_line_nosuggest_ids:
+                if item.lot_name:
+                    lot_name = item.lot_name
+                    if item.product_id.categ_id.name == '坯料':
+                        lot_name = lot_name.split('[', 1)[0]
+                    item.lot_qr_code = self.compute_lot_qr_code(lot_name)
+
     def _put_tool_lot(self, company, product, origin):
         if product.tracking == "lot" and self.product_id.categ_id.name == '刀具':
             if not self.move_line_nosuggest_ids:
-                lot_names = self.env['stock.lot'].generate_lot_names(
-                    '%s-%s-%s' % ('%s-T-DJWL-%s' % (
-                        product.cutting_tool_model_id.code.split('-')[0], product.cutting_tool_material_id.code),
-                                  datetime.now().strftime("%Y%m%d"), origin), 1)
+                lot_code = '%s-%s-%s' % ('%s-T-DJWL-%s' % (
+                    product.cutting_tool_model_id.code.split('-')[0], product.cutting_tool_material_id.code),
+                                         datetime.now().strftime("%Y%m%d"), origin)
+                move_line_ids = self.env['stock.move.line'].sudo().search([('lot_name', 'like', lot_code)], limit=1,
+                                                                          order='id desc')
+                if not move_line_ids:
+                    lot_code = '%s-001' % lot_code
+                else:
+                    lot_code = '%s-%03d' % (lot_code, int(move_line_ids.lot_name[-3:]) + 1)
+                lot_names = self.env['stock.lot'].generate_lot_names(lot_code, 1)
                 move_lines_commands = self._generate_serial_move_line_commands_tool_lot(lot_names)
                 self.write({'move_line_nosuggest_ids': move_lines_commands})
                 for item in self.move_line_nosuggest_ids:

sf_manufacturing/views/agv_setting_views.xml

@@ -7,9 +7,9 @@
             <field name="model">sf.agv.site</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
-                    <field name="name" required="1"/>
-                    <field name="owning_region" required="1"/>
-                    <field name="state" required="1"/>
+                    <field name="name" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                    <field name="owning_region" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                    <field name="state" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name="divide_the_work" required="1"/>
                 </tree>
             </field>
@@ -34,12 +34,14 @@
             <field name="model">sf.agv.task.route</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
-                    <field name="name" required="1"/>
+                    <field name="name" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name="type" readonly="1" string="任务类型"/>
-                    <field name="route_type" string="类型"/>
-                    <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/>
+                    <field name="route_type" string="类型" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                    <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"
+                           attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
-                    <field name="destination_production_line_id" required="1" options="{'no_create': True}"/>
+                    <field name="destination_production_line_id" required="1" options="{'no_create': True}"
+                           attrs="{'readonly': [('id', '!=', False)]}"/>
                 </tree>
             </field>
         </record>
@@ -73,7 +75,8 @@
         <field name="model">center_control.interface.log</field>
         <field name="arch" type="xml">
             <search string="Logs">
-                <field name="name"/>
+                <field name="name" filter_domain="[('name','ilike', self)]"/>
+                <field name="content" filter_domain="[('content','ilike', self)]"/>
                 <group expand="0" string="分组">
                     <field name="interface_call_date"/>
                 </group>

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -87,7 +87,7 @@
                 <xpath expr="//field[@name='user_id']" position="after">
                     <field name="production_line_id" readonly="1"/>
                     <field name="production_line_state" readonly="1"/>
-                    <field name="part_number"/>
+                    <field name="part_number" string="成品的零件图号"/>
                     <field name="part_drawing"/>
                 </xpath>
                 <xpath expr="//header//button[@name='action_cancel']" position="replace">

sf_manufacturing/views/mrp_workorder_view.xml

@@ -19,6 +19,7 @@
             </field>
             <field name="state" position="after">
                 <field name="work_state" optional="hide"/>
+                <field name="product_tmpl_name" invisible="1"/>
             </field>
             <field name="product_id" position="after">
                 <field name="equipment_id" optional="hide"/>
@@ -80,7 +81,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>
-<!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
+        <!--            (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
         <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
@@ -477,8 +478,13 @@
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
                         <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
-                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","=","合格")]}'/>
-                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
+<!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
+<!--                        <field name="is_fetchcnc"-->
+<!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
+<!--                        <field name="reason"-->
+<!--                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
+<!--                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
+<!--                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>
                     </group>
@@ -573,7 +579,7 @@
                     <label for="material_height" string="高"/>
                     <field name="material_height" class="o_address_zip"/>
                 </div>
-                <field name="part_number"/>
+                <field name="part_number" string="成品的零件图号"/>
             </xpath>
         </field>
     </record>
@@ -604,7 +610,7 @@
         <field name="name">工件配送</field>
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
-            <tree string="工件配送" editable="bottom" class="center" create="0" delete="0">
+            <tree string="工件配送" class="center" create="0" delete="0">
                 <header>
                     <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
                 </header>
@@ -612,13 +618,13 @@
                        decoration-success="status == '已配送'"
                        decoration-warning="status == '待下发'"
                        decoration-danger="status == '待配送'"/>
+                <field name="name"/>
                 <field name="production_id"/>
                 <field name="type" readonly="1"/>
                 <field name="production_line_id" options="{'no_create': True}" readonly="1"/>
                 <field name="route_id" options="{'no_create': True}"
                        domain="[('route_type','in',['上产线','下产线'])]"/>
                 <field name="feeder_station_start_id" readonly="1" force_save="1"/>
-                <field name="feeder_station_start_id" readonly="1" force_save="1"/>
                 <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
                 <field name="is_cnc_program_down" readonly="1"/>
                 <!--                <field name="rfid_code"/>-->
@@ -629,13 +635,58 @@
         </field>
     </record>
 
+    <record id="sf_workpiece_delivery_form" model="ir.ui.view">
+        <field name="name">工件配送</field>
+        <field name="model">sf.workpiece.delivery</field>
+        <field name="arch" type="xml">
+            <form string="工件配送" create="0" delete="0">
+                <header>
+                    <field name="status" widget="statusbar"/>
+                    <button name="button_delivery" type="object" string="配送" class="oe_highlight"
+                            attrs="{'invisible': [('status', '!=', '待下发')]}"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group string="基本信息">
+                            <field name="production_id"/>
+                            <field name="type" readonly="1"/>
+                            <field name="production_line_id" options="{'no_create': True}" readonly="1"/>
+                            <field name="is_cnc_program_down" readonly="1"/>
+                            <!--                <field name="rfid_code"/>-->
+                        </group>
+                        <group string="配送信息">
+                            <field name="route_id" options="{'no_create': True}"
+                                   domain="[('route_type','in',['上产线','下产线'])]"/>
+                            <field name="feeder_station_start_id" readonly="1" force_save="1"/>
+                            <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
+                            <field name="task_delivery_time" readonly="1"/>
+                            <field name="task_completion_time" readonly="1"/>
+                            <field name="delivery_duration" widget="float_time"/>
+                        </group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids" options="{'post_refresh': 'recipients'}"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
     <record id="sf_workpiece_delivery_search" model="ir.ui.view">
         <field name="name">工件配送</field>
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
             <search string="工件配送">
-                <filter string="上产线" name="on_up" domain="[('type', '=', '上产线')]"/>
-                <filter string="下产线" name="on_down" domain="[('type', '=', '下产线' )]"/>
+                <filter name="filter_to_be_issued" string="待下发" domain="[('status', 'in', ['待下发'])]"/>
+                <filter name="filter_waiting_delivery" string="待配送" domain="[('status', 'in', ['待配送'])]"/>
+                <filter name="filter_delivered" string="已配送" domain="[('status', 'in', ['已配送'])]"/>
                 <field name="rfid_code"/>
                 <field name="production_id"/>
                 <field name="feeder_station_start_id"/>
@@ -657,8 +708,10 @@
         <field name="name">工件配送</field>
         <field name="res_model">sf.workpiece.delivery</field>
         <field name="search_view_id" ref="sf_workpiece_delivery_search"/>
-        <field name="context">{'search_default_on_up':1}</field>
-        <field name="view_mode">tree,search</field>
+        <field name="context">{'search_default_filter_to_be_issued': 1,
+            'search_default_filter_waiting_delivery': 1}
+        </field>
+        <field name="view_mode">tree,form</field>
         <field name="domain">
             [('type','in',['上产线','下产线']),('workorder_state','=','done'),('is_manual_work','=',false)]
         </field>
@@ -671,23 +724,39 @@
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
             <tree string="工件配送" editable="bottom" class="center" delete="0" create="1">
-                <header>
-                    <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
-                </header>
-                <field name="name" string="路线名称" attrs="{'readonly': [('id', '!=', False)]}"
-                       placeholder="例如:运送空料架路线:G01-A01" required="1" force_save="1"/>
+                <!--                <header>-->
+                <!--                    <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>-->
+                <!--                </header>-->
+                <!--                <field name="name" string="路线名称" attrs="{'readonly': [('id', '!=', False)]}"-->
+                <!--                       placeholder="例如:运送空料架路线:G01-A01" required="1" force_save="1"/>-->
                 <field name="route_id" options="{'no_create': True}" required="1"
                        attrs="{'readonly': [('id', '!=', False)]}" domain="[('route_type', '=', '运送空料架')]"
                        force_save="1"/>
                 <field name="feeder_station_start_id" readonly="1" force_save="1"/>
                 <!--                <field name="type" readonly="1"/>-->
                 <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
+                <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
                 <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"
                         string="历史"/>
             </tree>
         </field>
     </record>
 
+    <!--    <record id="sf_workpiece_delivery_empty_racks_kanban" model="ir.ui.view">-->
+    <!--        <field name="name">sf.workpiece.delivery.view.kanban</field>-->
+    <!--        <field name="model">sf.workpiece.delivery</field>-->
+    <!--        <field name="arch" type="xml">-->
+    <!--            <kanban>-->
+    <!--                <field name="route_id"/>-->
+    <!--                <field name="feeder_station_start_id"/>-->
+    <!--                <field name="feeder_station_destination_id"/>-->
+    <!--&lt;!&ndash;                <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>&ndash;&gt;-->
+    <!--&lt;!&ndash;                <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"&ndash;&gt;-->
+    <!--&lt;!&ndash;                        string="历史"/>&ndash;&gt;-->
+    <!--            </kanban>-->
+    <!--        </field>-->
+    <!--    </record>-->
+
     <record id="sf_workpiece_delivery_empty_racks_tree" model="ir.ui.view">
         <field name="name">空料架配送</field>
         <field name="model">sf.workpiece.delivery</field>
@@ -710,6 +779,7 @@
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
             <search string="运送空料架">
+                <filter name="filter_active" string="已归档" domain="[('active', '=', False)]"/>
                 <field name="route_id"/>
                 <field name="feeder_station_start_id"/>
                 <field name="feeder_station_destination_id"/>

sf_manufacturing/views/stock_lot_views.xml

@@ -41,8 +41,8 @@
         <field name="model">stock.lot</field>
         <field name="inherit_id" ref="stock.view_production_lot_tree"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='create_date']" position="after">
-                <field name="rfid" invisible="1"/>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="rfid"/>
             </xpath>
         </field>
     </record>

sf_mrs_connect/models/ftp_operate.py

@@ -32,6 +32,9 @@ class FtpController():
             logging.error(f"Error checking file: {e}")
             return False
 
+
+
+
     # # 检测字符串的编码
     # def detect_encoding(self, s):
     #     result = chardet.detect(s)
@@ -43,6 +46,8 @@ class FtpController():
             os.makedirs(serverdir)
         try:
             logging.info("进入FTP目录 ")
+            self.ftp.pwd()
+            logging.info('当前目录:%s' % self.ftp.pwd())
             logging.info('目录:%s' % target_dir)
             target_dir1 = target_dir.split('/')
             logging.info('目录1:%s' % target_dir1[1])

sf_plan/views/view.xml

@@ -135,12 +135,13 @@
                             <!--                                 <field name="delivery_quantity"/> -->
                             <!--                                 <field name="delivery_date"/> -->
                             <!--                             </group> -->
-                                <div class="oe_chatter">
-                                    <field name="message_follower_ids"/>
-                                    <field name="message_ids"/>
-                                </div>
+
                         </group>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids"/>
+                        <field name="message_ids"/>
+                    </div>
                 </form>
             </field>
         </record>

sf_sale/models/quick_easy_order.py

@@ -19,6 +19,7 @@ from . import parser_and_calculate_work_time as pc
 
 class QuickEasyOrder(models.Model):
     _name = 'quick.easy.order'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
     _description = '简易下单'
     _order = 'id desc'
 
@@ -35,13 +36,14 @@ class QuickEasyOrder(models.Model):
         ('0.03', '±0.03mm'),
         ('0.02', '±0.02mm'),
         ('0.01', '±0.01mm')], string='加工精度', default='0.10')
-    material_id = fields.Many2one('sf.production.materials', '材料')
-    material_model_id = fields.Many2one('sf.materials.model', '型号')
+    material_id = fields.Many2one('sf.production.materials', '材料', tracking=True)
+    material_model_id = fields.Many2one('sf.materials.model', '型号', tracking=True)
     # process_id = fields.Many2one('sf.production.process', string='表面工艺')
-    parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数')
-    quantity = fields.Integer('数量', default=1)
-    unit_price = fields.Float('单价')
-    price = fields.Float('总价')
+    parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数',
+                                     tracking=True)
+    quantity = fields.Integer('数量', default=1, tracking=True)
+    unit_price = fields.Float('单价', tracking=True)
+    price = fields.Float('总价', tracking=True)
     model_file = fields.Binary('glb模型文件')
     upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='上传模型文件')
     delivery_time = fields.Date('交货日期')
@@ -49,10 +51,10 @@ class QuickEasyOrder(models.Model):
     state = fields.Selection([('草稿', '草稿'), ('待派单', '待派单'),
                               ('待接单', '待接单'), ('加工中', '加工中'),
                               ('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿',
-                             readonly=True)
+                             readonly=True, tracking=True)
     model_color_state = fields.Selection([
         ('success', '成功'),
-        ('fail', '失败')], string='模型上色状态')
+        ('fail', '失败')], string='模型上色状态', tracking=True)
     processing_time = fields.Integer('加工时长(min)')
     sale_order_id = fields.Many2one('sale.order', '销售订单号')
 
@@ -94,8 +96,7 @@ class QuickEasyOrder(models.Model):
         obj.state = '待接单'
         return obj
 
-
-    def model_analyze(self,model_attachment):
+    def model_analyze(self, model_attachment):
         """
         step模型解析，上传模型时转为web可显示的格式
         :return:

sf_sale/models/quick_easy_order_old.py

@@ -16,6 +16,7 @@ from odoo.exceptions import ValidationError, UserError
 
 class QuickEasyOrder(models.Model):
     _name = 'quick.easy.order'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
     _description = '简易下单'
     _order = 'id desc'
 
@@ -32,13 +33,15 @@ class QuickEasyOrder(models.Model):
         ('0.03', '±0.03mm'),
         ('0.02', '±0.02mm'),
         ('0.01', '±0.01mm')], string='加工精度', default='0.10')
-    material_id = fields.Many2one('sf.production.materials', '材料')
-    material_model_id = fields.Many2one('sf.materials.model', '型号', domain="[('materials_id', '=', material_id)]")
+    material_id = fields.Many2one('sf.production.materials', '材料', tracking=True)
+    material_model_id = fields.Many2one('sf.materials.model', '型号', domain="[('materials_id', '=', material_id)]",
+                                        tracking=True)
     # process_id = fields.Many2one('sf.production.process', string='表面工艺')
-    parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数')
-    quantity = fields.Integer('数量', default=1)
-    unit_price = fields.Float('单价')
-    price = fields.Float('总价')
+    parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数',
+                                     tracking=True)
+    quantity = fields.Integer('数量', default=1, tracking=True)
+    unit_price = fields.Float('单价', tracking=True)
+    price = fields.Float('总价', tracking=True)
     model_file = fields.Binary('glb模型文件')
     upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='上传模型文件')
     delivery_time = fields.Date('交货日期')
@@ -46,10 +49,10 @@ class QuickEasyOrder(models.Model):
     state = fields.Selection([('草稿', '草稿'), ('待派单', '待派单'),
                               ('待接单', '待接单'), ('加工中', '加工中'),
                               ('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿',
-                             readonly=True)
+                             readonly=True, tracking=True)
     model_color_state = fields.Selection([
         ('success', '成功'),
-        ('fail', '失败')], string='模型上色状态')
+        ('fail', '失败')], string='模型上色状态', tracking=True)
     processing_time = fields.Integer('加工时长(min)')
     sale_order_id = fields.Many2one('sale.order', '销售订单号')
 

sf_sale/models/sale_order.py

@@ -215,6 +215,17 @@ class RePurchaseOrder(models.Model):
                 if len(product_id) != len(line):
                     raise ValidationError('【%s】已存在，请勿重复添加' % product[-1].name)
 
+    def button_confirm(self):
+        result = super(RePurchaseOrder, self).button_confirm()
+        for item in self:
+            # 确认订单时,自动分配序列号
+            if item.picking_ids:
+                for picking_id in item.picking_ids:
+                    if picking_id.move_ids:
+                        for move_id in picking_id.move_ids:
+                            move_id.put_move_line()
+        return result
+
 
 class ResPartnerToSale(models.Model):
     _inherit = 'res.partner'
@@ -233,12 +244,12 @@ class ResPartnerToSale(models.Model):
         if obj:
             raise UserError('该税ID已存在,请重新输入')
 
-    @api.constrains('email')
-    def _check_email(self):
-        if self.customer_rank > 0:
-            obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id), ('active', '=', True)])
-            if obj:
-                raise UserError('该邮箱已存在,请重新输入')
+    # @api.constrains('email')
+    # def _check_email(self):
+    #     if self.customer_rank > 0:
+    #         obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id), ('active', '=', True)])
+    #         if obj:
+    #             raise UserError('该邮箱已存在,请重新输入')
 
     @api.model
     def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):

sf_sale/views/quick_easy_order_view.xml

@@ -84,6 +84,11 @@
                             </group>
                         </group>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids"/>
+                        <field name="activity_ids"/>
+                        <field name="message_ids" options="{'post_refresh': 'recipients'}"/>
+                    </div>
                 </form>
             </field>
         </record>

sf_sale/views/res_partner_view.xml

@@ -24,18 +24,18 @@
                     <attribute name="required">1</attribute>
                     <attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>
                 </field>
-                <field name="email" position="replace">
-                    <field name="email"
-                           attrs="{'readonly': [('id','!=', False)]}"/>
-                </field>
-                <field name="mobile" position="attributes">
-                    <attribute name="attrs">{'required': [('phone', '=', False)],'readonly': [('id','!=', False)]}
-                    </attribute>
-                </field>
-                <field name="phone" position="attributes">
-                    <attribute name="attrs">{'required': [('mobile', '=', False)],'readonly': [('id','!=', False)]}
-                    </attribute>
-                </field>
+<!--                <field name="email" position="replace">-->
+<!--                    <field name="email"-->
+<!--                           attrs="{'readonly': [('id','!=', False)]}"/>-->
+<!--                </field>-->
+<!--                <field name="mobile" position="attributes">-->
+<!--                    <attribute name="attrs">{'required': [('phone', '=', False)],'readonly': [('id','!=', False)]}-->
+<!--                    </attribute>-->
+<!--                </field>-->
+<!--                <field name="phone" position="attributes">-->
+<!--                    <attribute name="attrs">{'required': [('mobile', '=', False)],'readonly': [('id','!=', False)]}-->
+<!--                    </attribute>-->
+<!--                </field>-->
                 <field name="street" position="attributes">
                     <attribute name="attrs">{'readonly': [('id','!=', False)]}
                     </attribute>
@@ -56,10 +56,10 @@
                     <field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"
                            attrs="{'required' : [('customer_rank','>', 0)]}"/>
                 </xpath>
-                <field name="category_id" position="attributes">
-                    <attribute name="required">1</attribute>
-                    <attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>
-                </field>
+<!--                <field name="category_id" position="attributes">-->
+<!--                    <attribute name="required">1</attribute>-->
+<!--                    <attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>-->
+<!--                </field>-->
                 <field name="company_registry" position="attributes">
                     <attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>
                 </field>
@@ -101,7 +101,7 @@
                 <field name="property_supplier_payment_term_id" position="before">
                     <field name="purchase_user_id" context="{'supplier_rank': supplier_rank }"
                            widget="many2one_avatar_user"
-                           attrs="{'required' : [('supplier_rank','>', 0)],'readonly': [('customer_rank','>', 0)]}"/>
+                           attrs="{'required' : [('supplier_rank','>', 0)]}"/>
                 </field>
                 <xpath expr="//field[@name='property_account_position_id']" position="attributes">
                     <attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>
@@ -195,10 +195,10 @@
                     <attribute name="attrs">{'invisible': [('customer_rank','=', 0)]}
                     </attribute>
                 </field>
-                <field name="user_id" position="before">
-                    <field name="purchase_user_id" widget="many2one_avatar_user"
-                           attrs="{'invisible' : [('supplier_rank','=', 0)]}"/>
-                </field>
+<!--                <field name="user_id" position="before">-->
+<!--                    <field name="purchase_user_id" widget="many2one_avatar_user"-->
+<!--                           attrs="{'invisible' : [('supplier_rank','=', 0)]}"/>-->
+<!--                </field>-->
             </field>
         </record>
     </data>

sf_sale/views/sale_order_view.xml

@@ -1,54 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
-        <record id="sale_order_view_search_inherit_sf" model="ir.ui.view">
-            <field name="name">sale.order.search.inherit.sf</field>
-            <field name="model">sale.order</field>
-            <field name="mode">primary</field>
-            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
-            <field name="arch" type="xml">
-                <filter name="my_sale_orders_filter" position="replace">
-                    <field name="campaign_id"/>
-                    <separator/>
-                    <filter string="报价" name="draft" domain="[('state','in',('draft', 'sent'))]"/>
-                    <filter string="销售订单" name="sales" domain="[('state','in',('sale','done'))]"/>
-                    <separator/>
-                    <filter string="创建日期" name="filter_create_date" date="create_date"/>
-                </filter>
-            </field>
-        </record>
-
-        <record id="action_quotations_with_onboarding_inherit_sf" model="ir.actions.act_window">
-            <field name="name">报价</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_id" ref="sale.view_quotation_tree_with_onboarding"/>
-            <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-            <field name="search_view_id" ref="sale_order_view_search_inherit_sf"/>
-            <field name="context">{'search_default_my_quotation': 1}</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    Create a new quotation, the first step of a new sale!
-                </p>
-                <p>
-                    Once the quotation is confirmed by the customer, it becomes a sales order.
-                    <br/>
-                    You will be able to create an invoice and collect the payment.
-                </p>
-            </field>
-        </record>
-
-
-        <!--        <menuitem id="menu_sale_quotations">-->
-        <!--             <field name="active" eval="False"/>-->
-        <!--        </menuitem>-->
-
-        <menuitem id="menu_sale_quotations_inherit_sf"
-                  action="action_quotations_with_onboarding_inherit_sf"
-                  groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"
-                  parent="sale.sale_order_menu"
-                  sequence="11"/>
-
         <record model="ir.ui.view" id="view_sale_order_form_inherit_sf">
             <field name="name">sale.order.form.inherit.sf</field>
             <field name="model">sale.order</field>

sf_tool_management/__manifest__.py

@@ -22,6 +22,7 @@
         'views/tool_material_search.xml',
         'views/fixture_material_search_views.xml',
         'views/menu_view.xml',
+        'views/stock.xml',
         'data/tool_data.xml',
     ],
     'demo': [

sf_tool_management/controllers/controllers.py

@@ -109,6 +109,7 @@ class Manufacturing_Connect(http.Controller):
         res = {'Succeed': True, 'Datas': []}
         try:
             datas = request.httprequest.data
+            logging.info('datas: %s' % datas)
             ret = str(datas, 'utf-8')
             data_lists = ret.split(",")
             data_list = [data.replace('+', '') for data in data_lists]
@@ -120,7 +121,7 @@ class Manufacturing_Connect(http.Controller):
                     {'Succeed': False, 'ErrorCode': 201, 'code': data_list[0], 'Error': '没有找到正在组装的组装单！'})
             tool_assembly.write({
                 'after_assembly_tool_loading_length': float(data_list[1] or "0"),  # 高度(总长度)
-                'after_assembly_functional_tool_diameter': float(data_list[2] or "0"),  # 直径
+                'after_assembly_functional_tool_diameter': float(data_list[2] or "0") * 2,  # 直径
                 'after_assembly_knife_tip_r_angle': float(data_list[3] or "0")  # R角
             })
         except Exception as e:

sf_tool_management/data/tool_data.xml

@@ -5,8 +5,8 @@
         <field name="model_id" ref="model_sf_tool_datasync"/>
         <field name="state">code</field>
         <field name="code">model._cron_tool_datasync_all()</field>
-        <field name="interval_number">1</field>
-        <field name="interval_type">days</field>
+        <field name="interval_number">12</field>
+        <field name="interval_type">hours</field>
         <field name="numbercall">-1</field>
     </record>
 </odoo>

sf_tool_management/models/__init__.py

@@ -7,4 +7,5 @@ from . import functional_tool_enroll
 from . import fixture_material_search
 from . import fixture_enroll
 from . import temporary_data_processing_methods
+from . import stock
 

sf_tool_management/models/base.py

@@ -283,7 +283,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
             'loading_task_source': '0',
             'applicant': self.env.user.name,
-            'use_tool_time': self.need_knife_time,
+            'use_tool_time': fields.Datetime.now() + timedelta(
+                hours=4) if not self.need_knife_time else self.need_knife_time,
             'reason_for_applying': '工单用刀',
 
             'sf_cam_work_order_program_knife_plan_id': self.id
@@ -925,7 +926,7 @@ class FunctionalToolDismantle(models.Model):
         location = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
         location_dest = self.env['stock.location'].search([('name', '=', '刀具房')])
         # =================刀柄是否[报废]拆解=======
-        location_dest_scrap = self.env['stock.location'].search([('name', '=', 'Scrap')])
+        location_dest_scrap_ids = self.env['stock.location'].search([('name', 'in', ('Scrap', '报废'))])
         if self.handle_rfid:
             lot = self.env['stock.lot'].sudo().search([('rfid', '=', self.handle_rfid)])
             if not lot:
@@ -933,30 +934,33 @@ class FunctionalToolDismantle(models.Model):
             functional_tool_assembly = self.functional_tool_id.functional_tool_name_id
             if self.scrap_boolean:
                 # 刀柄报废 入库到Scrap
-                lot.create_stock_quant(location, location_dest_scrap, functional_tool_assembly.id, code,
+                lot.create_stock_quant(location, location_dest_scrap_ids[-1], functional_tool_assembly.id, code,
                                        functional_tool_assembly, functional_tool_assembly.tool_groups_id)
+                lot.tool_material_status = '报废'
             else:
                 # 刀柄不报废 入库到刀具房
                 lot.create_stock_quant(location, location_dest, functional_tool_assembly.id, code,
                                        functional_tool_assembly, functional_tool_assembly.tool_groups_id)
+                lot.tool_material_status = '可用'
+
         # ==============功能刀具[报废]拆解================
         if self.dismantle_cause in ['寿命到期报废', '崩刀报废']:
             # 除刀柄外物料报废 入库到Scrap
             if self.integral_product_id:
                 self.integral_product_id.dismantle_stock_moves(False, self.integral_lot_id, location,
-                                                               location_dest_scrap, code)
+                                                               location_dest_scrap_ids[-1], code)
             elif self.blade_product_id:
-                self.blade_product_id.dismantle_stock_moves(False, self.blade_lot_id, location, location_dest_scrap,
-                                                            code)
+                self.blade_product_id.dismantle_stock_moves(False, self.blade_lot_id, location,
+                                                            location_dest_scrap_ids[-1], code)
                 if self.bar_product_id:
-                    self.bar_product_id.dismantle_stock_moves(False, self.bar_lot_id, location, location_dest_scrap,
-                                                              code)
+                    self.bar_product_id.dismantle_stock_moves(False, self.bar_lot_id, location,
+                                                              location_dest_scrap_ids[-1], code)
                 elif self.pad_product_id:
-                    self.pad_product_id.dismantle_stock_moves(False, self.pad_lot_id, location, location_dest_scrap,
-                                                              code)
+                    self.pad_product_id.dismantle_stock_moves(False, self.pad_lot_id, location,
+                                                              location_dest_scrap_ids[-1], code)
             if self.chuck_product_id:
-                self.chuck_product_id.dismantle_stock_moves(False, self.chuck_lot_id, location, location_dest_scrap,
-                                                            code)
+                self.chuck_product_id.dismantle_stock_moves(False, self.chuck_lot_id, location,
+                                                            location_dest_scrap_ids[-1], code)
         # ===========功能刀具[磨削]拆解==============
         # elif self.dismantle_cause in ['刀具需磨削']:
         #     location_dest = self.env['stock.location'].search([('name', '=', '磨削房')])

sf_tool_management/models/fixture_enroll.py

@@ -1,6 +1,7 @@
 import json
 import base64
 import requests
+import logging
 from odoo import models, api
 from odoo.addons.sf_base.commons.common import Common
 from odoo.exceptions import UserError
@@ -10,30 +11,36 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
     _description = '夹具物料序列号注册'
 
-    def enroll_fixture_material_stock(self):
+    def sync_enroll_fixture_material_stock_all(self):
+        logging.info("调用 sync_enroll_fixture_material_stock_all 同步接口")
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
         headers = Common.get_headers(self, token, sf_secret_key)
         str_url = sf_sync_config['sf_url'] + "/api/fixture_material_stock/create"
-        objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
+        product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '夹具')]).ids
+        objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)])
         fixture_material_stock_list = []
-        if objs_all:
-            for item in objs_all:
-                val = {
-                    'name': item.name,
-                    'tool_material_status': item.tool_material_status,
-                    'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
-                    'fixture_material_search_id': item.fixture_material_search_id.id,
-                }
-                fixture_material_stock_list.append(val)
-            kw = json.dumps(fixture_material_stock_list, ensure_ascii=False)
-            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-            ret = r.json()
-            if ret.get('code') == 200:
-                return '夹具物料序列号注册成功'
-        else:
-            raise UserError("没有注册夹具物料序列号信息")
+        try:
+            if objs_all:
+                for item in objs_all:
+                    val = {
+                        'name': item.name,
+                        'tool_material_status': item.tool_material_status,
+                        'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
+                        'fixture_material_search_id': item.fixture_material_search_id.id,
+                    }
+                    fixture_material_stock_list.append(val)
+                kw = json.dumps(fixture_material_stock_list, ensure_ascii=False)
+                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+                ret = r.json()
+                if ret.get('code') == 200:
+                    logging.info("夹具物料序列号每日同步成功")
+                    return '夹具物料序列号注册成功'
+            else:
+                logging.info("没有注册夹具物料序列号信息")
+        except Exception as e:
+            logging.info("夹具物料序列号同步失败:%s" % e)
 
 
 class FixtureMaterialSearch(models.Model):
@@ -42,41 +49,46 @@ class FixtureMaterialSearch(models.Model):
 
     crea_url = "/api/fixture_material/create"
 
-    def enroll_fixture_material(self):
+    def sync_enroll_fixture_material_all(self):
+        logging.info("调用 sync_enroll_fixture_material_all 同步接口")
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
         headers = Common.get_headers(self, token, sf_secret_key)
         str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.search([('id', '=', self.id)])
+        objs_all = self.search([])
         fixture_material_list = []
-        if objs_all:
-            for obj in objs_all:
-                val = {
-                    'name': obj.name,
-                    'id': obj.id,
-                    'fixture_material_code': obj.fixture_material_id.code,
-                    'fixture_model_code': obj.fixture_model_id.code,
-                    'specification_name': obj.specification_fixture_id.name,
-                    'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
-                    'number': obj.number,
-                    'usable_num': obj.usable_num,
-                    'have_been_used_num': obj.have_been_used_num,
-                    'scrap_num': obj.scrap_num
-                }
-                fixture_material_list.append(val)
-            kw = json.dumps(fixture_material_list, ensure_ascii=False)
-            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-            ret = r.json()
-            if ret.get('code') == 200:
-                return '夹具物料注册成功'
-        else:
-            raise UserError("没有注册夹具物料信息")
+        try:
+            if objs_all:
+                for obj in objs_all:
+                    val = {
+                        'name': obj.name,
+                        'id': obj.id,
+                        'fixture_material_code': obj.fixture_material_id.code,
+                        'fixture_model_code': obj.fixture_model_id.code,
+                        'specification_name': obj.specification_fixture_id.name,
+                        'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
+                        'number': obj.number,
+                        'usable_num': obj.usable_num,
+                        'have_been_used_num': obj.have_been_used_num,
+                        'scrap_num': obj.scrap_num
+                    }
+                    fixture_material_list.append(val)
+                kw = json.dumps(fixture_material_list, ensure_ascii=False)
+                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+                ret = r.json()
+                if ret.get('code') == 200:
+                    logging.info("夹具物料每日同步成功")
+                    return '夹具物料注册成功'
+            else:
+                logging.info("没有注册夹具物料信息")
+        except Exception as e:
+            logging.info("夹具物料同步失败:%s" % e)
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        records = super(FixtureMaterialSearch, self).create(vals_list)
-        for record in records:
-            if record:
-                record.enroll_fixture_material()
-        return records
+    # @api.model_create_multi
+    # def create(self, vals_list):
+    #     records = super(FixtureMaterialSearch, self).create(vals_list)
+    #     for record in records:
+    #         if record:
+    #             record.enroll_fixture_material()
+    #     return records

sf_tool_management/models/functional_tool.py

@@ -14,7 +14,8 @@ class FunctionalCuttingToolEntity(models.Model):
 
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具组装单', readonly=True)
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
+    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id',
+                                     store=True)
     code = fields.Char('编码')
     rfid = fields.Char('Rfid', readonly=True)
     rfid_dismantle = fields.Char('Rfid(已拆解)', readonly=True)
@@ -30,66 +31,135 @@ class FunctionalCuttingToolEntity(models.Model):
     coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
     tool_loading_length = fields.Float(string='总长度(mm)', readonly=True, digits=(10, 3))
-    handle_length = fields.Float(string='刀柄长度(mm)',readonly=True, digits=(10, 3))
+    handle_length = fields.Float(string='刀柄长度(mm)', readonly=True, digits=(10, 3))
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True, digits=(10, 3))
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
-    tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
-    line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
-    machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=True)
+    tool_room_num = fields.Integer(string='刀具房数量', compute='_compute_num', store=True)
+    line_edge_knife_library_num = fields.Integer(string='线边刀库数量', compute='_compute_num', store=True)
+    machine_knife_library_num = fields.Integer(string='机内刀库数量', compute='_compute_num', store=True)
     max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
     alarm_value = fields.Integer(string='报警值(min)', readonly=True)
     used_value = fields.Integer(string='已使用值(min)', readonly=True)
     functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')],
                                               string='状态', store=True, default='正常')
-    current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True)
+    current_location_id = fields.Many2one('stock.location', string='当前位置', compute='_compute_current_location_id',
+                                          store=True)
+    current_shelf_location_id = fields.Many2one('sf.shelf.location', string='当前货位', readonly=True)
     current_location = fields.Selection(
         [('组装后', '组装后'), ('刀具房', '刀具房'), ('线边刀库', '线边刀库'), ('机内刀库', '机内刀库')],
         string='位置', compute='_compute_current_location_id', store=True)
     image = fields.Binary('图片', readonly=True)
 
-    active = fields.Boolean(string='已归档', default=True)
-
     safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
                                         string='功能刀具安全库存', readonly=True)
 
-    @api.depends('barcode_id.quant_ids', 'functional_tool_status')
+    @api.depends('barcode_id.quant_ids', 'functional_tool_status', 'current_shelf_location_id')
     def _compute_current_location_id(self):
         for record in self:
-            if record.barcode_id.quant_ids:
-                for quant_id in record.barcode_id.quant_ids:
-                    if quant_id.inventory_quantity_auto_apply > 0:
-                        record.current_location_id = quant_id.location_id
-                        if quant_id.location_id.name == '制造前':
-                            record.current_location = '机内刀库'
-                        else:
-                            record.current_location = quant_id.location_id.name
-                if record.current_location_id:
-                    record.sudo().get_location_num()
-            else:
-                record.current_location_id = False
-                record.current_location = False
             if record.functional_tool_status == '已拆除':
                 record.current_location_id = False
                 record.current_location = False
-                record.tool_room_num = 0
-                record.line_edge_knife_library_num = 0
-                record.machine_knife_library_num = 0
+            else:
+                if record.barcode_id.quant_ids:
+                    for quant_id in record.barcode_id.quant_ids:
+                        if quant_id.inventory_quantity_auto_apply > 0:
+                            record.current_location_id = quant_id.location_id
+                            if quant_id.location_id.name == '制造前':
+                                if not record.current_shelf_location_id:
+                                    record.current_location = '机内刀库'
+                                else:
+                                    record.current_location = '线边刀库'
+                            else:
+                                record.current_location = '刀具房'
+                else:
+                    record.current_location_id = False
+                    record.current_location = False
 
-    def get_location_num(self):
+    @api.depends('current_location', 'functional_tool_status')
+    def _compute_num(self):
         """
         计算库存位置数量
         """
         for obj in self:
-            if obj.current_location_id:
+            if obj.functional_tool_status == '已拆除':
                 obj.tool_room_num = 0
                 obj.line_edge_knife_library_num = 0
                 obj.machine_knife_library_num = 0
-                if obj.current_location in ['刀具房']:
-                    obj.tool_room_num = 1
-                elif "线边刀库" in obj.current_location:
-                    obj.line_edge_knife_library_num = 1
-                elif "机内刀库" in obj.current_location:
-                    obj.machine_knife_library_num = 1
+            else:
+                if obj.current_location_id:
+                    obj.tool_room_num = 0
+                    obj.line_edge_knife_library_num = 0
+                    obj.machine_knife_library_num = 0
+                    if obj.current_location in ['刀具房']:
+                        obj.tool_room_num = 1
+                    elif "线边刀库" in obj.current_location:
+                        obj.line_edge_knife_library_num = 1
+                    elif "机内刀库" in obj.current_location:
+                        obj.machine_knife_library_num = 1
+
+    def tool_in_out_stock_location(self, location_id):
+        tool_room_id = self.env['stock.location'].search([('name', '=', '刀具房')])
+        pre_manufacturing_id = self.env['stock.location'].search([('name', '=', '制造前')])
+        for item in self:
+            # 中控反馈该位置有刀
+            if item:
+                # 系统该位置有刀
+                if location_id.product_sn_id:
+                    # 中控反馈和系统中，该位置是同一把刀
+                    if item.barcode_id == location_id.product_sn_id:
+                        return True
+                    # 中控反馈和系统中，该位置不是同一把刀
+                    else:
+                        # 原刀从线边出库
+                        item.tool_in_out_stock_location_1(location_id, tool_room_id)
+                # 新刀入库到线边
+                item.create_stock_move(pre_manufacturing_id, location_id)
+                item.current_shelf_location_id = location_id.id
+
+            # 中控反馈该位置没有刀
+            else:
+                # 系统该位置有刀
+                if location_id.product_sn_id:
+                    item.tool_in_out_stock_location_1(location_id, tool_room_id)
+
+    def tool_in_out_stock_location_1(self, location_id, tool_room_id):
+        tool = self.env['sf.functional.cutting.tool.entity'].search(
+            [('barcode_id', '=', location_id.product_sn_id.id)])
+        if tool.current_location == '线边刀库':
+            tool.create_stock_move(tool_room_id, False)
+            # 修改功能刀具的当前位置
+            tool.current_shelf_location_id = False
+
+    def create_stock_move(self, location_dest_id, destination_location_id):
+
+        # 创建库存移动记录
+        stock_move_id = self.env['stock.move'].sudo().create({
+            'name': '/',
+            'product_id': self.barcode_id.product_id.id,
+            'location_id': self.current_location_id.id,
+            'location_dest_id': location_dest_id.id,
+            'product_uom_qty': 1.00,
+            'state': 'done'
+        })
+
+        # 创建移动历史记录
+        stock_move_line_id = self.env['stock.move.line'].sudo().create({
+            'product_id': self.barcode_id.product_id.id,
+            'lot_id': self.barcode_id.id,
+            'move_id': stock_move_id.id,
+            'current_location_id': False if not self.current_shelf_location_id else self.current_shelf_location_id.id,
+            'destination_location_id': False if not destination_location_id else destination_location_id.id,
+            'qty_done': 1.0,
+            'state': 'done',
+            'functional_tool_type_id': self.sf_cutting_tool_type_id.id,
+            'diameter': self.functional_tool_diameter,
+            'knife_tip_r_angle': self.knife_tip_r_angle,
+            'code': self.code,
+            'rfid': self.rfid,
+            'functional_tool_name': self.name,
+            'tool_groups_id': self.tool_groups_id.id
+        })
+        return stock_move_id, stock_move_line_id
 
     @api.model
     def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
@@ -192,12 +262,14 @@ class FunctionalCuttingToolEntity(models.Model):
         机床当前刀库实时信息接口，功能刀具出库
         """
         # 获取位置对象
-        location_inventory_id = self.current_location_id
         stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
-        self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
-                                           self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id,
-                                           self.functional_tool_name_id.tool_groups_id)
+        self.create_stock_move(stock_location_id, False)
+        self.current_location_id = stock_location_id.id
+        self.current_shelf_location_id = False
+        # self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
+        #                                    self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id,
+        #                                    self.functional_tool_name_id.tool_groups_id)
 
     # ==========刀具组接口==========
     # def _register_functional_tool_groups(self, obj):
@@ -305,7 +377,7 @@ class StockMoveLine(models.Model):
     functional_tool_name = fields.Char('刀具名称')
     diameter = fields.Float(string='刀具直径(mm)')
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
-    install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now())
+    install_tool_time = fields.Datetime("刀具组装时间")
     code = fields.Char('编码')
     rfid = fields.Char('Rfid')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组')
@@ -328,12 +400,12 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
                                               group_expand='_read_mrs_cutting_tool_type_ids', store=True)
     diameter = fields.Float(string='刀具直径(mm)', readonly=False)
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=False)
-    tool_stock_num = fields.Integer(string='刀具房数量')
-    side_shelf_num = fields.Integer(string='线边刀库数量')
-    on_tool_stock_num = fields.Integer(string='机内刀库数量')
-    tool_stock_total = fields.Integer(string='当前库存量', readonly=True)
-    min_stock_num = fields.Integer('最低库存量', tracking=True)
-    max_stock_num = fields.Integer('最高库存量', tracking=True)
+    tool_stock_num = fields.Integer(string='刀具房数量', compute='_compute_stock_num', store=True)
+    side_shelf_num = fields.Integer(string='线边刀库数量', compute='_compute_stock_num', store=True)
+    on_tool_stock_num = fields.Integer(string='机内刀库数量', compute='_compute_stock_num', store=True)
+    tool_stock_total = fields.Integer(string='当前库存量', compute='_compute_tool_stock_total', store=True)
+    min_stock_num = fields.Integer('最低库存量')
+    max_stock_num = fields.Integer('最高库存量')
     batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num',
                                              store=True)
     unit = fields.Char('单位', default="件")
@@ -404,10 +476,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
     def _compute_batch_replenishment_num(self):
         for tool in self:
             if tool:
-                # 计算刀具房数量、线边刀库数量、机内刀库数量
-                tool.sudo().get_stock_num(tool)
-                # 计算当前库存量
-                tool.sudo().tool_stock_total = tool.tool_stock_num + tool.side_shelf_num + tool.on_tool_stock_num
                 # 如果当前库存量小于最低库存量，计算批次补货量
                 tool.sudo().open_batch_replenishment_num(tool)
 
@@ -426,6 +494,38 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         else:
             tool.sudo().batch_replenishment_num = 0
 
+    @api.depends('sf_functional_tool_entity_ids', 'sf_functional_tool_entity_ids.tool_room_num',
+                 'sf_functional_tool_entity_ids.line_edge_knife_library_num',
+                 'sf_functional_tool_entity_ids.machine_knife_library_num')
+    def _compute_stock_num(self):
+        """
+        计算刀具房数量、线边刀库数量、机内刀库数量
+        """
+        for tool in self:
+            if tool:
+                tool.tool_stock_num = 0
+                tool.side_shelf_num = 0
+                tool.on_tool_stock_num = 0
+                if tool.sf_functional_tool_entity_ids:
+                    for cutting_tool in tool.sf_functional_tool_entity_ids:
+                        if cutting_tool.tool_room_num > 0:
+                            tool.tool_stock_num += 1
+                        elif cutting_tool.line_edge_knife_library_num > 0:
+                            tool.side_shelf_num += 1
+                        elif cutting_tool.machine_knife_library_num > 0:
+                            tool.on_tool_stock_num += 1
+                else:
+                    tool.tool_stock_num = 0
+                    tool.side_shelf_num = 0
+                    tool.on_tool_stock_num = 0
+
+    @api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num')
+    def _compute_tool_stock_total(self):
+        for tool in self:
+            if tool:
+                # 计算当前库存量
+                tool.tool_stock_total = tool.tool_stock_num + tool.side_shelf_num + tool.on_tool_stock_num
+
     def create_functional_tool_assembly(self, tool):
         """
         创建功能刀具组装单
@@ -446,27 +546,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         })
         tool.sudo().sf_functional_tool_assembly_ids = [(4, functional_tool_assembly.id)]
 
-    def get_stock_num(self, tool):
-        """
-        计算刀具房数量、线边刀库数量、机内刀库数量
-        """
-        if tool:
-            tool.tool_stock_num = 0
-            tool.side_shelf_num = 0
-            tool.on_tool_stock_num = 0
-            if tool.sf_functional_tool_entity_ids:
-                for cutting_tool in tool.sf_functional_tool_entity_ids:
-                    if cutting_tool.tool_room_num > 0:
-                        tool.tool_stock_num += 1
-                    elif cutting_tool.line_edge_knife_library_num > 0:
-                        tool.side_shelf_num += 1
-                    elif cutting_tool.machine_knife_library_num > 0:
-                        tool.on_tool_stock_num += 1
-            else:
-                tool.tool_stock_num = 0
-                tool.side_shelf_num = 0
-                tool.on_tool_stock_num = 0
-
     def create_or_edit_safety_stock(self, vals, sf_functional_tool_entity_ids):
         """
         根据传入的信息新增或者更新功能刀具安全库存的信息

sf_tool_management/models/functional_tool_enroll.py

@@ -33,23 +33,26 @@ def get_suitable_coolant_names(item):
 
 class ToolDatasync(models.Model):
     _name = 'sf.tool.datasync'
-    _description = '定时同步所有刀具'
+    _description = '定时同步所有刀具、夹具'
 
     def _cron_tool_datasync_all(self):
         try:
             self.env['stock.lot'].sudo().sync_enroll_tool_material_stock_all()
-            logging.info("刀具物料序列号每日同步成功")
+
+            self.env['stock.lot'].sudo().sync_enroll_fixture_material_stock_all()
+
             self.env['sf.tool.material.search'].sudo().sync_enroll_tool_material_all()
-            logging.info("刀具物料每日同步成功")
+
+            self.env['sf.fixture.material.search'].sudo().sync_enroll_fixture_material_all()
+
             self.env['sf.functional.cutting.tool.entity'].sudo().esync_enroll_functional_tool_entity_all()
-            logging.info("功能刀具列表每日同步成功")
-            self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all()
-            logging.info("功能刀具预警每日同步成功")
-            self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all()
-            logging.info("功能刀具出入库记录每日同步成功")
-            self.env[
-                'sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all()
-            logging.info("功能刀具安全库存每日同步成功")
+            logging.info("已全部同步完成！！！")
+            # self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all()
+            # logging.info("功能刀具预警每日同步成功")
+            # self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all()
+            # logging.info("功能刀具出入库记录每日同步成功")
+            # self.env['sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all()
+            # logging.info("功能刀具安全库存每日同步成功")
         except Exception as e:
             logging.info("捕获错误信息:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")
@@ -59,24 +62,25 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
     _description = '刀具物料序列号注册'
 
-    def enroll_tool_material_stock(self):
-        logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
-        objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])])
-        self._get_sync_stock_lot(objs_all, str_url, token, headers)
+    # def enroll_tool_material_stock(self):
+    #     logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()')
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
+    #     token = sf_sync_config['token']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
+    #     headers = Common.get_headers(self, token, sf_secret_key)
+    #     str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
+    #     objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])])
+    #     self._get_sync_stock_lot(objs_all, str_url, token, headers)
 
     def sync_enroll_tool_material_stock_all(self):
-        logging.info('调用刀具物料序列号注册接口: sync_enroll_tool_material_stock_all()')
+        logging.info('调用 sync_enroll_tool_material_stock_all 同步接口')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
         headers = Common.get_headers(self, token, sf_secret_key)
         str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
-        objs_all = self.env['stock.lot'].search([('rfid', '!=', False)])
+        product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '刀具')]).ids
+        objs_all = self.env['stock.lot'].search([('product_id', 'in', product_ids)])
         self._get_sync_stock_lot(objs_all, str_url, token, headers)
 
     def _get_sync_stock_lot(self, objs_all, str_url, token, headers):
@@ -86,6 +90,7 @@ class StockLot(models.Model):
                 for item in objs_all:
                     val = {
                         'name': item.name,
+                        'qty': item.product_qty,
                         'tool_material_status': item.tool_material_status,
                         'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
                         'tool_material_search_id': item.tool_material_search_id.id,
@@ -95,12 +100,13 @@ class StockLot(models.Model):
                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
                 ret = r.json()
                 if ret.get('code') == 200:
-                    return '刀具物料序列号注册成功'
+                    logging.info("刀具物料序列号每日同步成功")
+                    return '刀具(夹具)物料序列号注册成功'
             else:
-                logging.info("没有注册刀具物料序列号信息")
+                logging.info("没有刀具物料序列号信息")
         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
-
+            logging.info("刀具物料序列号同步失败:%s" % e)
+            
 
 class ToolMaterial(models.Model):
     _inherit = 'sf.tool.material.search'
@@ -108,18 +114,18 @@ class ToolMaterial(models.Model):
 
     crea_url = '/api/tool_material/create'
 
-    def enroll_tool_material(self):
-        logging.info('调用刀具物料注册接口: enroll_tool_material()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.search([('id', '=', self.id)])
-        self._get_sync_tool_material_search(objs_all, str_url, token, headers)
+    # def enroll_tool_material(self):
+    #     logging.info('调用刀具物料注册接口: enroll_tool_material()')
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
+    #     token = sf_sync_config['token']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
+    #     headers = Common.get_headers(self, token, sf_secret_key)
+    #     str_url = sf_sync_config['sf_url'] + self.crea_url
+    #     objs_all = self.search([('id', '=', self.id)])
+    #     self._get_sync_tool_material_search(objs_all, str_url, token, headers)
 
     def sync_enroll_tool_material_all(self):
-        logging.info('调用刀具物料注册接口: sync_enroll_tool_material_all()')
+        logging.info('调用 sync_enroll_tool_material_all 同步接口')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -150,11 +156,12 @@ class ToolMaterial(models.Model):
                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
                 ret = r.json()
                 if ret.get('code') == 200:
+                    logging.info("刀具物料每日同步成功")
                     return '刀具物料注册成功'
             else:
                 logging.info('没有注册刀具物料信息')
         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+            logging.info("刀具物料同步失败:%s" % e)
 
 
 class FunctionalCuttingToolEntity(models.Model):
@@ -164,18 +171,18 @@ class FunctionalCuttingToolEntity(models.Model):
     crea_url = "/api/functional_tool_entity/create"
 
     # 注册同步功能刀具列表
-    def enroll_functional_tool_entity(self):
-        logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
-        self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers)
+    # def enroll_functional_tool_entity(self):
+    #     logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()')
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
+    #     token = sf_sync_config['token']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
+    #     headers = Common.get_headers(self, token, sf_secret_key)
+    #     str_url = sf_sync_config['sf_url'] + self.crea_url
+    #     objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
+    #     self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers)
 
     def esync_enroll_functional_tool_entity_all(self):
-        logging.info('调用功能刀具列表注册接口: esync_enroll_functional_tool_entity_all()')
+        logging.info('调用 esync_enroll_functional_tool_entity_all 同步接口')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -202,6 +209,7 @@ class FunctionalCuttingToolEntity(models.Model):
                         'coarse_middle_thin': item.coarse_middle_thin,
                         'new_former': item.new_former,
                         'tool_loading_length': item.tool_loading_length,
+                        'handle_length': item.handle_length,
                         'functional_tool_length': item.functional_tool_length,
                         'effective_length': item.effective_length,
                         'max_lifetime_value': item.max_lifetime_value,
@@ -226,19 +234,19 @@ class FunctionalCuttingToolEntity(models.Model):
                         'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name,
                         'handle_type_name': item.handle_type_id.name,
                         'cutting_direction_names': get_cutting_direction_names(item),
-                        'suitable_coolant_names': get_suitable_coolant_names(item),
-                        'active': item.active,
+                        'suitable_coolant_names': get_suitable_coolant_names(item)
                     }
                     functional_tool_list.append(val)
                 kw = json.dumps(functional_tool_list, ensure_ascii=False)
                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
                 ret = r.json()
                 if ret.get('code') == 200:
+                    logging.info("功能刀具列表每日同步成功")
                     return "功能刀具注册成功"
             else:
                 logging.info('没有注册功能刀具信息')
         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+            logging.info("功能刀具同步失败:%s" % e)
 
 
 class FunctionalToolWarning(models.Model):

sf_tool_management/models/maintenance_equipment.py

@@ -44,71 +44,79 @@ class SfMaintenanceEquipment(models.Model):
 
     # ==========机床当前刀库实时信息接口==========
     def register_equipment_tool(self):
-        config = self.env['res.config.settings'].get_values()
-        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
-        headers = {'Authorization': config['center_control_Authorization']}
-        crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
-        params = {"DeviceId": self.name}
-        r = requests.get(crea_url, params=params, headers=headers)
-        ret = r.json()
-        logging.info('register_equipment_tool:%s' % ret)
-        datas = ret['Datas']
-        self.write_maintenance_equipment_tool(datas)
-        if ret['Succeed']:
-            return "机床当前刀库实时信息指令发送成功"
-        else:
-            raise ValidationError("机床当前刀库实时信息指令发送失败")
+        try:
+            config = self.env['res.config.settings'].get_values()
+            # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+            headers = {'Authorization': config['center_control_Authorization']}
+            crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
+            params = {"DeviceId": self.name}
+            r = requests.get(crea_url, params=params, headers=headers)
+            ret = r.json()
+            logging.info('register_equipment_tool:%s' % ret)
+            datas = ret['Datas']
+            self.write_maintenance_equipment_tool(datas)
+            if ret['Succeed']:
+                return "机床当前刀库实时信息指令发送成功"
+            else:
+                raise ValidationError("机床当前刀库实时信息指令发送失败")
+        except Exception as e:
+            logging.info("register_equipment_tool()捕获错误信息:%s" % e)
 
     def write_maintenance_equipment_tool(self, datas):
-        if datas:
-            # 清除设备机床刀位的刀具信息
-            for obj in self.product_template_ids:
-                obj.write({
-                    'functional_tool_name_id': False,
-                    'tool_install_time': None
-                })
-            for data in datas:
-                maintenance_equipment_id = self.search([('name', '=', data['DeviceId'])])
-                if maintenance_equipment_id:
-                    tool_id = '%s%s' % (data['ToolId'][0:1], data['ToolId'][1:].zfill(2))
-                    equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
-                        [('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
-                    functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
-                        [('rfid', '=', data['RfidCode'])])
-                    if functional_tool_id:
-                        # 查询该功能刀具是否已经装在机床内其他位置，如果是就删除
-                        equipment_tools = self.env['maintenance.equipment.tool'].sudo().search(
-                            [('functional_tool_name_id', '=', functional_tool_id.id), ('code', '!=', tool_id)])
-                        if equipment_tools:
-                            for item in equipment_tools:
-                                item.write({
-                                    'functional_tool_name_id': False,
-                                    'tool_install_time': None
-                                })
+        try:
+            if datas:
+                # 清除设备机床刀位的刀具信息
+                for obj in self.product_template_ids:
+                    obj.write({
+                        'functional_tool_name_id': False,
+                        'tool_install_time': None
+                    })
+                for data in datas:
+                    maintenance_equipment_id = self.search([('name', '=', data['DeviceId'])])
+                    if maintenance_equipment_id:
+                        tool_id = '%s%s' % (data['ToolId'][0:1], data['ToolId'][1:].zfill(2))
+                        equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
+                            [('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
+                        functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                            [('rfid', '=', data['RfidCode'])])
+                        if functional_tool_id:
+                            if len(functional_tool_id) > 1:
+                                functional_tool_id = functional_tool_id[-1]
+                            # 查询该功能刀具是否已经装在机床内其他位置，如果是就删除
+                            equipment_tools = self.env['maintenance.equipment.tool'].sudo().search(
+                                [('functional_tool_name_id', '=', functional_tool_id.id), ('code', '!=', tool_id)])
+                            if equipment_tools:
+                                for item in equipment_tools:
+                                    item.write({
+                                        'functional_tool_name_id': False,
+                                        'tool_install_time': None
+                                    })
+                        else:
+                            logging.info('Rfid为【%s】的功能刀具不存在！' % data['RfidCode'])
+                        time = None
+                        if data['AddDatetime']:
+                            datatime = str(data['AddDatetime'])
+                            time = fields.Datetime.from_string(datatime[0:10] + ' ' + datatime[11:19])
+                        if equipment_tool_id and functional_tool_id:
+                            tool_install_time = {'Nomal': '正常', 'Warning': '报警'}
+                            equipment_tool_id.write({
+                                'functional_tool_name_id': functional_tool_id.id,
+                                'tool_install_time': time
+                            })
+                            if functional_tool_id.current_location != '机内刀库':
+                                # 对功能刀具进行移动到生产线
+                                functional_tool_id.tool_inventory_displacement_out()
+                            functional_tool_id.write({
+                                'max_lifetime_value': data['MaxLife'],
+                                'used_value': data['UseLife'],
+                                'functional_tool_status': tool_install_time.get(data['State'])
+                            })
                     else:
-                        logging.info('Rfid为【%s】的功能刀具不存在！' % data['RfidCode'])
-                    time = None
-                    if data['AddDatetime']:
-                        datatime = str(data['AddDatetime'])
-                        time = fields.Datetime.from_string(datatime[0:10] + ' ' + datatime[11:19])
-                    if equipment_tool_id and functional_tool_id:
-                        tool_install_time = {'Nomal': '正常', 'Warning': '报警'}
-                        equipment_tool_id.write({
-                            'functional_tool_name_id': functional_tool_id.id,
-                            'tool_install_time': time
-                        })
-                        if functional_tool_id.current_location_id.name != '制造前':
-                            # 对功能刀具进行出库到生产线
-                            functional_tool_id.tool_inventory_displacement_out()
-                        functional_tool_id.write({
-                            'max_lifetime_value': data['MaxLife'],
-                            'used_value': data['UseLife'],
-                            'functional_tool_status': tool_install_time.get(data['State'])
-                        })
-                else:
-                    raise ValidationError('获取的【%s】设备不存在！！！' % data['DeviceId'])
-        else:
-            raise ValidationError('没有获取到刀具库信息！！！')
+                        logging.info('获取的【%s】设备不存在！！！' % data['DeviceId'])
+            else:
+                logging.info('没有获取到【%s】设备的刀具库信息！！！' % self.name)
+        except Exception as e:
+            logging.info("write_maintenance_equipment_tool()捕获错误信息:%s" % e)
 
 
 class StockLot(models.Model):
@@ -134,9 +142,6 @@ class StockLot(models.Model):
                             record.tool_material_status = '报废'
                         else:
                             record.tool_material_status = '未入库'
-                        if record.fixture_material_search_id:
-                            # 注册夹具物料状态到cloud平台
-                            record.enroll_fixture_material_stock()
 
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):

sf_tool_management/models/stock.py

@@ -0,0 +1,23 @@
+from odoo import api, fields, models, _
+
+
+class ShelfLocation(models.Model):
+    _inherit = 'sf.shelf.location'
+
+    tool_rfid = fields.Char('Rfid', compute='_compute_tool', store=True)
+    tool_name_id = fields.Many2one('sf.functional.cutting.tool.entity', string='功能刀具名称', compute='_compute_tool',
+                                   store=True)
+
+    @api.depends('product_id')
+    def _compute_tool(self):
+        for item in self:
+            if item.product_id:
+                if item.product_id.categ_id.name == '功能刀具':
+                    tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                        [('barcode_id', '=', item.product_sn_id.id)])
+                    if tool_id:
+                        item.tool_rfid = tool_id.rfid
+                        item.tool_name_id = tool_id.id
+                        continue
+            item.tool_rfid = ''
+            item.tool_name_id = False

sf_tool_management/models/tool_material_search.py

@@ -46,6 +46,8 @@ class ToolMaterial(models.Model):
             record.scrap_num = scrap_num
             record.number = usable_num + have_been_used_num + scrap_num
 
+
+
     @api.model
     def _read_group_cutting_tool_material_id(self, categories, domain, order):
         cutting_tool_material_id = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)

sf_tool_management/views/functional_tool_views.xml

@@ -6,7 +6,7 @@
             <field name="name">sf.functional.cutting.tool.entity.list.tree</field>
             <field name="model">sf.functional.cutting.tool.entity</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具列表" create="0" edit="0" delete="0">
+                <tree string="功能刀具" create="0" edit="0" delete="0">
                     <field name="barcode_id" invisible="1"/>
                     <field name="rfid"/>
                     <field name="tool_name_id"/>
@@ -19,15 +19,16 @@
                     <field name="tool_loading_length" optional="hide"/>
                     <field name="functional_tool_length" optional="hide"/>
                     <field name="effective_length" optional="hide"/>
-                    <field name="tool_room_num"/>
-                    <field name="line_edge_knife_library_num"/>
-                    <field name="machine_knife_library_num"/>
+                    <field name="tool_room_num" optional="hide"/>
+                    <field name="line_edge_knife_library_num" optional="hide"/>
+                    <field name="machine_knife_library_num" optional="hide"/>
                     <field name="max_lifetime_value"/>
                     <field name="alarm_value"/>
                     <field name="used_value"/>
                     <field name="functional_tool_status"/>
+                    <field name="current_location" string="当前位置"/>
 
-                    <field name="current_location_id" optional="hide"/>
+                    <field name="current_location_id" invisible="1"/>
                     <field name="current_location" optional="hide"/>
                     <field name="sf_cutting_tool_type_id" invisible="True"/>
                 </tree>
@@ -46,8 +47,8 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-<!--                            <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
-<!--                                    type="object" class="btn-primary"/>-->
+                            <!--                            <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
+                            <!--                                    type="object" class="btn-primary"/>-->
                             <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
                                     name="open_functional_tool_warning"
                                     icon="fa-list-ul"
@@ -173,7 +174,10 @@
                                         <field name="cut_time" attrs="{'invisible': [('new_former','=','0')]}"/>
                                         <field name="cut_length" attrs="{'invisible': [('new_former','=','0')]}"/>
                                         <field name="cut_number" attrs="{'invisible': [('new_former','=','0')]}"/>
+                                        <field name="current_location_id" string="当前位置"/>
                                         <field name="current_location" string="当前位置"/>
+                                        <field name="current_shelf_location_id" string="当前货位"
+                                               attrs="{'invisible': [('current_shelf_location_id', '=', False)]}"/>
                                     </group>
                                 </group>
                             </page>
@@ -189,19 +193,34 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="rfid"/>
+                    <field name="barcode_id"/>
                     <field name="tool_name_id"/>
                     <field name="functional_tool_diameter"/>
                     <field name="knife_tip_r_angle"/>
+                    <filter string="刀具房" name="tool_room" domain="[('current_location', '=', '刀具房')]"/>
+                    <filter string="线边刀库" name="storage_area" domain="[('current_location', '=', '线边刀库')]"/>
+                    <filter string="机内刀库" name="machine_knife_library"
+                            domain="[('current_location', '=', '机内刀库')]"/>
+                    <separator/>
+                    <filter string="正常" name="normal" domain="[('functional_tool_status', '=', '正常')]"/>
+                    <filter string="报警" name="alarm" domain="[('functional_tool_status', '=', '报警')]"/>
+                    <separator/>
                     <filter string="未拆除" name="no_state_removed"
                             domain="[('functional_tool_status', '!=', '已拆除')]"/>
                     <filter string="已拆除" name="state_removed" domain="[('functional_tool_status', '=', '已拆除')]"/>
-                    <separator/>
-                    <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
-                        <field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
                         <field name="current_location" icon="fa-building" enable_counters="1"/>
                         <field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
+                        <field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
+                    <group expand="0">
+                        <filter string="功能刀具名称" name="tool_name" domain="[]"
+                                context="{'group_by': 'tool_name_id'}"/>
+                        <filter string="刀具组" name="tool_groups" domain="[]"
+                                context="{'group_by': 'tool_groups_id'}"/>
+                        <filter string="当前位置" name="current_location" domain="[]"
+                                context="{'group_by': 'current_location'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -297,11 +316,10 @@
                 <tree>
                     <field name="name" invisible="1"/>
                     <field name="functional_name_id"/>
-                    <field name="sf_cutting_tool_type_id" invisible="True"/>
                     <field name="tool_groups_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
-                    <field name="coarse_middle_thin"/>
+                    <field name="coarse_middle_thin" optional="hide"/>
                     <field name="tool_stock_num"/>
                     <field name="side_shelf_num"/>
                     <field name="on_tool_stock_num"/>
@@ -310,6 +328,8 @@
                     <field name="max_stock_num"/>
                     <field name="batch_replenishment_num"/>
                     <field name="unit"/>
+
+                    <field name="sf_cutting_tool_type_id" invisible="True"/>
                 </tree>
             </field>
         </record>
@@ -425,21 +445,20 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="name"/>
-                    <field name="sf_cutting_tool_type_id" invisible="True"/>
+                    <field name="tool_groups_id"/>
+                    <field name="sf_cutting_tool_type_id"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
-                    <field name="tool_stock_num"/>
-                    <field name="side_shelf_num"/>
-                    <field name="on_tool_stock_num"/>
-                    <field name="tool_stock_total"/>
-                    <field name="min_stock_num"/>
-                    <field name="max_stock_num"/>
-                    <field name="batch_replenishment_num"/>
-                    <field name="unit"/>
+                    <filter string="需补货" name="batch_replenishment" domain="[('batch_replenishment_num', '>', 0)]"/>
+                    <separator/>
                     <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
                         <field name="sf_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
+                    <group expand="0">
+                        <filter string="刀具组" name="tool_groups" domain="[]"
+                                context="{'group_by': 'tool_groups_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -468,7 +487,9 @@
                     <field name="knife_tip_r_angle"/>
                     <field name="install_tool_time"/>
                     <field name="location_id"/>
+                    <field name="current_location_id"/>
                     <field name="location_dest_id"/>
+                    <field name="destination_location_id"/>
                     <field name="date"/>
                     <field name="qty_done" string="数量"/>
                     <field name="functional_tool_type_id" invisible="True"/>
@@ -483,21 +504,20 @@
             <field name="model">stock.move.line</field>
             <field name="arch" type="xml">
                 <search>
-                    <field name="reference"/>
-                    <field name="lot_id"/>
                     <field name="rfid"/>
                     <field name="functional_tool_name"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
-                    <field name="install_tool_time"/>
-                    <field name="location_id"/>
-                    <field name="location_dest_id"/>
-                    <field name="date"/>
-                    <field name="qty_done"/>
-                    <field name="functional_tool_type_id" invisible="True"/>
+                    <field name="reference"/>
+                    <field name="lot_id"/>
                     <searchpanel>
                         <field name="functional_tool_type_id" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
+                    <group expand="0">
+                        <filter string="功能刀具名称" name="functional_tool_name" domain="[]"
+                                context="{'group_by': 'functional_tool_name'}"/>
+                        <filter string="日期" name="date" domain="[]" context="{'group_by': 'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -511,7 +531,7 @@
                    ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_tree"/>
             <field name="search_view_id"
                    ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_search"/>
-            <field name="domain">[('functional_tool_name_id', '!=', False)]</field>
+            <field name="domain">[('functional_tool_name', '!=', False)]</field>
         </record>
 
     </data>

sf_tool_management/views/stock.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_shelf_location_tool" model="ir.ui.view">
+        <field name="name">sf.shelf.location.form.tool</field>
+        <field name="model">sf.shelf.location</field>
+        <field name="inherit_id" ref="sf_warehouse.view_shelf_location_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_id']" position="after">
+                <field name="tool_rfid" attrs="{'invisible': [('tool_name_id', '=', False)]}"/>
+                <field name="tool_name_id" attrs="{'invisible': [('tool_name_id', '=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

sf_tool_management/views/tool_base_views.xml

@@ -434,17 +434,17 @@
                     <field name="code" optional="hide"/>
                     <field name="functional_tool_name"/>
                     <field name="tool_groups_id"/>
-                    <field name="functional_tool_diameter" string="刀具直径"/>
+                    <field name="functional_tool_diameter" string="刀具直径(mm)"/>
                     <field name="knife_tip_r_angle"/>
                     <field name="coarse_middle_thin" optional="hide"/>
                     <field name="new_former" optional="hide"/>
                     <field name="tool_loading_length" optional="hide"/>
                     <field name="functional_tool_length" optional="hide"/>
-                    <field name="effective_length" optional="hide"/>
+                    <field name="effective_length" invisible="1"/>
                     <field name="loading_task_source" string="任务来源"/>
                     <field name="use_tool_time"/>
-                    <field name="production_line_name_id"/>
-                    <field name="machine_tool_name_id"/>
+                    <field name="production_line_name_id" optional="hide"/>
+                    <field name="machine_tool_name_id" optional="hide"/>
                     <field name="applicant"/>
                     <field name="apply_time"/>
                     <field name="assemble_status" optional="hide"/>
@@ -693,30 +693,29 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="assembly_order_code"/>
-                    <field name="barcode_id" optional="hide"/>
+                    <field name="code" string="功能刀具编码"/>
+                    <field name="barcode_id"/>
                     <field name="functional_tool_name"/>
-                    <field name="functional_tool_diameter"/>
-                    <field name="knife_tip_r_angle"/>
-                    <field name="coarse_middle_thin"/>
-                    <field name="new_former"/>
-                    <field name="tool_loading_length"/>
-                    <field name="functional_tool_length"/>
-                    <field name="effective_length"/>
+                    <field name="functional_tool_type_id"/>
+                    <field name="tool_groups_id"/>
                     <field name="loading_task_source" string="任务来源"/>
-                    <field name="use_tool_time"/>
                     <field name="production_line_name_id"/>
                     <field name="machine_tool_name_id"/>
                     <field name="applicant"/>
-                    <field name="apply_time"/>
-                    <field name="functional_tool_type_id"/>
                     <filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
                     <filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
                     <separator/>
                     <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
                         <field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
-                        <!--                        <field name="assemble_status" enable_counters="1" icon="fa-filter"/>-->
                     </searchpanel>
+
+                    <group expand="0" string="Group By...">
+                        <filter string="功能刀具名称" name="name" domain="[]" context="{'group_by': 'functional_tool_name'}"/>
+                        <filter string="刀具组" name="tool_groups" domain="[]" context="{'group_by': 'tool_groups_id'}"/>
+                        <filter string="任务来源" name="loading_task_source" domain="[]" context="{'group_by': 'loading_task_source'}"/>
+                        <filter string="用刀时间" name="use_tool_time" domain="[]" context="{'group_by': 'use_tool_time'}"/>
+                    </group>
                 </search>
             </field>
         </record>

sf_tool_management/views/tool_material_search.xml

@@ -62,6 +62,7 @@
                                     <tree>
                                         <field name="name"/>
                                         <field name="rfid"/>
+                                        <field name="product_qty"/>
                                         <field name="tool_material_status"/>
 <!--                                        <button name="enroll_tool_material_stock" string="序列号注册" type="object" class="btn-primary"/>-->
                                     </tree>

sf_tool_management/wizard/wizard.py

@@ -854,10 +854,10 @@ class ProductProduct(models.Model):
             'company_id': self.env.company.id
         })
         # 获取位置对象
-        location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
+        location_inventory_ids = self.env['stock.location'].search([('name', 'in', ('Production', '生产'))])
         stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
-        stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id,
+        stock_lot.create_stock_quant(location_inventory_ids[-1], stock_location_id, functional_tool_assembly.id,
                                      obj.assembly_order_code, obj, obj.after_tool_groups_id)
 
         return stock_lot

sf_warehouse/models/model.py

@@ -933,14 +933,36 @@ class SfStockPicking(models.Model):
 
     check_in = fields.Char(string='查询是否为入库单', compute='_check_is_in')
 
+    def batch_stock_move(self):
+        """
+        批量调拨，非就绪状态的会被忽略，完成后有通知提示
+        """
+        for record in self:
+            if record.state != 'assigned':
+                continue
+            record.action_set_quantities_to_reservation()
+            record.button_validate()
+
+        notification_message = '批量调拨完成!请注意，状态非就绪的单据会被忽略'
+        return {
+            'effect': {
+                'fadeout': 'fast',
+                'message': notification_message,
+                'img_url': '/web/image/%s/%s/image_1024' % (
+                    self.create_uid._name, self.create_uid.id) if 0 else '/web/static/img/smile.svg',
+                'type': 'rainbow_man',
+            }
+        }
+
     @api.depends('name')
     def _check_is_in(self):
         """
         判断是否为出库单
         """
-        if self.name:
-            is_check_in = self.name.split('/')
-            self.check_in = is_check_in[1]
+        for record in self:
+            if record.name:
+                is_check_in = record.name.split('/')
+                record.check_in = is_check_in[1]
 
     def button_validate(self):
         """
@@ -1121,7 +1143,10 @@ class CustomStockMove(models.Model):
         move_lines = self.move_line_ids  # 获取当前 stock.move 对应的所有 stock.move.line 记录
         for line in move_lines:
             if line.lot_name:  # 确保 lot_name 存在
-                qr_data = self.compute_lot_qr_code(line.lot_name)
+                lot_name = line.lot_name
+                if line.product_id.categ_id.name == '坯料':
+                    lot_name = lot_name.split('[', 1)[0]
+                qr_data = self.compute_lot_qr_code(lot_name)
                 # 假设 stock.move.line 模型中有一个字段叫做 lot_qr_code 用于存储二维码数据
                 line.lot_qr_code = qr_data
         return result

sf_warehouse/models/sync_common.py

@@ -20,7 +20,7 @@ class MrsShelfLocationDataSync(models.Model):
                 paired_data = list(zip(my_data, their_data))
                 return paired_data
 
-            shelf_1_obj = self.env['sf.shelf'].search([('name', '=', '一号线边刀架')], limit=1)
+            shelf_1_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-一号线边刀架')], limit=1)
             tool_location_objs_1 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_1_obj.id)], order='id')
 
             location_codes_1 = [location.barcode for location in tool_location_objs_1]
@@ -32,7 +32,7 @@ class MrsShelfLocationDataSync(models.Model):
             aligned_data_1 = align_data(location_codes_1, their_data_1)
 
             # 2
-            shelf_2_obj = self.env['sf.shelf'].search([('name', '=', '二号线边刀架')], limit=1)
+            shelf_2_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-二号线边刀架')], limit=1)
             tool_location_objs_2 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_2_obj.id)], order='id')
 
             location_codes_2 = [location.barcode for location in tool_location_objs_2]
@@ -44,7 +44,7 @@ class MrsShelfLocationDataSync(models.Model):
             aligned_data_2 = align_data(location_codes_2, their_data_2)
 
             # 4
-            shelf_4_obj = self.env['sf.shelf'].search([('name', '=', '一号线边料架')], limit=1)
+            shelf_4_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-一号线边料架')], limit=1)
             tool_location_objs_4 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_4_obj.id)], order='id')
 
             location_codes_4 = [location.barcode for location in tool_location_objs_4]
@@ -56,7 +56,7 @@ class MrsShelfLocationDataSync(models.Model):
             aligned_data_4 = align_data(location_codes_4, their_data_4)
 
             # 3
-            shelf_3_obj = self.env['sf.shelf'].search([('name', '=', '一号线边料架')], limit=1)
+            shelf_3_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-二号线边料架')], limit=1)
             tool_location_objs_3 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_3_obj.id)], order='id')
 
             location_codes_3 = [location.barcode for location in tool_location_objs_3]
@@ -68,7 +68,7 @@ class MrsShelfLocationDataSync(models.Model):
             aligned_data_3 = align_data(location_codes_3, their_data_3)
 
             # 5
-            shelf_5_obj = self.env['sf.shelf'].search([('name', '=', '一号线边料架')], limit=1)
+            shelf_5_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-三号线边料架')], limit=1)
             tool_location_objs_5 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_5_obj.id)], order='id')
 
             location_codes_5 = [location.barcode for location in tool_location_objs_5]
@@ -95,17 +95,34 @@ class MrsShelfLocationDataSync(models.Model):
                         return code_pair[0]
                 return None  # 如果没有找到对应的值，返回None或适当的默认值
 
+            # 定时更新所有设备机床刀库信息
+            equipment_ids = self.env['maintenance.equipment'].search(
+                [('equipment_type', '=', '机床'), ('function_type', '!=', False)])
+            for equipment_id in equipment_ids:
+                if equipment_id:
+                    equipment_id.register_equipment_tool()
+
             shelfinfo = self.env['sf.shelf.location'].get_sf_shelf_location_info()
             print('shelfinfo:', shelfinfo)
             for item in shelfinfo:
                 shelf_barcode = find_our_code(item['Postion'], total_data)
                 location_id = self.env['sf.shelf.location'].search([('barcode', '=', shelf_barcode)], limit=1)
                 if location_id:
-                    stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
-                    if stock_lot_obj:
-                        location_id.product_sn_id = stock_lot_obj.id
+                    # 如果是线边刀库信息,则对功能刀具移动生成记录
+                    if 'Tool' in item['Postion']:
+                        tool = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                            [('rfid', '=', item['RfidCode']), ('functional_tool_status', '!=', '已拆除')])
+                        tool.tool_in_out_stock_location(location_id)
+                        if tool:
+                            location_id.product_sn_id = tool.barcode_id.id
+                        else:
+                            location_id.product_sn_id = False
                     else:
-                        location_id.product_sn_id = False
+                        stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
+                        if stock_lot_obj:
+                            location_id.product_sn_id = stock_lot_obj.id
+                        else:
+                            location_id.product_sn_id = False
 
                 logging.info('货架已获取信息:%s' % item)
         except Exception as e:

sf_warehouse/views/change_stock_move_views.xml

@@ -149,6 +149,9 @@
                     <button name="action_assign" type="object" string="检查可用量"
                             groups="sf_base.group_sf_stock_user"/>
                 </xpath>
+                <xpath expr="//header" position="inside">
+                    <button name="batch_stock_move" type='object' string="批量调拨"/>
+                </xpath>
             </field>
         </record>