Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/打印配置优化

sf_base/commons/Printer.py

@@ -11,10 +11,11 @@ class Printer(models.Model):
 
 
 class TableStyle(models.Model):
-    _name = 'table.style'
+    _name = 'label.style'
     _description = '标签样式'
 
     name = fields.Char(string='名称', required=True)
+    zpl_code = fields.Text(string='zpl指令')
     # todo
 
 
@@ -25,4 +26,5 @@ class PrinterConfiguration(models.Model):
     name = fields.Char(string='名称', required=True)
     printer_id = fields.Many2one('printer', string='打印机')
     model = fields.Many2one('ir.model', string='模型名称')
+    label_id = fields.Many2one('label.style', '标签')
 #     # 其他相关字段...

sf_base/commons/common.py

@@ -43,19 +43,19 @@ class PrintingUtils(models.AbstractModel):
         zpl_code += "^CI28\n"
 
         # 设置二维码位置
-        zpl_code += "^FO50,50\n"  # 调整二维码位置，使其与资产编号在同一行
+        zpl_code += "^FO50,260\n"  # 调整二维码位置，使其与资产编号在同一行
-        zpl_code += f"^BQN,2,6^FDLM,B0093{code}^FS\n"
+        zpl_code += f"^BQN,2,5^FDLM,B0093{code}^FS\n"
 
-        # 设置资产编号文本位置
+        # # 设置资产编号文本位置
-        zpl_code += "^FO300,60\n"  # 资产编号文本的位置，与二维码在同一行
+        # zpl_code += "^FO300,60\n"  # 资产编号文本的位置，与二维码在同一行
-        zpl_code += "^A1N,45,45^FD编码名称: ^FS\n"
+        # zpl_code += "^A1N,45,45^FD编码名称: ^FS\n"
 
         # 设置{code}文本位置
         # 假设{code}文本需要位于资产编号和二维码下方，中间位置
         # 设置{code}文本位置并启用自动换行
-        zpl_code += "^FO300,120\n"  # {code}文本的起始位置
+        zpl_code += "^FO240,10\n"  # {code}文本的起始位置
-        zpl_code += "^FB400,4,0,L,0\n"  # 定义一个宽度为500点的文本框，最多4行，左对齐
+        zpl_code += "^FB600,10,0,L,0\n"  # 定义一个宽度为500点的文本框，最多4行，左对齐
-        zpl_code += f"^A1N,40,40^FD{code}^FS\n"
+        zpl_code += f"^A1B,40,40^FD{code}^FS\n"
 
         # 在{code}文本框周围绘制线框
         # 假设线框的外部尺寸为宽度500点，高度200点

sf_base/models/tool_base_new.py

@@ -331,7 +331,7 @@ class ToolInventory(models.Model):
     work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
     life_span = fields.Float('寿命(min)')
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组', required=True)
+    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')
 
     active = fields.Boolean('已归档', default=True)
 

sf_base/security/ir.model.access.csv

@@ -208,6 +208,7 @@ access_sf_machine_brand_tags_group_purchase_director,sf_machine_brand_tags_group
 
 access_printer,printer,model_printer,base.group_user,1,1,1,1
 access_printer_configuration,printer.configuration,model_printer_configuration,base.group_user,1,1,1,1
+access_label_style,label.style,model_label_style,base.group_user,1,1,1,1
 
 access_group_sf_mrp_user,sf_tool_inventory,model_sf_tool_inventory,base.group_user,1,1,1,0
 access_group_sf_mrp_user_admin,sf_tool_inventory_admin,model_sf_tool_inventory,base.group_system,1,1,1,0

sf_base/views/Printer.xml

@@ -38,6 +38,7 @@
                     <field name="name"/>
                     <field name="printer_id"/>
                     <field name="model"/>
+                    <field name="label_id"/>
                     <!-- 其他字段... -->
                 </tree>
             </field>
@@ -53,6 +54,36 @@
                             <field name="name"/>
                             <field name="printer_id"/>
                             <field name="model"/>
+                            <field name="label_id"/>
+                            <!-- 其他字段... -->
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_label_style_tree" model="ir.ui.view">
+            <field name="name">label.style.tree</field>
+            <field name="model">label.style</field>
+            <field name="arch" type="xml">
+                <tree string="label style">
+                    <field name="name"/>
+<!--                     <field name="zpl_code"/> -->
+                    <!-- 其他字段... -->
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_label_style_form" model="ir.ui.view">
+            <field name="name">label.style.form</field>
+            <field name="model">label.style</field>
+            <field name="arch" type="xml">
+                <form string="label style">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="zpl_code"/>
+
                             <!-- 其他字段... -->
                         </group>
                     </sheet>
@@ -74,6 +105,11 @@
             <field name="res_model">printer.configuration</field>
             <field name="view_mode">tree,form</field>
         </record>
+        <record id="action_label_style" model="ir.actions.act_window">
+            <field name="name">标签样式</field>
+            <field name="res_model">label.style</field>
+            <field name="view_mode">tree,form,kanban</field>
+        </record>
 
         <!-- Add a menu item for the printer configuration -->
 <!--         <record id="menu_printer_configuration" model="ir.ui.menu"> -->
@@ -108,5 +144,12 @@
         sequence="2"
         parent="printer_main_menu"/>
 
+        <menuitem
+        id="menu_label_style"
+        name="标签样式"
+        action="action_label_style"
+        sequence="3"
+        parent="printer_main_menu"/>
+
     </data>
 </odoo>

sf_base/views/tool_views.xml

@@ -555,9 +555,9 @@
         <field name="model">sf.tool.inventory</field>
         <field name="arch" type="xml">
             <tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
-                <field name="name" attrs="{'readonly': [('id', '!=', False)]}"/>
+                <field name="name"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                <field name="tool_groups_id"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>

sf_bf_connect/models/jd_eclp.py

@@ -14,7 +14,7 @@ _logger = logging.getLogger(__name__)
 class JdEclp(models.Model):
     _inherit = 'stock.picking'
 
-    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='XT')
+    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='MW')
 
     # receiverName = fields.Char(string='收件人姓名')
     # receiverMobile = fields.Char(string='收件人电话')

sf_dlm_management/views/product_template_management_view.xml

@@ -305,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="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'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,9 +25,6 @@
                 <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_machine_connect/views/compensation.xml

@@ -5,46 +5,39 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
-            <!--            <xpath expr="//header" position="inside">-->
+            <xpath expr="//header" position="inside">
-            <!--                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
+                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
-            <!--                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
+                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
-            <!--            </xpath>-->
-            <xpath expr="//page//field[@name='cnc_ids']" position="before">
-                <group>
-                    <group>
-                        <field name="compensation_value_x"/>
-                        <field name="compensation_value_y"/>
-                    </group>
-                    <div>
-                        <div>
-                            <field name="button_compensation_state" attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                            <!--                                <span>&#32;</span>-->
-                            <button name="button_send_program_again" type="object" string="重新下发NC程序"
-                                    class="btn-primary"
-                                    confirm="是否确认重新下发NC程序？"
-                                    groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"
-                                    attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',
-                                                                                                   'progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>
-                            <!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
-                            <!--                                    class="btn-primary" attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-                            <!--                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"-->
-                            <!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-                            <!--                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"-->
-                            <!--                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-                            <!--                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"-->
-                            <!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                        </div>
-                    </div>
-                </group>
             </xpath>
+                <xpath expr="//page//field[@name='cnc_ids']" position="before">
+                    <group>
+                        <group>
+                            <field name="compensation_value_x"/>
+                            <field name="compensation_value_y"/>
+                        </group>
+                        <div>
+                            <div>
+                                <field name="button_compensation_state" attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"
+                                    class="btn-primary" attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <span>&#32;</span>
+                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
+                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <span>&#32;</span>
+                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"
+                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <span>&#32;</span>
+                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"
+                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                            </div>
+                        </div>
+                    </group>
+                </xpath>
 
         </field>
     </record>

sf_machine_connect/views/default_delivery.xml

@@ -9,6 +9,7 @@
             <tree>
                 <field name="sequence_number"/>
                 <field name="program_name"/>
