Accept Merge Request #1286: (feature/流程用扫码完成 -> develop)

Merge Request: 扫码触发页面按钮，解除装夹起始站点根据下产线终点站点自动赋值

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1286

sf_manufacturing/__manifest__.py

@@ -45,6 +45,7 @@
             'sf_manufacturing/static/src/scss/kanban_change.scss',
             'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
             'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
+            'sf_manufacturing/static/src/js/custom_barcode_handlers.js',
         ]
 
     },

sf_manufacturing/models/agv_scheduling.py

@@ -265,3 +265,17 @@ class ResMrpWorkOrder(models.Model):
         'sf_agv_scheduling_mrp_workorder_ref',
         string='AGV调度',
         domain=[('state', '!=', '已取消')])
+
+    def get_down_product_agv_scheduling(self):
+        """
+            获取关联的制造订单下产线的agv任务
+        """
+        workorder_ids = self.production_id.workorder_ids
+        cnc_workorder = workorder_ids.filtered(
+            lambda w: w.routing_type == 'CNC加工' and w.state == 'done' and w.processing_panel == self.processing_panel
+        )
+        if cnc_workorder:
+            agv_schedulingss = cnc_workorder.agv_scheduling_ids
+            return agv_schedulingss.filtered(lambda a: a.state == '已配送' and a.agv_route_type == '下产线')
+        else:
+            return None

sf_manufacturing/models/mrp_workorder.py

@@ -1340,7 +1340,7 @@ class ResMrpWorkOrder(models.Model):
                     'name': 'button_delivery',
                     'type': 'object',
                     'string': '解除装夹',
-                    'class': 'btn-primary',
+                    'class': 'btn-primary jikimo_button_confirm',
                     # 'className': 'btn-primary',
                     'modifiers': '{"force_show": 1}'
                 })
@@ -1355,6 +1355,7 @@ class ResMrpWorkOrder(models.Model):
         workorder_ids = []
         delivery_type = '运送空料架'
         max_num = 4  # 最大配送数量
+        feeder_station_start_id = False
         if len(self) > max_num:
             raise UserError('仅限于拆卸1-4个制造订单，请重新选择')
         for item in self:
@@ -1363,6 +1364,10 @@ class ResMrpWorkOrder(models.Model):
 
             production_ids.append(item.production_id.id)
             workorder_ids.append(item.id)
+            if not feeder_station_start_id:
+                down_product_agv_scheduling = self.get_down_product_agv_scheduling()
+                if down_product_agv_scheduling:
+                    feeder_station_start_id = down_product_agv_scheduling.end_site_id.id
         return {
             'name': _('确认'),
             'type': 'ir.actions.act_window',
@@ -1375,7 +1380,8 @@ class ResMrpWorkOrder(models.Model):
                 'default_delivery_type': delivery_type,
                 'default_workorder_ids': [(6, 0, workorder_ids)],
                 'default_workcenter_id': self.env.context.get('default_workcenter_id'),
-                'default_confirm_button': '确认解除'
+                'default_confirm_button': '确认解除',
+                'default_feeder_station_start_id': feeder_station_start_id,
             }}
 
 

sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js

@@ -10,7 +10,7 @@ odoo.define('sf_manufacturing.action_dispatch_confirm', function (require) {
             title: "确认",
             $content: $('<div>').append("请确认是否仅配送" + params.workorder_count + "个工件？"),
             buttons: [
-                { text: "确认", classes: 'btn-primary', close: true, click: () => dispatchConfirmed(parent, params) },
+                { text: "确认", classes: 'btn-primary jikimo_button_confirm', close: true, click: () => dispatchConfirmed(parent, params) },
                 { text: "取消", close: true },
             ],
         });

sf_manufacturing/views/mrp_workorder_view.xml

@@ -659,9 +659,9 @@
         <field name="name">工件配送</field>
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
-            <tree string="工件配送" class="center" create="0" delete="0">
+            <tree string="工件配送" class="center" create="0" delete="0" js_class="remove_focus_list_view">
                 <header>
-                    <button name="button_delivery" type="object" string="工件配送" class="btn-primary" attrs="{'force_show':1}"/>
+                    <button name="button_delivery" type="object" string="工件配送" class="btn-primary jikimo_button_confirm" attrs="{'force_show':1}"/>
                 </header>
                 <field name="status" widget="badge"
                        decoration-success="status == '已配送'"

sf_manufacturing/wizard/workpiece_delivery_views.xml

@@ -4,7 +4,7 @@
         <field name="name">sf.workpiece.delivery.wizard.form.view</field>
         <field name="model">sf.workpiece.delivery.wizard</field>
         <field name="arch" type="xml">
-            <form js_class="remove_focus_view">
+            <form js_class="remove_focus_form_view">
                 <sheet>
                     <field name="delivery_ids" invisible="True"/>
                     <field name="workorder_ids" invisible="True"/>
@@ -18,8 +18,8 @@
                         <field name="workcenter_id" options="{'no_create': True}"/>
                     </group>
                     <footer>
-                        <button string="确认配送" name="dispatch_confirm" type="object" class="oe_highlight o_wizard_confirm_button" attrs="{'invisible': [('confirm_button', '!=', '确认配送')]}"/>
-                        <button string="确认解除" name="dispatch_confirm" type="object" class="oe_highlight o_wizard_confirm_button" attrs="{'invisible': [('confirm_button', '!=', '确认解除')]}"/>
+                        <button string="确认配送" name="dispatch_confirm" type="object" class="oe_highlight o_wizard_confirm_button jikimo_button_confirm" attrs="{'invisible': [('confirm_button', '!=', '确认配送')]}"/>
+                        <button string="确认解除" name="dispatch_confirm" type="object" class="oe_highlight o_wizard_confirm_button jikimo_button_confirm" attrs="{'invisible': [('confirm_button', '!=', '确认解除')]}"/>
                         <button string="取消" class="btn btn-secondary" special="cancel"/>
                     </footer>
                 </sheet>

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -180,6 +180,13 @@ class WorkpieceDeliveryWizard(models.TransientModel):
             self.feeder_station_destination_id = self.route_id.end_site_id.id
 
     def on_barcode_scanned(self, barcode):
+        # 判断barcode是否是数字
+        if not barcode.isdigit():
+            # 判断是否是AGV接驳站名称
+            agv_site = self.env['sf.agv.site'].search([('name', '=', barcode)])
+            if agv_site:
+                self.feeder_station_start_id = agv_site.id
+            return
         delivery_type = self.env.context.get('default_delivery_type')
         if delivery_type == '上产线':
             workorder = self.env['mrp.workorder'].search(
@@ -203,6 +210,13 @@ class WorkpieceDeliveryWizard(models.TransientModel):
             # 将对象添加到对应的同模型且是多对多类型里
             self.production_ids |= workorder.production_id
             self.workorder_ids |= workorder
+
+            if not self.feeder_station_start_id:
+                down_product_agv_scheduling = self.get_down_product_agv_scheduling()
+                if down_product_agv_scheduling:
+                    self.feeder_station_start_id = down_product_agv_scheduling.end_site_id.id
         else:
             raise UserError('该rfid码对应的工单不存在')
         return
+
+