+                <field name="cnc_id" string="文件"/>
                 <field name="functional_tool_type_id"/>
                 <field name="cutting_tool_name"/>
                 <field name="cutting_tool_no"/>

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='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def get_Work_Info(self, **kw):
         """
@@ -216,8 +216,7 @@ class Manufacturing_Connect(http.Controller):
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
                 return json.JSONEncoder().encode(res)
             # workorder.write({'date_finished': datetime.now()})
-            if ret['IsComplete'] is True:
+            workorder.button_finish()
-                workorder.button_finish()
             # workorder.process_state = '待解除装夹'
             # workorder.sudo().production_id.process_state = '待解除装夹'
 
@@ -460,27 +459,25 @@ class Manufacturing_Connect(http.Controller):
                             if f'RfidCode{i}' in ret:
                                 rfid_code = ret[f'RfidCode{i}']
                                 logging.info('RfidCode:%s' % rfid_code)
-                                if rfid_code is not None:
+                                domain = [
-                                    domain = [
+                                    ('rfid_code', '=', rfid_code),
-                                        ('rfid_code', '=', rfid_code),
+                                    ('routing_type', '=', 'CNC加工')
-                                        ('routing_type', '=', 'CNC加工')
+                                ]
-                                    ]
+                                workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
-                                    workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
+                                if workorder:
-                                    if workorder:
+                                    for order in workorder:
-                                        for order in workorder:
+                                        if order.production_id.production_line_state == '待上产线':
-                                            if order.production_id.production_line_state == '待上产线':
+                                            logging.info(
-                                                logging.info(
+                                                '制造订单产线状态:%s' % order.production_id.production_line_state)
-                                                    '制造订单产线状态:%s' % order.production_id.production_line_state)
+                                            order.production_id.write({'production_line_state': '已上产线'})
-                                                order.production_id.write({'production_line_state': '已上产线'})
+                                            workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search([
-                                                workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+                                                ('rfid_code', '=', rfid_code), ('type', '=', '上产线'),
-                                                    [
+                                                ('production_id', '=', order.production_id.id)])
-                                                        ('rfid_code', '=', rfid_code), ('type', '=', '上产线'),
+                                            if workpiece_delivery.status == '待下发':
-                                                        ('production_id', '=', order.production_id.id)])
+                                                workpiece_delivery.write({'is_manual_work': True})
-                                                if workpiece_delivery.status == '待下发':
+                                else:
-                                                    workpiece_delivery.write({'is_manual_work': True})
+                                    res = {'Succeed': False, 'ErrorCode': 204,
-                                    else:
+                                           'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
-                                        res = {'Succeed': False, 'ErrorCode': 204,
-                                               'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
                 else:
                     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
             else:
@@ -517,26 +514,24 @@ class Manufacturing_Connect(http.Controller):
                             if f'RfidCode{i}' in ret:
                                 rfid_code = ret[f'RfidCode{i}']
                                 logging.info('RfidCode:%s' % rfid_code)
-                                if rfid_code is not None:
+                                domain = [
-                                    domain = [
+                                    ('rfid_code', '=', rfid_code),
-                                        ('rfid_code', '=', rfid_code),
+                                    ('routing_type', '=', 'CNC加工')
-                                        ('routing_type', '=', 'CNC加工')
+                                ]
-                                    ]
+                                workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
-                                    workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
+                                if workorder:
-                                    if workorder:
+                                    for order in workorder:
-                                        for order in workorder:
+                                        if order.production_id.production_line_state == '已上产线':
-                                            if order.production_id.production_line_state == '已上产线':
+                                            logging.info(
-                                                logging.info(
+                                                '制造订单产线状态:%s' % order.production_id.production_line_state)
-                                                    '制造订单产线状态:%s' % order.production_id.production_line_state)
+                                            order.production_id.write({'production_line_state': '已下产线'})
-                                                order.production_id.write({'production_line_state': '已下产线'})
+                                            workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search([
-                                                workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+                                                ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),
-                                                    [
+                                                ('production_id', '=', order.production_id.id)])
-                                                        ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),
+                                            delivery_Arr.append(workpiece_delivery.id)
-                                                        ('production_id', '=', order.production_id.id)])
+                                else:
-                                                delivery_Arr.append(workpiece_delivery.id)
+                                    res = {'Succeed': False, 'ErrorCode': 204,
-                                    else:
+                                           'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
-                                        res = {'Succeed': False, 'ErrorCode': 204,
-                                               'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
                         if delivery_Arr:
                             logging.info('delivery_Arr:%s' % delivery_Arr)
                             delivery_workpiece = request.env['sf.workpiece.delivery'].sudo().search(

sf_manufacturing/models/mrp_production.py

@@ -178,7 +178,7 @@ class MrpProduction(models.Model):
             raise UserError("更新程单失败,请联系管理员")
 
     # cnc程序获取
-    def fetchCNC(self, production_names):
+    def fetchCNC(self, production_names, scrap_production):
         cnc = self.env['mrp.production'].search([('id', '=', self.id)])
         quick_order = self.env['quick.easy.order'].search(
             [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
@@ -194,7 +194,8 @@ class MrpProduction(models.Model):
                 'production_no': production_names,
                 'machine_tool_code': '',
                 'product_name': cnc.product_id.name,
-                'remanufacture_type': '',
+                'remanufacture_type': '' if not scrap_production else scrap_production.workorder_ids.filtered(
+                    lambda b: b.routing_type == "CNC加工").test_results,
                 'model_code': cnc.product_id.model_code,
                 'material_code': self.env['sf.production.materials'].search(
                     [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
@@ -292,7 +293,7 @@ class MrpProduction(models.Model):
     # 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制；
     # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
 
-    def _create_workorder3(self, item):
+    def _create_workorder3(self):
         # 根据product_id对self进行分组
         grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.product_id.id)}
         # 初始化一个字典来存储每个product_id对应的生产订单名称列表
@@ -328,6 +329,20 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
+                if production.product_id.id in product_id_to_production_names:
+                    #     # 同一个产品多个制造订单对应一个编程单和模型库
+                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                    if not production.programming_no:
+                        production_programming = self.search(
+                            [('product_id.id', '=', production.product_id.id), ('origin', '=', production.origin)],
+                            limit=1, order='id asc')
+                        if not production_programming.programming_no:
+                            production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id]),
+                                                scrap_production)
+                        else:
+                            production.write({'programming_no': production_programming.programming_no,
+                                              'programming_state': '编程中'})
+
                 # # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -340,10 +355,10 @@ class MrpProduction(models.Model):
                     for route in product_routing_workcenter:
                         if route.is_repeat is True:
                             workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str(k, production, route, item))
+                                self.env['mrp.workorder'].json_workorder_str(k, production, route))
-                        # if i == processing_panel_len and route.routing_type == '解除装夹':
+                        if i == processing_panel_len and route.routing_type == '解除装夹':
-                        #     workorders_values.append(
+                            workorders_values.append(
-                        #         self.env['mrp.workorder'].json_workorder_str(k, production, route))
+                                self.env['mrp.workorder'].json_workorder_str(k, production, route))
                 # 表面工艺工序
                 # 获取表面工艺id
                 if production.product_id.model_process_parameters_ids:
@@ -391,52 +406,6 @@ class MrpProduction(models.Model):
                     workorders_values.append(
                         self.env['mrp.workorder'].json_workorder_str('', production, route))
             production.workorder_ids = workorders_values
-            # for production_item in productions:
-            process_parameter_workorder = self.env['mrp.workorder'].search(
-                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.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 workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
@@ -531,63 +500,46 @@ class MrpProduction(models.Model):
     def _reset_work_order_sequence(self):
         for rec in self:
             sequence_list = {}
-            # 产品模型类型
             model_type_id = rec.product_id.product_model_type_id
-            # 产品加工面板
-            model_processing_panel = rec.product_id.model_processing_panel
             if model_type_id:
-                if model_processing_panel:
+                tmpl_num = 1
-                    tmpl_num = 1
+                # 成品工序
-                    panel_list = model_processing_panel.split(',')
+                product_routing_tmpl_ids = model_type_id.product_routing_tmpl_ids
-                    for panel in panel_list:
+                if product_routing_tmpl_ids:
-                        panel_sequence_list = {}
+                    for tmpl_id in product_routing_tmpl_ids:
-                        # 成品工序
+                        sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
-                        product_routing_tmpl_ids = model_type_id.product_routing_tmpl_ids
+                        tmpl_num += 1
-                        if product_routing_tmpl_ids:
+                # 表面工艺工序
-                            for tmpl_id in product_routing_tmpl_ids:
+                # 模型类型的表面工艺工序模版
-                                panel_sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
+                surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
-                                tmpl_num += 1
+                # 产品选择的表面工艺
-                        sequence_list.update({panel: panel_sequence_list})
+                model_process_parameters_ids = rec.product_id.model_process_parameters_ids
-                    # 表面工艺工序
+                process_dict = {}
-                    # 模型类型的表面工艺工序模版
+                if model_process_parameters_ids:
-                    surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
+                    for process_parameters_id in model_process_parameters_ids:
-                    # 产品选择的表面工艺
+                        process_id = process_parameters_id.process_id
-                    model_process_parameters_ids = rec.product_id.model_process_parameters_ids
+                        for surface_tmpl_id in surface_tmpl_ids:
-                    process_dict = {}
+                            if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
-                    if model_process_parameters_ids:
+                                surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
-                        for process_parameters_id in model_process_parameters_ids:
+                                process_dict.update({int(process_id.category_id.code): '%s-%s' % (
-                            process_id = process_parameters_id.process_id
+                                    surface_tmpl_name, process_parameters_id.name)})
-                            for surface_tmpl_id in surface_tmpl_ids:
+                process_list = sorted(process_dict.keys())
-                                if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
+                for process_num in process_list:
-                                    surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
+                    sequence_list.update({process_dict.get(process_num): tmpl_num})
-                                    process_dict.update({int(process_id.category_id.code): '%s-%s' % (
+                    tmpl_num += 1
-                                        surface_tmpl_name, process_parameters_id.name)})
+                # 坯料工序
-                    process_list = sorted(process_dict.keys())
+                tmpl_num = 1
-                    for process_num in process_list:
+                embryo_routing_tmpl_ids = model_type_id.embryo_routing_tmpl_ids
-                        sequence_list.update({process_dict.get(process_num): tmpl_num})
+                if embryo_routing_tmpl_ids:
+                    for tmpl_id in embryo_routing_tmpl_ids:
+                        sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
                         tmpl_num += 1
-                    # 坯料工序
-                    tmpl_num = 1
-                    embryo_routing_tmpl_ids = model_type_id.embryo_routing_tmpl_ids
-                    if embryo_routing_tmpl_ids:
-                        for tmpl_id in embryo_routing_tmpl_ids:
-                            sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
-                            tmpl_num += 1
-                else:
-                    raise ValidationError('该产品【加工面板】为空!')
-
             else:
                 raise ValidationError('该产品没有选择【模版类型】!')
 
             for work in rec.workorder_ids:
                 if sequence_list.get(work.name):
                     work.sequence = sequence_list[work.name]
-                elif sequence_list.get(work.processing_panel):
-                    processing_panel = sequence_list.get(work.processing_panel)
-                    if processing_panel.get(work.name):
-                        work.sequence = processing_panel[work.name]
-                    else:
-                        raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
                 else:
                     raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
                 # if work.name == '获取CNC加工程序':
@@ -596,8 +548,8 @@ class MrpProduction(models.Model):
                 #     work.button_finish()
 
     # 创建工单并进行排序
-    def _create_workorder(self, item):
+    def _create_workorder(self):
-        self._create_workorder3(item)
+        self._create_workorder3()
         self._reset_work_order_sequence()
         return True
 

sf_manufacturing/models/mrp_workorder.py

@@ -1,5 +1,5 @@
 import re
-import json
+
 import logging
 import base64
 import urllib.parse
@@ -21,8 +21,6 @@ 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,
@@ -207,7 +205,6 @@ class ResMrpWorkOrder(models.Model):
         [("programming", "编程"), ("clamping", "返工"), ("cutter", "刀具"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图"), ("other", "其他"), ], string="原因", tracking=True)
     detailed_reason = fields.Text('详细原因')
-    is_send_program_again = fields.Boolean(string='是否重新下发NC程序', default=False)
 
     @api.onchange('rfid_code')
     def _onchange(self):
@@ -474,7 +471,7 @@ class ResMrpWorkOrder(models.Model):
                         raise UserError(_("该工单暂未完成，无法进行工件配送"))
 
     # 拼接工单对象属性值
-    def json_workorder_str(self, k, production, route, item):
+    def json_workorder_str(self, k, production, route):
         # 计算预计时长duration_expected
         if route.routing_type == '切割':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
@@ -507,7 +504,7 @@ class ResMrpWorkOrder(models.Model):
             'processing_panel': k,
             'quality_point_ids': route.route_workcenter_id.quality_point_ids,
             'routing_type': route.routing_type,
-            # 'work_state': '待发起',
+            'work_state': '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
                                                                                route.routing_type,
                                                                                production.product_id),
@@ -516,10 +513,6 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_finished': datetime.now() + timedelta(days=1),
             'duration_expected': duration_expected,
             'duration': 0,
-            'cnc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cnc.processing']._json_cnc_processing(
-                k, item),
-            'cmm_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
-                                                                                                                  item),
             'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list(
                 production)
         }]
@@ -691,7 +684,7 @@ class ResMrpWorkOrder(models.Model):
                 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._create_workorder(is_fetchcnc=self.is_fetchcnc, scrap_production=self.production_id)
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (
                                                    p.move_dest_ids.procure_method != 'make_to_order' and
@@ -856,12 +849,12 @@ class ResMrpWorkOrder(models.Model):
                 limit=1, order='id asc')
             if not cnc_workorder.cnc_ids:
                 raise UserError(_('该制造订单还未下发CNC程序，请稍后再试'))
-            # else:
+            else:
-            #     for item in cnc_workorder.cnc_ids:
+                for item in cnc_workorder.cnc_ids:
-            #         functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
+                    functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
-            #             [('tool_name_id.name', '=', item.cutting_tool_name)])
+                        [('tool_name_id.name', '=', item.cutting_tool_name)])
-            #         if not functional_cutting_tool:
+                    if not functional_cutting_tool:
-            #             raise UserError(_('该制造订单的CNC程序为%s没有对应的功能刀具' % item.cutting_tool_name))
+                        raise UserError(_('该制造订单的CNC程序为%s没有对应的功能刀具' % item.cutting_tool_name))
         if self.routing_type == '解除装夹':
             '''
             记录开始时间
@@ -1016,15 +1009,10 @@ class ResMrpWorkOrder(models.Model):
             for workorder in record.production_id.workorder_ids:
                 if workorder.state != 'done':
                     is_production_id = False
-            if record.routing_type == '解除装夹':
-                for workorder in record.production_id.workorder_ids:
-                    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 workorder in record.production_id.workorder_ids:
+                    workorder.rfid_code_old = workorder.rfid_code
+                    workorder.rfid_code = None
                 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 = '已完工'
@@ -1078,33 +1066,6 @@ class ResMrpWorkOrder(models.Model):
                     workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
                     return True
 
-    # 重新下发nc程序
-    def button_send_program_again(self):
-        try:
-            res = {'programming_no': self.production_id.programming_no}
-            configsettings = self.env['res.config.settings'].get_values()
-            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-            url = '/api/intelligent_programming/reset_state_again'
-            config_url = configsettings['sf_url'] + url
-            r = requests.post(config_url, json=res, data=None, headers=config_header)
-            r = r.json()
-            result = json.loads(r['result'])
-            if result['status'] == 1:
-                productions = self.env['mrp.production'].search(
-                    [('programming_no', '=', self.production_id.programming_no), ('programming_state', '=', '已编程')])
-                if productions:
-                    workorder = productions.workorder_ids.filtered(
-                        lambda ap: ap.routing_type in ['装夹预调', 'CNC加工'] and ap.state not in ['done', 'cancel',
-                                                                                                   'progress'])
-                    if workorder:
-                        workorder.write({'is_send_program_again': True})
-                        productions.write({'work_state': '编程中', 'programming_state': '编程中'})
-            else:
-                raise UserError(result['message'])
-        except Exception as e:
-            logging.info('button_send_program_again error:%s' % e)
-            raise UserError("重新下发nc程序失败,请联系管理员")
-
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'
@@ -1130,7 +1091,6 @@ class CNCprocessing(models.Model):
     production_id = fields.Many2one('mrp.production', string="制造订单")
     button_state = fields.Boolean(string='是否已经下发')
     program_path = fields.Char('程序文件路径')
-    program_create_date = fields.Datetime('程序创建日期')
 
     # mrs下发编程单创建CNC加工
     def cnc_processing_create(self, cnc_workorder, ret, program_path, program_path_tmp):
@@ -1163,27 +1123,24 @@ class CNCprocessing(models.Model):
                 cnc_workorder.write({'programming_state': '已编程', 'work_state': '已编程'})
         return cnc_processing
 
-    def _json_cnc_processing(self, panel, ret):
+    def _json_cnc_processing(self, obj):
-        cnc_processing = []
+        cnc_processing_str = (0, 0, {
-        for item in ret['programming_list']:
+            'sequence_number': obj['sequence_number'],
-            if item['processing_panel'] == panel and item['ftp_path'].find('.dmi') == -1:
+            'program_name': obj['program_name'],
-                cnc_processing.append((0, 0, {
+            'cutting_tool_name': obj['cutting_tool_name'],
-                    'sequence_number': item['sequence_number'],
+            'cutting_tool_no': obj['cutting_tool_no'],
-                    'program_name': item['program_name'],
+            'processing_type': obj['processing_type'],
-                    'cutting_tool_name': item['cutting_tool_name'],
+            'margin_x_y': obj['margin_x_y'],
-                    'cutting_tool_no': item['cutting_tool_no'],
+            'margin_z': obj['margin_z'],
-                    'processing_type': item['processing_type'],
+            'depth_of_processing_z': obj['depth_of_processing_z'],
-                    'margin_x_y': item['margin_x_y'],
+            'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-                    'margin_z': item['margin_z'],
+            'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-                    'depth_of_processing_z': item['depth_of_processing_z'],
+            'estimated_processing_time': obj['estimated_processing_time'],
-                    'cutting_tool_extension_length': item['cutting_tool_extension_length'],
+            'program_path': obj['program_path'],
-                    'cutting_tool_handle_type': item['cutting_tool_handle_type'],
+            'cnc_id': obj['cnc_id'].id,
-                    'estimated_processing_time': item['estimated_processing_time'],
+            'remark': obj['remark']
-                    'program_path': item['ftp_path'],
+        })
-                    'program_create_date': datetime.strptime(item['program_create_date'], '%Y-%m-%d %H:%M:%S'),
+        return cnc_processing_str
-                    'remark': item['remark']
-                }))
-        return cnc_processing
 
     # 根据程序名和加工面匹配到ftp里对应的Nc程序名,可优化为根据cnc_processing.program_path进行匹配
     def get_cnc_processing_file(self, serverdir, cnc_processing, program_path):
@@ -1213,14 +1170,14 @@ class CNCprocessing(models.Model):
         })
         return attachment
 
-    # 将FTP的多面的程序单文件下载到临时目录
+    # 将FTP的nc文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
         remotepath = os.path.join('/NC', production_no, 'return', processing_panel)
         serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
-        download_state = ftp.download_program_file(remotepath, serverdir)
+        download_state = ftp.download_file_tree(remotepath, serverdir)
         logging.info('download_state:%s' % download_state)
         return download_state
 
@@ -1297,12 +1254,11 @@ 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[%s]绑定成功！！！" % barcode)
+                            logging.info("Rfid绑定成功！！！")
                         else:
                             raise UserError('该Rfid【%s】绑定的是【%s】, 不是托盘！！！' % (barcode, lot.product_id.name))
                     self.process_state = '待检测'
@@ -1625,22 +1581,80 @@ class CMMprogram(models.Model):
     _name = 'sf.cmm.program'
     _description = "CMM程序"
 
+    cmm_id = fields.Many2one('ir.attachment')
     sequence_number = fields.Integer('序号')
     program_name = fields.Char('程序名')
+    cutting_tool_name = fields.Char('刀具名称')
+    cutting_tool_no = fields.Char('刀号')
+    processing_type = fields.Char('加工类型')
+    margin_x_y = fields.Char('余量_X/Y')
+    margin_z = fields.Char('余量_Z')
+    depth_of_processing_z = fields.Char('加工深度(Z)')
+    cutting_tool_extension_length = fields.Char('刀具伸出长度')
+    cutting_tool_handle_type = fields.Char('刀柄型号')
+    estimated_processing_time = fields.Char('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
     production_id = fields.Many2one('mrp.production', string="制造订单")
     program_path = fields.Char('程序文件路径')
-    program_create_date = fields.Datetime('程序创建日期')
 
-    def _json_cmm_program(self, panel, ret):
+    def cmm_program_create(self, ret, program_path, program_path_tmp):
-        cmm_program = []
+        cmm_program = None
-        for item in ret['programming_list']:
+        for obj in ret['programming_list']:
-            if item['processing_panel'] == panel and item['ftp_path'].find('.dmi') != -1:
+            workorder = self.env['mrp.workorder'].search(
-                cmm_program.append((0, 0, {
+                [('production_id.name', '=', ret['production_order_no'].split(',')[0]),
-                    'sequence_number': 1,
+                 ('processing_panel', '=', obj['processing_panel']),
-                    'program_name': item['program_name'],
+                 ('routing_type', '=', 'CNC加工')])
-                    'program_path': item['ftp_path'],
+            if obj['program_name'] in program_path:
-                    'program_create_date': datetime.strptime(item['program_create_date'], '%Y-%m-%d %H:%M:%S'),
+                logging.info('obj:%s' % obj['program_name'])
-                }))
+                cmm_program = self.sudo().create({
+                    'workorder_id': workorder.id,
+                    'sequence_number': obj['sequence_number'],
+                    'program_name': obj['program_name'],
+                    'cutting_tool_name': obj['cutting_tool_name'],
+                    'cutting_tool_no': obj['cutting_tool_no'],
+                    'processing_type': obj['processing_type'],
+                    'margin_x_y': obj['margin_x_y'],
+                    'margin_z': obj['margin_z'],
+                    'depth_of_processing_z': obj['depth_of_processing_z'],
+                    'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
+                    'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
+                    'estimated_processing_time': obj['estimated_processing_time'],
+                    'remark': obj['remark'],
+                    'program_path': program_path.replace('/tmp', '')
+                })
+                cmm_program.get_cmm_program_file(program_path_tmp, cmm_program, program_path)
         return cmm_program
+
+    # 根据程序名和加工面匹配到ftp里对应的cmm程序名
+    def get_cmm_program_file(self, serverdir, cmm_program, program_path):
+        logging.info('cmm-serverdir:%s' % serverdir)
+        for root, dirs, files in os.walk(serverdir):
+            for f in files:
+                if f in program_path:
+                    cmm_program_file_path = os.path.join(serverdir, root, f)
+                    self.write_file_cmm(cmm_program_file_path, cmm_program)
+
+    # 创建附件(nc文件)
+    def attachment_create(self, name, data):
+        attachment = self.env['ir.attachment'].create({
+            'datas': base64.b64encode(data),
+            'type': 'binary',
+            'public': True,
+            'description': '程序文件',
+            'name': name
+        })
+        return attachment
+
+    # 将cmm文件存到attach的datas里
+    def write_file_cmm(self, cmm_file_path, cnc):
+        cmm_file_name = cmm_file_path.split('/')
+        logging.info('cmm_file_name:%s' % cmm_file_name[-1])
+        if os.path.exists(cmm_file_path):
+            with open(cmm_file_path, 'rb') as file:
+                data_bytes = file.read()
+                attachment = self.attachment_create(cnc.program_name + cmm_file_name[-1], data_bytes)
+                cnc.write({'cmm_id': attachment.id})
+                file.close()
+        else:
+            return False

sf_manufacturing/models/product_template.py

@@ -636,7 +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 '',
+            'part_number': item['part_number'] or '',
             'active': True,
         }
         copy_product_id.sudo().write(vals)

sf_manufacturing/models/stock.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import base64
 import qrcode
-from itertools import groupby
 from collections import defaultdict, namedtuple
 import logging
 import io
@@ -206,37 +205,61 @@ class StockRule(models.Model):
 
             # 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(is_fetchcnc=False, scrap_production=False)
+
             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()
-            '''
-            创建工单
-            '''
-            # productions._create_workorder()
-            #
-            grouped_product_ids = {k: list(g) for k, g in groupby(productions, key=lambda x: x.product_id.id)}
-            # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-            product_id_to_production_names = {}
-            # 对于每个product_id，获取其所有生产订单的名称
-            for product_id, productions in grouped_product_ids.items():
-                # 为同一个product_id创建一个生产订单名称列表
-                product_id_to_production_names[product_id] = [production.name for production in productions]
             for production_item in productions:
-                if production_item.product_id.id in product_id_to_production_names:
+                process_parameter_workorder = self.env['mrp.workorder'].search(
-                    #     # 同一个产品多个制造订单对应一个编程单和模型库
+                    [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production_item.id),
-                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                     ('is_subcontract', '=', True)])
-                    if not production_item.programming_no:
+                if process_parameter_workorder:
-                        production_programming = self.env['mrp.production'].search(
+                    is_pick = False
-                            [('product_id.id', '=', production_item.product_id.id),
+                    consecutive_workorders = []
-                             ('origin', '=', production_item.origin)],
+                    m = 0
-                            limit=1, order='id asc')
+                    sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
-                        if not production_programming.programming_no:
+                    for i in range(len(sorted_workorders) - 1):
-                            production_item.fetchCNC(
+                        if m == 0:
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
+                            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:
-                            production_item.write({'programming_no': production_programming.programming_no,
+                            if m == len(consecutive_workorders) - 1 and m != 0:
-                                                   'programming_state': '编程中'})
+                                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:
                 '''
@@ -678,36 +701,13 @@ 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_code = '%s-%s-%s' % ('%s-T-DJWL-%s' % (
+                lot_names = self.env['stock.lot'].generate_lot_names(
-                    product.cutting_tool_model_id.code.split('-')[0], product.cutting_tool_material_id.code),
+                    '%s-%s-%s' % ('%s-T-DJWL-%s' % (
-                                         datetime.now().strftime("%Y%m%d"), origin)
+                        product.cutting_tool_model_id.code.split('-')[0], product.cutting_tool_material_id.code),
-                move_line_ids = self.env['stock.move.line'].sudo().search([('lot_name', 'like', lot_code)], limit=1,
+                                  datetime.now().strftime("%Y%m%d"), origin), 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/security/ir.model.access.csv

@@ -1,9 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_cnc_processing_group_sf_mrp_user,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,0
-access_sf_cmm_program_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
+access_sf_cmm_program_group_sf_mrp_user_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cmm_program_group_sf_mrp_manager,sf_cmm_program_group_sf_mrp_manager,model_sf_cmm_program,sf_base.group_sf_mrp_manager,1,0,0,0
-access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,1
 access_sf_model_type_group_sf_mrp_user,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_model_type_admin,sf_model_type_admin,model_sf_model_type,base.group_system,1,1,1,0
 access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,0

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -62,17 +62,16 @@
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='state']" position="attributes">
-                    <!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
+<!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
-                    <!--                     </attribute>                -->
+<!--                     </attribute>                -->
-                    <attribute name="statusbar_visible">
+                    <attribute name="statusbar_visible">progress,pending_cam,pending_processing,pending_era_cam,completed,done
-                        progress,pending_cam,pending_processing,pending_era_cam,completed,done
                     </attribute>
                 </xpath>
 
                 <xpath expr="//sheet//group//group[2]//label" position="before">
-                    <!--                     <field name="process_state"/> -->
+<!--                     <field name="process_state"/> -->
                     <field name="state"/>
-                    <!--                     <field name="process_state"/> -->
+<!--                     <field name="process_state"/> -->
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
@@ -282,7 +281,7 @@
                     <field name="routing_type" invisible="True"/>
                     <button name="button_start" type="object" string="开始" class="btn-success"
                             attrs="{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user" confirm="是否确认开始?"/>
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="Pause" class="btn-warning"
@@ -292,8 +291,7 @@
                 <xpath expr="//tree//button[@name='button_finish']" position="replace">
                     <button name="button_finish" type="object" string="Done" class="btn-success"
                             attrs="{'invisible': ['|', '|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user"
+                            groups="sf_base.group_sf_mrp_user"/>
-                            confirm="是否确认完成?"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="replace">
                     <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="Block"
@@ -311,10 +309,10 @@
                     <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only"
                             title="Open Work Order"
                             context="{'default_workcenter_id': workcenter_id}" groups="sf_base.group_sf_mrp_user"/>
-                    <!--                     ======= -->
+<!--                     ======= -->
-                    <!--                     <button name="button_start" type="object" string="开始" class="btn-success" -->
+<!--                     <button name="button_start" type="object" string="开始" class="btn-success" -->
-                    <!--                             attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}" -->
+<!--                             attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}" -->
-                    <!--                             groups="sf_base.group_sf_mrp_user"/> -->
+<!--                             groups="sf_base.group_sf_mrp_user"/> -->
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="暂停" class="btn-warning"
@@ -324,7 +322,7 @@
                 <xpath expr="//tree//button[@name='button_finish']" position="replace">
                     <button name="button_finish" type="object" string="完成" class="btn-success"
                             attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user" confirm="是否确认完成?"/>
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="replace">
                     <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞"

sf_manufacturing/views/mrp_workorder_view.xml

@@ -11,7 +11,7 @@
                 <field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/>
             </field>
             <field name="name" position="before">
-                <field name="sequence" optional="hide"/>
+                <field name="sequence"/>
                 <field name='user_permissions' invisible="1"/>
             </field>
             <field name="name" position="after">
@@ -19,13 +19,6 @@
             </field>
             <field name="state" position="after">
                 <field name="work_state" optional="hide"/>
-                <field name="product_tmpl_name" invisible="1"/>
-            </field>
-            <field name="duration" position="replace">
-                <field name="duration" optional="hide"/>
-            </field>
-            <field name="workcenter_id" position="replace">
-                <field name="workcenter_id" optional="hide"/>
             </field>
             <field name="product_id" position="after">
                 <field name="equipment_id" optional="hide"/>
@@ -37,7 +30,7 @@
                 <field name="date_planned_start" string="计划开始日期" optional="show"/>
             </xpath>
             <xpath expr="//field[@name='date_planned_finished']" position="replace">
-                <field name="date_planned_finished" string="计划结束日期" optional="hide"/>
+                <field name="date_planned_finished" string="计划结束日期" optional="show"/>
             </xpath>
             <xpath expr="//button[@name='button_start']" position="attributes">
                 <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',
@@ -124,7 +117,6 @@
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
-                <field name='is_send_program_again' invisible="1"/>
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
@@ -159,12 +151,7 @@
                 <!--                         groups="sf_base.group_sf_mrp_user" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
                 <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
-                        attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
+                        attrs="{'invisible': ['|',('routing_type','!=','装夹预调'),('is_delivery','=',True)]}"/>
-                <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
-                        confirm="是否确认重新下发NC程序？"
-                        groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"
-                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',
-                                                                                                   'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
@@ -216,18 +203,18 @@
                     <field name="processing_panel" readonly="1"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="equipment_id"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="production_line_id"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="production_line_state"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
-                    <!--                     <field name="functional_fixture_id" -->
+                    <field name="functional_fixture_id"
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <!--                     <field name="functional_fixture_code" force_save="1" -->
+                    <field name="functional_fixture_code" force_save="1"
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <!--                     <field name="functional_fixture_type_id" -->
+                    <field name="functional_fixture_type_id"
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                    <field name="rfid_code" cache="True"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                 </group>
@@ -294,26 +281,20 @@
                         <!--                        </group>-->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
-                        </group>
-                    </group>
-                    <group>
-                        <group>
                             <field name="tray_product_id" readonly="1" string="名称"/>
                             <field name="tray_brand_id" readonly="1" string="品牌"/>
-                        </group>
-                        <group>
                             <field name="tray_type_id" readonly="1" string="类型"/>
                             <field name="tray_model_id" readonly="1" string="型号"/>
                         </group>
                     </group>
-                    <group string="加工图纸">
-                        <!--                         隐藏加工图纸字段名 -->
-                        <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
-                    </group>
                     <group string="预调程序信息">
                         <field name="preset_program_information" colspan="2" nolabel="1"
                                placeholder="如有预调程序信息请在此处输入....."/>
                     </group>
+                    <group string="加工图纸">
+                        <!--                         隐藏加工图纸字段名 -->
+                        <field name="processing_drawing" widget="pdf_viewer" string=""/>
+                    </group>
                 </page>
                 <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
 
@@ -496,13 +477,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="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>
-                        <!--                        <field name="is_fetchcnc"-->
+                        <field name="is_fetchcnc"
-                        <!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
+                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>
-                        <!--                        <field name="reason"-->
+                        <field name="reason"
-                        <!--                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
+                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>
-                        <!--                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
+                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>
-                        <!--                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
+                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>
                     </group>
@@ -515,11 +496,11 @@
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
+                    <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id">
-                           readonly="1">
+                        <tree decoration-success="button_state" decoration-bf="button_state">
-                        <tree>
                             <field name="sequence_number"/>
                             <field name="program_name"/>
+                            <field name="cnc_id" string="文件"/>
                             <field name="cutting_tool_name"/>
                             <field name="cutting_tool_no"/>
                             <field name="processing_type"/>
@@ -529,10 +510,8 @@
                             <field name="cutting_tool_extension_length"/>
                             <field name="cutting_tool_handle_type"/>
                             <field name="estimated_processing_time"/>
-                            <field name="program_path"/>
-                            <field name="program_create_date"/>
                             <field name="remark"/>
-                            <!--                            <field name="button_state" invisible="1"/>-->
+                            <field name="button_state" invisible="1"/>
                         </tree>
                     </field>
                     <group>
@@ -540,12 +519,20 @@
                     </group>
                 </page>
                 <page string="CMM程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
+                    <field name="cmm_ids" widget="one2many" string="CMM程序">
                         <tree>
                             <field name="sequence_number"/>
                             <field name="program_name"/>
-                            <field name="program_path"/>
+                            <field name="cmm_id" string="文件"/>
-                            <field name="program_create_date"/>
+                            <field name="cutting_tool_name"/>
+                            <field name="cutting_tool_no"/>
+                            <field name="processing_type"/>
+                            <field name="margin_x_y"/>
+                            <field name="margin_z"/>
+                            <field name="depth_of_processing_z"/>
+                            <field name="cutting_tool_extension_length"/>
+                            <field name="cutting_tool_handle_type"/>
+                            <field name="estimated_processing_time"/>
                             <field name="remark"/>
                         </tree>
                     </field>
@@ -575,9 +562,9 @@
                 </div>
             </xpath>
             <xpath expr="//form//sheet//group//group//div[3]" position="after">
-                <field name="is_ok" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
+                <field name="is_ok"/>
-                <field name="processing_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
+                <field name="processing_user_id"/>
-                <field name="inspection_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
+                <field name="inspection_user_id"/>
                 <field name="save_name" widget="CopyClipboardChar"
                        attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
                 <label for="material_length" string="物料尺寸"/>
@@ -592,24 +579,10 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
-                <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
-                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
         </field>
     </record>
 
-    <record id="workcenter_form_workorder_search" model="ir.ui.view">
-        <field name="name">custom.workorder.search</field>
-        <field name="model">mrp.workorder</field>
-        <field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
-        <field name="arch" type="xml">
-            <field name="product_id" position="after">
-                <field name="part_number" string="成品零件图号"/>
-            </field>
-        </field>
-    </record>
-
     <record id="mrp_workorder_action_schedule" model="ir.actions.act_window">
         <field name="name">工单</field>
         <field name="type">ir.actions.act_window</field>

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='name']" position="after">
+            <xpath expr="//field[@name='create_date']" position="after">
-                <field name="rfid"/>
+                <field name="rfid" invisible="1"/>
             </xpath>
         </field>
     </record>

sf_mrs_connect/controllers/controllers.py

@@ -24,71 +24,82 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
-            productions = request.env['mrp.production'].with_user(
+            is_delete_file = False
+            # 查询状态为进行中且类型为获取CNC加工程序的工单
+            cnc_production = request.env['mrp.production'].with_user(
+                request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'].split(',')[0])])
+            cnc_program = request.env['mrp.production'].with_user(
                 request.env.ref("base.user_admin")).search(
-                [('programming_no', '=', ret['programming_no'])])
+                [('programming_no', '=', cnc_production.programming_no), ('id', '!=', cnc_production.id)])
-            if productions:
+            if cnc_production.workorder_ids.filtered(lambda a: a.routing_type == 'CNC加工').cnc_ids:
+                is_delete_file = True
+                cnc_production.workorder_ids.filtered(
+                    lambda a1: a1.routing_type == 'CNC加工').cnc_ids.sudo().unlink()
+                request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(cnc_production)
+            if cnc_program.workorder_ids.filtered(lambda c: c.routing_type == 'CNC加工').cnc_ids:
+                cnc_program.workorder_ids.filtered(
+                    lambda c1: c1.routing_type == 'CNC加工').cnc_ids.sudo().unlink()
+                request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(cnc_program)
+            # cnc_program = request.env['mrp.production'].with_user(
+            #     request.env.ref("base.user_admin")).search([('programming_no', '=', cnc_production.programming_no)])
+            logging.info('制造订单号:%s' % cnc_production.name)
+            if cnc_production:
+                # if ret['glb_file']:
+                #     cnc_production.glb_file = base64.b64encode(ret['glb_file'])
                 # 拉取所有加工面的程序文件
-                for r in ret['processing_panel'].split(','):
+                if is_delete_file is True:
-                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', 'R')
                     files_r = os.listdir(program_path_tmp_r)
                     if files_r:
                         for file_name in files_r:
                             file_path = os.path.join(program_path_tmp_r, file_name)
                             os.remove(file_path)
-                download_state = request.env['sf.cnc.processing'].with_user(
+                for r in ret['processing_panel']:
-                    request.env.ref("base.user_admin")).download_file_tmp(
+                    download_state = request.env['sf.cnc.processing'].with_user(
-                    ret['folder_name'], r)
+                        request.env.ref("base.user_admin")).download_file_tmp(
-                if download_state == 0:
+                        ret['folder_name'], r)
-                    res['status'] = -2
+                    if download_state == 0:
-                    res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
+                        res['status'] = -2
-                    return json.JSONEncoder().encode(res)
+                        res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
-                for production in productions:
+                        return json.JSONEncoder().encode(res)
-                    if not production.workorder_ids:
+                logging.info('创建cnc工单')
-                        production.product_id.model_processing_panel = ret['processing_panel']
+                program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                        production._create_workorder(ret)
+                # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis"
-                    else:
+                files = os.listdir(program_path_tmp)
-                        for panel in ret['processing_panel'].split(','):
+                cnc_processing_arr = []
-                            # 查询状态为进行中且工序类型为CNC加工的工单
+                for f in files:
-                            cnc_workorder = production.workorder_ids.filtered(
+                    program_path = os.path.join(program_path_tmp, f)
-                                lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
+                    logging.info('cnc程序路径 :%s' % program_path)
-                                                                                             'cancel'] and ac.processing_panel == panel)
+                    if f.endswith(".doc"):
-                            if cnc_workorder:
+                        # 插入cmm程序数据
-                                if cnc_workorder.cnc_ids:
+                        cmm_program = request.env['sf.cmm.program'].with_user(
-                                    cnc_workorder.cmm_ids.sudo().unlink()
+                            request.env.ref("base.user_admin")).cmm_program_create(ret, program_path, program_path_tmp)
-                                    cnc_workorder.cnc_ids.sudo().unlink()
+                    cnc_processing = request.env['sf.cnc.processing'].with_user(
-                                    request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
+                        request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path,
-                                        production)
+                                                                                  program_path_tmp)
-                                # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                    logging.info('cnc_processing111:%s' % cnc_processing)
-                                #                                       panel)
+                    if cnc_processing:
-                                program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                        cnc_processing_arr.append(cnc_processing._json_cnc_processing(cnc_processing))
-                                logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
+                if (cnc_program and cnc_processing_arr) or (not cnc_program and cnc_processing_arr):
-                                files_panel = os.listdir(program_path_tmp_panel)
+                    cnc_production.workorder_ids.filtered(lambda g: g.routing_type == '装夹预调').write(
-                                if files_panel:
+                        {'processing_drawing': cnc_production.workorder_ids.filtered(
-                                    for file in files_panel:
+                            lambda g1: g1.routing_type == 'CNC加工').cnc_worksheet})
-                                        file_extension = os.path.splitext(file)[1]
+                    if cnc_program and cnc_processing_arr:
-                                        logging.info('file_extension:%s' % file_extension)
+                        cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'})
-                                        if file_extension.lower() == '.pdf':
+                        cnc_program.workorder_ids.filtered(lambda d: d.routing_type == '装夹预调').write(
-                                            panel_file_path = os.path.join(program_path_tmp_panel, file)
+                            {'processing_drawing': cnc_production.workorder_ids.filtered(
-                                            logging.info('panel_file_path:%s' % panel_file_path)
+                                lambda d1: d1.routing_type == 'CNC加工').cnc_worksheet})
-                                cnc_workorder.write(
+                        cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write(
-                                    {'is_send_program_again': False,
+                            {'cnc_ids': cnc_processing_arr, 'cnc_worksheet': cnc_production.workorder_ids.filtered(
-                                     'cnc_ids': cnc_workorder.cnc_ids.sudo()._json_cnc_processing(panel, ret),
+                                lambda b1: b1.routing_type == 'CNC加工').cnc_worksheet})
-                                     'cmm_ids': cnc_workorder.cmm_ids.sudo()._json_cmm_program(panel, ret),
+                        cnc_program |= cnc_production
-                                     'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                    if not cnc_program and cnc_processing_arr:
-                                pre_workorder = production.workorder_ids.filtered(
+                        cnc_program = cnc_production
-                                    lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
+                    cnc_program_ids = [item.id for item in cnc_program]
-                                                                                                  'cancel'] and ap.processing_panel == panel)
+                    workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                                if pre_workorder:
+                        [('production_id', 'in', cnc_program_ids)])
-                                    pre_workorder.write(
+                    if workpiece_delivery:
-                                        {'is_send_program_again': False,
+                        workpiece_delivery.write({'is_cnc_program_down': True})
-                                         'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
-                productions.write({'programming_state': '已编程', 'work_state': '已编程'})
-                cnc_program_ids = [item.id for item in productions]
-                workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                    [('production_id', 'in', cnc_program_ids)])
-                if workpiece_delivery:
-                    workpiece_delivery.write({'is_cnc_program_down': True})
                 return json.JSONEncoder().encode(res)
             else:
                 res = {'status': 0, 'message': '该制造订单暂未开始'}

sf_plan/models/custom_plan.py

@@ -19,7 +19,7 @@ class sf_production_plan(models.Model):
         ('done', '已排程'),
         ('processing', '加工中'),
         ('finished', '已完成')
-    ], string='状态', tracking=True)
+    ], string='工单状态', tracking=True)
 
     state_order = fields.Integer(compute='_compute_state_order', store=True)
 
@@ -36,7 +36,7 @@ class sf_production_plan(models.Model):
 
     _order = 'state_order asc, write_date desc'
 
-    name = fields.Char(string='制造订单')
+    name = fields.Char(string='工单编号')
     active = fields.Boolean(string='已归档', default=True)
     # selected = fields.Boolean(default=False)
     # order_number = fields.Char(string='订单号')
@@ -52,7 +52,7 @@ class sf_production_plan(models.Model):
     schedule_setting = fields.Selection([
         ('reverse', '倒排'), ('positive', '顺排')], string='排程设置', default='reverse')
     product_id = fields.Many2one('product.product', '关联产品')
-    origin = fields.Char(string='销售订单')
+    origin = fields.Char(string='订单号')
     # # 加工时长
     # process_time = fields.Float(string='加工时长', digits=(16, 2))
     # 实际加工时长、实际开始时间、实际结束时间
@@ -200,23 +200,22 @@ class sf_production_plan(models.Model):
                 raise ValidationError("未选择生产线")
             else:
                 workorder_id_list = record.production_id.workorder_ids.ids
-                if record.production_id:
+                if record.production_id.workorder_ids:
-                    if record.production_id.workorder_ids:
+                    for item in record.production_id.workorder_ids:
-                        for item in record.production_id.workorder_ids:
+                        if item.name == 'CNC加工':
-                            if item.name == 'CNC加工':
+                            item.date_planned_finished = datetime.now() + timedelta(days=100)
-                                item.date_planned_finished = datetime.now() + timedelta(days=100)
+                            # item.date_planned_start = record.date_planned_start
-                                # item.date_planned_start = record.date_planned_start
+                            item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now()
-                                item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now()
+                            record.sudo().production_id.plan_start_processing_time = item.date_planned_start
-                                record.sudo().production_id.plan_start_processing_time = item.date_planned_start
+                            item.date_planned_finished = item.date_planned_start + timedelta(
-                                item.date_planned_finished = item.date_planned_start + timedelta(
+                                minutes=record.env['mrp.routing.workcenter'].sudo().search(
-                                    minutes=record.env['mrp.routing.workcenter'].sudo().search(
+                                    [('name', '=', 'CNC加工')]).time_cycle)
-                                        [('name', '=', 'CNC加工')]).time_cycle)
+                            item.duration_expected = record.env['mrp.routing.workcenter'].sudo().search(
-                                item.duration_expected = record.env['mrp.routing.workcenter'].sudo().search(
+                                [('name', '=', 'CNC加工')]).time_cycle
-                                    [('name', '=', 'CNC加工')]).time_cycle
+                            record.calculate_plan_time_before(item, workorder_id_list)
-                                record.calculate_plan_time_before(item, workorder_id_list)
+                            record.calculate_plan_time_after(item, workorder_id_list)
-                                record.calculate_plan_time_after(item, workorder_id_list)
+                            record.date_planned_start, record.date_planned_finished = \
-                                record.date_planned_start, record.date_planned_finished = \
+                                item.date_planned_start, item.date_planned_finished
-                                    item.date_planned_start, item.date_planned_finished
                     record.state = 'done'
                     # record.production_id.schedule_state = '已排'
                     record.sudo().production_id.schedule_state = '已排'
@@ -232,12 +231,12 @@ class sf_production_plan(models.Model):
                     # record.production_id.date_planned_start = record.date_planned_start
                     # record.production_id.date_planned_finished = record.date_planned_finished
                     record.sudo().production_id.production_line_id = record.production_line_id.id
-                    if record.production_id.workorder_ids:
+                    record.sudo().production_id.workorder_ids.filtered(
-                        record.sudo().production_id.workorder_ids.filtered(
+                        lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
-                            lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
+                        {'production_line_id': record.production_line_id.id,
-                            {'production_line_id': record.production_line_id.id,
+                         'plan_start_processing_time': record.date_planned_start})
-                             'plan_start_processing_time': record.date_planned_start})
+                else:
-
+                    raise ValidationError("未找到工单")
                     # record.date_planned_finished = record.date_planned_start + timedelta(days=3)
                     # record.state = 'done'
         return {

sf_plan/views/view.xml

@@ -17,18 +17,18 @@
                            decoration-danger="state == 'finished'"/>
                     <field name="name"/>
                     <field name="origin"/>
-                    <field name="order_deadline" widget="date"/>
+                    <field name="order_deadline"/>
                     <field name="product_qty"/>
                     <field name="production_line_id"/>
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
-                    <field name="actual_start_time" optional='hide'/>
+                    <field name="actual_start_time"/>
-                    <field name="actual_end_time" optional='hide'/>
+                    <field name="actual_end_time"/>
-                    <field name="actual_process_time" optional='hide'/>
+                    <field name="actual_process_time"/>
-                    <field name="schedule_setting" optional='hide'/>
+                    <field name="schedule_setting"/>
-<!--                     <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" -->
+                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object"
-<!--                             attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}" -->
+                            attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}"
-<!--                             groups="sf_base.group_plan_dispatch"/> -->
+                            groups="sf_base.group_plan_dispatch"/>
                     <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object"
                             attrs="{'invisible': ['|', ('state', '!=', 'done'), ('actual_start_time', '!=', False)]}"
                             groups="sf_base.group_plan_dispatch"/>
@@ -68,7 +68,7 @@
                                 <field name="product_id"/>
                                 <field name="origin"/>
                                 <field name="product_qty"/>
-                                <field name="order_deadline" widget="date"/>
+                                <field name="order_deadline"/>
 <!--                                 <field name="process_time"/> -->
                                 <field name="schedule_setting"/>
                                 <field name="production_line_id" domain="[('name', 'ilike', 'CNC')]"/>
@@ -152,27 +152,16 @@
             <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
                 <search string="订单计划">
-
                     <!-- Your other filters go here -->
-<!--                     <filter name="archived" string="已归档" domain="[('active','=',False)]"/> -->
+                    <filter name="archived" string="已归档" domain="[('active','=',False)]"/>
-<!--                     <filter name="not archived" string="未归档" domain="[('active','=',True)]"/> -->
+                    <filter name="not archived" string="未归档" domain="[('active','=',True)]"/>
                     <field name="name"/>
                     <field name="product_qty"/>
+                    <field name="date_planned_start"/>
+                    <field name="date_planned_finished"/>
                     <field name="state"/>
-                    <filter string="待排程" name="draft" domain="[('state','=','draft')]"/>
+                    <searchpanel class="account_root">
-                    <filter string="已排程" name="done" domain="[('state','=','done')]"/>
+                        <field name="state" icon="fa-filter"/>
-                    <filter string="加工中" name="processing" domain="[('state','=','processing')]"/>
-                    <filter string="已完成" name="finished" domain="[('state','=','finished')]"/>
-                    <group expand="0" string="Group By">
-                        <filter name="group_by_state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
-                    </group>
-                    <group expand="0" string="Group By">
-                        <filter name="group_by_production_line_id" string="生产线" domain="[]" context="{'group_by': 'production_line_id'}"/>
-                    </group>
-                    <searchpanel>
-<!--                         <field name="state" icon="fa-filter"/> -->
-                        <field name="production_line_id" select="multi" string="生产线" icon="fa-building" enable_counters="1"/>
-                        <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
                 </search>
             </field>
@@ -199,41 +188,30 @@
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
                     <field name="state"/>
-                    <field name="origin"/>
-                    <field name="order_deadline"/>
-                    <field name="product_id"/>
                     <templates>
                         <div t-name="gantt-popover" class="container-fluid">
                             <div class="row g-0">
                                 <div class="col">
                                     <ul class="ps-1 mb-0 list-unstyled">
                                         <li>
-                                            <strong>销售订单号:</strong>
+                                            <strong>开始时间:</strong>
-                                            <t t-out="origin"/>
+                                            <t t-out="userTimezoneStartDate.format('L LTS')"/>
                                         </li>
                                         <li>
-                                            <strong>制造订单号:</strong>
+                                            <strong>结束时间:</strong>
+                                            <t t-out="userTimezoneStopDate.format('L LTS')"/>
+                                        </li>
+                                        <li>
+                                            <strong>名称:</strong>
                                             <t t-out="name"/>
                                         </li>
-                                        <li>
-                                            <strong>订单交期:</strong>
-                                            <t t-out="order_deadline"/>
-                                        </li>
-                                        <li>
-                                            <strong>产品名称:</strong>
-                                            <t t-out="product_id"/>
-                                        </li>
                                         <li>
                                             <strong>数量:</strong>
                                             <t t-out="product_qty"/>
                                         </li>
                                         <li>
-                                            <strong>计划开始时间:</strong>
+                                            <strong>状态:</strong>
-                                            <t t-out="userTimezoneStartDate.format('L LTS')"/>
+                                            <t t-out="state"/>
-                                        </li>
-                                        <li>
-                                            <strong>计划结束时间:</strong>
-                                            <t t-out="userTimezoneStopDate.format('L LTS')"/>
                                         </li>
                                     </ul>
                                 </div>
@@ -268,7 +246,6 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.plan</field>
             <field name="view_mode">tree,gantt,form</field>
-            <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field>
         </record>
 
         <menuitem

sf_sale/models/sale_order.py

@@ -215,17 +215,6 @@ 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'

sf_tool_management/__manifest__.py

@@ -22,7 +22,6 @@
         '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,7 +109,6 @@ 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]
@@ -121,7 +120,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") * 2,  # 直径
+                'after_assembly_functional_tool_diameter': float(data_list[2] or "0"),  # 直径
                 'after_assembly_knife_tip_r_angle': float(data_list[3] or "0")  # R角
             })
         except Exception as e:

sf_tool_management/models/__init__.py

@@ -7,5 +7,4 @@ 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

@@ -581,15 +581,6 @@ class FunctionalToolAssembly(models.Model):
 
     active = fields.Boolean(string='已归档', default=True)
 
-    def action_open_reference1(self):
-        self.ensure_one()
-        return {
-            'res_model': self._name,
-            'type': 'ir.actions.act_window',
-            'views': [[False, "form"]],
-            'res_id': self.id,
-        }
-
     def put_start_preset(self):
         self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
         self.write({
@@ -759,8 +750,7 @@ class FunctionalToolDismantle(models.Model):
         return 'GNDJ-CJD-%s-%s' % (datetime, num)
 
     functional_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', required=True,
-                                         domain=[('functional_tool_status', '!=', '已拆除'),
+                                         domain=[('functional_tool_status', '!=', '已拆除')])
-                                                 ('current_location', '=', '刀具房')])
     tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
                                    compute='_compute_functional_tool_num')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', compute='_compute_functional_tool_num', store=True)
@@ -936,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_ids = self.env['stock.location'].search([('name', 'in', ('Scrap', '报废'))])
+        location_dest_scrap = self.env['stock.location'].search([('name', '=', 'Scrap')])
         if self.handle_rfid:
             lot = self.env['stock.lot'].sudo().search([('rfid', '=', self.handle_rfid)])
             if not lot:
@@ -944,33 +934,30 @@ 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_ids[-1], functional_tool_assembly.id, code,
+                lot.create_stock_quant(location, location_dest_scrap, 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_ids[-1], code)
+                                                               location_dest_scrap, code)
             elif self.blade_product_id:
-                self.blade_product_id.dismantle_stock_moves(False, self.blade_lot_id, location,
+                self.blade_product_id.dismantle_stock_moves(False, self.blade_lot_id, location, location_dest_scrap,
-                                                            location_dest_scrap_ids[-1], code)
+                                                            code)
                 if self.bar_product_id:
-                    self.bar_product_id.dismantle_stock_moves(False, self.bar_lot_id, location,
+                    self.bar_product_id.dismantle_stock_moves(False, self.bar_lot_id, location, location_dest_scrap,
-                                                              location_dest_scrap_ids[-1], code)
+                                                              code)
                 elif self.pad_product_id:
-                    self.pad_product_id.dismantle_stock_moves(False, self.pad_lot_id, location,
+                    self.pad_product_id.dismantle_stock_moves(False, self.pad_lot_id, location, location_dest_scrap,
-                                                              location_dest_scrap_ids[-1], code)
+                                                              code)
             if self.chuck_product_id:
-                self.chuck_product_id.dismantle_stock_moves(False, self.chuck_lot_id, location,
+                self.chuck_product_id.dismantle_stock_moves(False, self.chuck_lot_id, location, location_dest_scrap,
-                                                            location_dest_scrap_ids[-1], code)
+                                                            code)
         # ===========功能刀具[磨削]拆解==============
         # elif self.dismantle_cause in ['刀具需磨削']:
         #     location_dest = self.env['stock.location'].search([('name', '=', '磨削房')])
@@ -1038,7 +1025,7 @@ class ProductProduct(models.Model):
             'product_id': self.id,
             'lot_id': lot_id.id,
             'move_id': stock_move_id.id,
-            'destination_location_id': shelf_location_id.id if shelf_location_id else False,
+            'destination_location_id': shelf_location_id.id,
             'install_tool_time': fields.Datetime.now(),
             'qty_done': 1.0,
             'state': 'done',

sf_tool_management/models/functional_tool.py

@@ -34,17 +34,15 @@ class FunctionalCuttingToolEntity(models.Model):
     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='刀具房数量', compute='_compute_num', store=True)
+    tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
-    line_edge_knife_library_num = fields.Integer(string='线边刀库数量', compute='_compute_num', store=True)
+    line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
-    machine_knife_library_num = fields.Integer(string='机内刀库数量', compute='_compute_num', store=True)
+    machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=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='当前位置', compute='_compute_current_location_id',
+    current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True)
-                                          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)
@@ -53,113 +51,44 @@ class FunctionalCuttingToolEntity(models.Model):
     safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
                                         string='功能刀具安全库存', readonly=True)
 
-    @api.depends('barcode_id.quant_ids', 'functional_tool_status', 'current_shelf_location_id')
+    @api.depends('barcode_id.quant_ids', 'functional_tool_status')
     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
-            else:
+                record.tool_room_num = 0
-                if record.barcode_id.quant_ids:
+                record.line_edge_knife_library_num = 0
-                    for quant_id in record.barcode_id.quant_ids:
+                record.machine_knife_library_num = 0
-                        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
 
-    @api.depends('current_location', 'functional_tool_status')
+    def get_location_num(self):
-    def _compute_num(self):
         """
         计算库存位置数量
         """
         for obj in self:
-            if obj.functional_tool_status == '已拆除':
+            if obj.current_location_id:
                 obj.tool_room_num = 0
                 obj.line_edge_knife_library_num = 0
                 obj.machine_knife_library_num = 0
-            else:
+                if obj.current_location in ['刀具房']:
-                if obj.current_location_id:
+                    obj.tool_room_num = 1
-                    obj.tool_room_num = 0
+                elif "线边刀库" in obj.current_location:
-                    obj.line_edge_knife_library_num = 0
+                    obj.line_edge_knife_library_num = 1
-                    obj.machine_knife_library_num = 0
+                elif "机内刀库" in obj.current_location:
-                    if obj.current_location in ['刀具房']:
+                    obj.machine_knife_library_num = 1
-                        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):
@@ -262,14 +191,12 @@ class FunctionalCuttingToolEntity(models.Model):
         机床当前刀库实时信息接口，功能刀具出库
         """
         # 获取位置对象
+        location_inventory_id = self.current_location_id
         stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
-        self.create_stock_move(stock_location_id, False)
+        self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
-        self.current_location_id = stock_location_id.id
+                                           self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id,
-        self.current_shelf_location_id = False
+                                           self.functional_tool_name_id.tool_groups_id)
-        # 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):
@@ -377,7 +304,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("刀具组装时间")
+    install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now())
     code = fields.Char('编码')
     rfid = fields.Char('Rfid')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组')
@@ -387,22 +314,6 @@ class StockMoveLine(models.Model):
         names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
         return categories.browse(names)
 
-    def action_open_reference1(self):
-        self.ensure_one()
-        if self.functional_tool_name_id:
-            action = self.functional_tool_name_id.action_open_reference1()
-            return action
-        elif self.move_id:
-            action = self.move_id.action_open_reference()
-            if action['res_model'] != 'stock.move':
-                return action
-        return {
-            'res_model': self._name,
-            'type': 'ir.actions.act_window',
-            'views': [[False, "form"]],
-            'res_id': self.id,
-        }
-
 
 class RealTimeDistributionOfFunctionalTools(models.Model):
     _name = 'sf.real.time.distribution.of.functional.tools'
@@ -416,10 +327,10 @@ 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='刀具房数量', compute='_compute_stock_num', store=True)
+    tool_stock_num = fields.Integer(string='刀具房数量')
-    side_shelf_num = fields.Integer(string='线边刀库数量', compute='_compute_stock_num', store=True)
+    side_shelf_num = fields.Integer(string='线边刀库数量')
-    on_tool_stock_num = fields.Integer(string='机内刀库数量', compute='_compute_stock_num', store=True)
+    on_tool_stock_num = fields.Integer(string='机内刀库数量')
-    tool_stock_total = fields.Integer(string='当前库存量', compute='_compute_tool_stock_total', store=True)
+    tool_stock_total = fields.Integer(string='当前库存量', readonly=True)
     min_stock_num = fields.Integer('最低库存量', tracking=True)
     max_stock_num = fields.Integer('最高库存量', tracking=True)
     batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num',
@@ -492,6 +403,10 @@ 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)
 
@@ -510,38 +425,6 @@ 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):
         """
         创建功能刀具组装单
@@ -562,6 +445,27 @@ 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

@@ -80,7 +80,7 @@ class StockLot(models.Model):
         headers = Common.get_headers(self, token, sf_secret_key)
         str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
         product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '刀具')]).ids
-        objs_all = self.env['stock.lot'].search([('product_id', 'in', product_ids)])
+        objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('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):
@@ -90,7 +90,6 @@ 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,
@@ -106,7 +105,7 @@ class StockLot(models.Model):
                 logging.info("没有刀具物料序列号信息")
         except Exception as e:
             logging.info("刀具物料序列号同步失败:%s" % e)
-            
+
 
 class ToolMaterial(models.Model):
     _inherit = 'sf.tool.material.search'
@@ -164,6 +163,8 @@ class ToolMaterial(models.Model):
             logging.info("刀具物料同步失败:%s" % e)
 
 
+
+
 class FunctionalCuttingToolEntity(models.Model):
     _inherit = 'sf.functional.cutting.tool.entity'
     _description = '功能刀具列表注册'
@@ -234,7 +235,8 @@ 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)
+                        'suitable_coolant_names': get_suitable_coolant_names(item),
+                        'active': item.active,
                     }
                     functional_tool_list.append(val)
                 kw = json.dumps(functional_tool_list, ensure_ascii=False)
@@ -249,6 +251,8 @@ class FunctionalCuttingToolEntity(models.Model):
             logging.info("功能刀具同步失败:%s" % e)
 
 
+
+
 class FunctionalToolWarning(models.Model):
     _inherit = 'sf.functional.tool.warning'
     _description = '功能刀具预警注册'

sf_tool_management/models/maintenance_equipment.py

@@ -44,79 +44,71 @@ class SfMaintenanceEquipment(models.Model):
 
     # ==========机床当前刀库实时信息接口==========
     def register_equipment_tool(self):
-        try:
+        config = self.env['res.config.settings'].get_values()
-            config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
-            # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+        headers = {'Authorization': config['center_control_Authorization']}
-            headers = {'Authorization': config['center_control_Authorization']}
+        crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
-            crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
+        params = {"DeviceId": self.name}
-            params = {"DeviceId": self.name}
+        r = requests.get(crea_url, params=params, headers=headers)
-            r = requests.get(crea_url, params=params, headers=headers)
+        ret = r.json()
-            ret = r.json()
+        logging.info('register_equipment_tool:%s' % ret)
-            logging.info('register_equipment_tool:%s' % ret)
+        datas = ret['Datas']
-            datas = ret['Datas']
+        self.write_maintenance_equipment_tool(datas)
-            self.write_maintenance_equipment_tool(datas)
+        if ret['Succeed']:
-            if ret['Succeed']:
+            return "机床当前刀库实时信息指令发送成功"
-                return "机床当前刀库实时信息指令发送成功"
+        else:
-            else:
+            raise ValidationError("机床当前刀库实时信息指令发送失败")
-                raise ValidationError("机床当前刀库实时信息指令发送失败")
-        except Exception as e:
-            logging.info("register_equipment_tool()捕获错误信息:%s" % e)
 
     def write_maintenance_equipment_tool(self, datas):
-        try:
+        if datas:
-            if datas:
+            # 清除设备机床刀位的刀具信息
-                # 清除设备机床刀位的刀具信息
+            for obj in self.product_template_ids:
-                for obj in self.product_template_ids:
+                obj.write({
-                    obj.write({
+                    'functional_tool_name_id': False,
-                        'functional_tool_name_id': False,
+                    'tool_install_time': None
-                        'tool_install_time': None
+                })
-                    })
+            for data in datas:
-                for data in datas:
+                maintenance_equipment_id = self.search([('name', '=', data['DeviceId'])])
-                    maintenance_equipment_id = self.search([('name', '=', data['DeviceId'])])
+                if maintenance_equipment_id:
-                    if maintenance_equipment_id:
+                    tool_id = '%s%s' % (data['ToolId'][0:1], data['ToolId'][1:].zfill(2))
-                        tool_id = '%s%s' % (data['ToolId'][0:1], data['ToolId'][1:].zfill(2))
+                    equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
-                        equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
+                        [('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
-                            [('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
+                    functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
-                        functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                        [('rfid', '=', data['RfidCode'])])
-                            [('rfid', '=', data['RfidCode'])])
+                    if functional_tool_id:
-                        if functional_tool_id:
+                        # 查询该功能刀具是否已经装在机床内其他位置，如果是就删除
-                            if len(functional_tool_id) > 1:
+                        equipment_tools = self.env['maintenance.equipment.tool'].sudo().search(
-                                functional_tool_id = functional_tool_id[-1]
+                            [('functional_tool_name_id', '=', functional_tool_id.id), ('code', '!=', tool_id)])
-                            # 查询该功能刀具是否已经装在机床内其他位置，如果是就删除
+                        if equipment_tools:
-                            equipment_tools = self.env['maintenance.equipment.tool'].sudo().search(
+                            for item in equipment_tools:
-                                [('functional_tool_name_id', '=', functional_tool_id.id), ('code', '!=', tool_id)])
+                                item.write({
-                            if equipment_tools:
+                                    'functional_tool_name_id': False,
-                                for item in equipment_tools:
+                                    'tool_install_time': None
-                                    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('获取的【%s】设备不存在！！！' % data['DeviceId'])
+                        logging.info('Rfid为【%s】的功能刀具不存在！' % data['RfidCode'])
-            else:
+                    time = None
-                logging.info('没有获取到【%s】设备的刀具库信息！！！' % self.name)
+                    if data['AddDatetime']:
-        except Exception as e:
+                        datatime = str(data['AddDatetime'])
-            logging.info("write_maintenance_equipment_tool()捕获错误信息:%s" % e)
+                        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('没有获取到刀具库信息！！！')
 
 
 class StockLot(models.Model):
@@ -142,6 +134,9 @@ 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

@@ -1,23 +0,0 @@
-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/views/functional_tool_views.xml

@@ -29,7 +29,6 @@
                     <field name="current_location" string="当前位置"/>
 
                     <field name="current_location_id" invisible="1"/>
-                    <field name="current_location" optional="hide"/>
                     <field name="sf_cutting_tool_type_id" invisible="True"/>
                 </tree>
             </field>
@@ -174,10 +173,7 @@
                                         <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>
@@ -193,7 +189,6 @@
             <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"/>
@@ -209,8 +204,8 @@
                             domain="[('functional_tool_status', '!=', '已拆除')]"/>
                     <filter string="已拆除" name="state_removed" domain="[('functional_tool_status', '=', '已拆除')]"/>
                     <searchpanel>
-                        <field name="current_location" icon="fa-building" enable_counters="1"/>
                         <field name="functional_tool_status" icon="fa-building" enable_counters="1"/>
+                        <field name="current_location" icon="fa-building" enable_counters="1"/>
                         <field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
                     <group expand="0">
@@ -477,8 +472,7 @@
             <field name="name">功能刀具出入库记录</field>
             <field name="model">stock.move.line</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具出入库记录" create="0" edit="0" delete="0" default_order="id desc"
+                <tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
-                      action="action_open_reference1" type="object">
                     <field name="reference" string="单据号"/>
                     <field name="lot_id" invisible="1"/>
                     <field name="rfid"/>
@@ -488,9 +482,7 @@
                     <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"/>
@@ -505,20 +497,21 @@
             <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="reference"/>
+                    <field name="install_tool_time"/>
-                    <field name="lot_id"/>
+                    <field name="location_id"/>
+                    <field name="location_dest_id"/>
+                    <field name="date"/>
+                    <field name="qty_done"/>
+                    <field name="functional_tool_type_id" invisible="True"/>
                     <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>
@@ -532,7 +525,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">[('rfid', '!=', ''),('functional_tool_name', '!=', '')]</field>
+            <field name="domain">[('functional_tool_name_id', '!=', False)]</field>
         </record>
 
     </data>

sf_tool_management/views/stock.xml

@@ -1,14 +0,0 @@
-<?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_material_search.xml

@@ -62,7 +62,6 @@
                                     <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_ids = self.env['stock.location'].search([('name', 'in', ('Production', '生产'))])
+        location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
         stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
-        stock_lot.create_stock_quant(location_inventory_ids[-1], stock_location_id, functional_tool_assembly.id,
+        stock_lot.create_stock_quant(location_inventory_id, 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

@@ -416,19 +416,19 @@ class ShelfLocation(models.Model):
         host = printer_config.printer_id.ip_address
         port = printer_config.printer_id.port
         self.print_qr_code(barcode, host, port)
-        # 获取当前wizard的视图ID或其他标识信息
+        # # 获取当前wizard的视图ID或其他标识信息
-        view_id = self.env.context.get('view_id')
+        # view_id = self.env.context.get('view_id')
-        # 构造返回wizard页面的action字典
+        # # 构造返回wizard页面的action字典
-        action = {
+        # action = {
-            'type': 'ir.actions.act_window',
+        #     'type': 'ir.actions.act_window',
-            'name': '返回 Wizard',
+        #     'name': '返回 Wizard',
-            'res_model': 'sf.shelf',  # 替换为你的wizard模型名称
+        #     'res_model': 'sf.shelf',  # 替换为你的wizard模型名称
-            'view_mode': 'form',
+        #     'view_mode': 'form',
-            'view_id': view_id,  # 如果需要基于特定的视图返回
+        #     'view_id': view_id,  # 如果需要基于特定的视图返回
-            'target': 'new',  # 如果需要在新的窗口或标签页打开
+        #     'target': 'new',  # 如果需要在新的窗口或标签页打开
-            'res_id': self.shelf_id,  # 如果你想要返回当前记录的视图
+        #     'res_id': self.shelf_id,  # 如果你想要返回当前记录的视图
-        }
+        # }
-        return action
+        # return action
 
     # # 仓库类别（selection：库区、库位、货位）
     # location_type = fields.Selection([
@@ -1143,10 +1143,7 @@ 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 存在
-                lot_name = line.lot_name
+                qr_data = self.compute_lot_qr_code(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

@@ -95,34 +95,17 @@ 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 'Tool' in item['Postion']:
+                    if stock_lot_obj:
-                        tool = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                        location_id.product_sn_id = stock_lot_obj.id
-                            [('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:
-                        stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
+                        location_id.product_sn_id = False
-                        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: