From dbe8c95558ba306e0782b9034a3e3a0eaf8cbe26 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 16 Jun 2025 15:43:02 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/sf_production_demand_plan.py         |  1 +
 .../wizard/sf_demand_plan_print_wizard_view.xml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/sf_demand_plan/models/sf_production_demand_plan.py b/sf_demand_plan/models/sf_production_demand_plan.py
index ef11adcc..de2c1203 100644
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/sf_demand_plan/models/sf_production_demand_plan.py
@@ -323,6 +323,7 @@ class SfProductionDemandPlan(models.Model):
             'name': _("打印"),
             'domain': [('demand_plan_id', 'in', self.ids)],
             'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
+            'search_view_id': self.env.ref('sf_demand_plan.action_plan_print_search').id,
             'target': 'new',
         }
 
diff --git a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
index 311e3ae8..56b3c4fd 100644
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
@@ -14,4 +14,21 @@
             </tree>
         </field>
     </record>
+
+    <record id="action_plan_print_search" model="ir.ui.view">
+        <field name="name">sf.demand.plan.print.wizard.search</field>
+        <field name="model">sf.demand.plan.print.wizard</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="type"/>
+                <filter string="图纸" name="filter_type_1" domain="[('type', '=', '1')]"/>
+                <filter string="程序单" name="filter_type_2" domain="[('type', '=', '2')]"/>
+                <filter string="图纸、程序单" name="filter_type_all" domain="[('type', 'in', ('1','2'))]"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter name="group_by_type" string="类型" domain="[]" context="{'group_by': 'type'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file

From e29456bbf7a42553d3689e5e0ae2761c30649a41 Mon Sep 17 00:00:00 2001
From: hyyy <123@qq.com>
Date: Mon, 16 Jun 2025 17:25:52 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_demand_plan/__manifest__.py                |   1 +
 sf_demand_plan/static/src/js/print_demand.js  | 205 ++++++++++++++++++
 sf_demand_plan/static/src/scss/style.css      |  55 +++++
 .../sf_demand_plan_print_wizard_view.xml      |   6 +-
 4 files changed, 264 insertions(+), 3 deletions(-)
 create mode 100644 sf_demand_plan/static/src/js/print_demand.js

diff --git a/sf_demand_plan/__manifest__.py b/sf_demand_plan/__manifest__.py
index 932685e0..2a543f1a 100644
--- a/sf_demand_plan/__manifest__.py
+++ b/sf_demand_plan/__manifest__.py
@@ -23,6 +23,7 @@
         ],
         'web.assets_backend': [
             'sf_demand_plan/static/src/scss/style.css',
+            'sf_demand_plan/static/src/js/print_demand.js',
         ]
     },
     'license': 'LGPL-3',
diff --git a/sf_demand_plan/static/src/js/print_demand.js b/sf_demand_plan/static/src/js/print_demand.js
new file mode 100644
index 00000000..b1ecd7e7
--- /dev/null
+++ b/sf_demand_plan/static/src/js/print_demand.js
@@ -0,0 +1,205 @@
+odoo.define('sf_demand.print_demand', function (require) {
+    "use strict";
+    
+    var ListController = require('web.ListController');
+    var ListRenderer = require('web.ListRenderer');
+    var ListView = require('web.ListView');
+    var viewRegistry = require('web.view_registry');
+    var { url } = require("@web/core/utils/urls") 
+    
+    var CustomListRenderer = ListRenderer.extend({
+        _render: function () {
+            var self = this;
+            this.getParent()?.$buttons.hide()
+            return this._super.apply(this, arguments).then(function () {
+                // 添加图片预览容器到页面左侧
+                if (!$('.table-image-preview-container').length) {
+                    self.$el.parent().addClass('custom-table-image-container')
+                    self.$el.before(
+                        `<div class="custom-preview-container">
+                            <img class="table-image-preview-container" src="" /> 
+                            <iframe class="table-image-preview-container" src=""/>
+                        </div>`
+                    );
+                    self.$el.prepend(`
+                        <div class="print-button-container" style="margin-bottom:10px;">
+                            <button class="btn btn-primary o_print_custom">
+                                <i class="fa fa-print"></i> 打印
+                            </button>
+                            <button class="btn btn-secondary  o_cancel_custom">
+                               取消
+                            </button>
+                        </div>
+                    `);
+                }
+            });
+        },
+        
+        events: _.extend({}, ListRenderer.prototype.events, {
+            'click .o_data_row': '_onCustomRowClick',
+            'click .o_print_custom': '_onPrintClick',
+            'click .o_cancel_custom': '_onCancelClick'
+        }),
+        _onCancelClick() {
+            this.getParent()?.getParent()?.dialogs.closeAll()
+        },
+        _onCustomRowClick: async function (ev) {
+            var self = this;
+            var $row = $(ev.currentTarget);
+            var index = $row.index();
+            var data = this.state.data[index];
+            console.log(this, 'this', data);
+            if(data.fileData?.fileUrl) {
+
+            } else {
+                data.fileData = { }
+                if(data.res_id) {
+                    // 正确获取 ORM 服务的方式
+                    // var orm = this.getParent().getParent().env.services
+                    const key = data.data.type == 1 ? 'machining_drawings' : 'cnc_worksheet'
+                    const attachment = await this._rpc({
+                        model: 'ir.binary',
+                        method: 'attachment_info',
+                        args: [
+                            data.model,
+                            data.res_id,
+                            key
+                        ],
+                    })
+    
+                    if (attachment) {
+                        Object.assign(data.fileData, attachment)
+                        this._getTypeInfo(attachment.mimetype, data.fileData)
+                    }
+                    console.log(data, 'data', attachment);
+                    const fileUrl = this.getFileUrl(data.fileData.attachment_type, data, key)
+                    data.fileData.fileUrl = fileUrl
+                }
+            }
+            $('.table-image-preview-container').hide()
+            if(data.fileData.attachment_type == 'iframe') {
+                
+                $('iframe.table-image-preview-container').attr('src', decodeURIComponent(data.fileData.fileUrl) ).show()
+            } else {
+                $('img.table-image-preview-container').attr('src', data.fileData.fileUrl).show()
+            }
+        },
+        getSelectedIds: function() {
+            return this.state.data.map(_ => {
+                return _.data.id
+            })
+        },
+        _onPrintClick(e) {
+            console.log(e, 'asdsadadsadasdad', this);
+            var selectedIds = this.getSelectedIds();
+    
+            console.log(selectedIds);
+                    
+            this._rpc({
+                model: 'sf.demand.plan.print.wizard',
+                method: 'demand_plan_print',
+                kwargs: selectedIds,
+                // context: this.state.getContext()
+            }).then(function() {
+                self.do_notify("成功", "打印任务已发送到打印机");
+            }).catch(function(error) {
+                console.error("打印错误:", error);
+                self.do_warn("打印失败", error.data.message || "未知错误");
+            });
+            
+        },
+        getFileUrl(attachment_type, data, key) {
+            let fileUrl
+            switch (attachment_type) {
+                case 'image':
+                        const timer = +new Date()
+                        fileUrl = url("/web/image", {
+                            model: data.model,
+                            id: data.res_id,
+                            field: key,
+                            unique: '',
+                            timer
+                        });
+               
+                    break;
+                case 'iframe':
+                 
+                    const iframe_file_url = encodeURIComponent(
+                        url("/web/content", {
+                            model: data.model,
+                            id: data.res_id,
+                            field: key,
+                        })
+                    );
+                    fileUrl = `${this.state.attachment_base}?file=${iframe_file_url}`;
+                case 'unknown':
+                    fileUrl = encodeURIComponent(
+                        url("/web/content", {
+                            model: data.model,
+                            id: data.res_id,
+                            field: key,
+                        })
+                    );
+            }
+
+            return fileUrl
+        },
+        _getTypeInfo(type, data) {
+            switch (type) {
+                case 'application/pdf':
+                    data.attachment_base = `/web/static/lib/pdfjs/web/viewer.html`;
+                    data.attachment_type = 'iframe'
+                    break;
+                case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+                    data.attachment_base = `/jikimo_attachment_viewer/static/lib/docxjs/viewer.html`;
+                    data.attachment_type = 'iframe'
+                    break;
+                case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+                    data.attachment_base = `/jikimo_attachment_viewer/static/lib/exceljs/viewer.html`;
+                    data.attachment_type = 'iframe'
+                    break;
+                case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+                    data.attachment_base = '';
+                    data.attachment_type = 'unknown'
+                    break;
+                case 'image/png':
+                case 'image/jpeg':
+                case 'image/jpg':
+                    data.attachment_base = ''
+                    data.attachment_type = 'image'
+                    break;
+                default:
+                    data.attachment_base = ''
+                    data.attachment_type = 'unknown'
+                    break;
+            }
+        }
+    });
+    
+    var CustomListController = ListController.extend({
+        // 可以保留或移除，根据是否需要处理自定义事件
+        // 处理打印操作
+        // rpc.query({
+        //     model: 'sf.demand.plan.print.wizard',
+        //     method: 'demand_plan_print',
+        //     args: [recordIds]
+        // }).then(function(result) {
+        //     self.do_notify("成功", "打印任务已发送到打印机");
+        //     // 刷新视图显示最新状态
+        //     self.reload();
+        // }).catch(function(error) {
+        //     self.do_warn("打印失败", error.data.message || "发生未知错误");
+        // });
+    });
+    
+    var PrintDemand = ListView.extend({
+        config: _.extend({}, ListView.prototype.config, {
+            Renderer: CustomListRenderer,
+            Controller: CustomListController,
+        }),
+    });
+
+    viewRegistry.add('print_demand', PrintDemand);
+
+    return PrintDemand;
+});
\ No newline at end of file
diff --git a/sf_demand_plan/static/src/scss/style.css b/sf_demand_plan/static/src/scss/style.css
index f5b687fb..358156b5 100644
--- a/sf_demand_plan/static/src/scss/style.css
+++ b/sf_demand_plan/static/src/scss/style.css
@@ -9,3 +9,58 @@
 .demand_plan_tree .o_list_table_ungrouped  {
     min-width: 1900px;
 }
+
+
+.o_selected_row {
+    background-color: #e6f7ff !important;
+    font-weight: bold;
+}
+
+.custom-table-image-container {
+    display: flex;
+    height: calc(95vh - 254px);
+    gap: 20px;
+    position: relative;
+    th.o_list_record_selector, td.o_list_record_selector{
+        display: none;
+    }
+    .custom-preview-container, .print_demand {
+        flex: 1;
+        
+        max-width: 49%;
+        tbody {
+            tr:not(.o_data_row) {
+                display: none;
+            }
+        }
+        tfoot {
+            display: none;
+        }
+    }
+    .print_demand {
+        .table-responsive {
+            width: 100%;
+            overflow-x: auto!important;
+        }
+    }
+    .custom-preview-container {
+        background-color: #dadce0;
+        padding: 20px;
+        img {
+            max-width: 100%;
+            max-height: 100%;
+        }
+        iframe {
+            width: 100%;
+            height: 100%;
+        }
+    }
+    .o_print_custom, .o_cancel_custom {
+        position: absolute;
+        bottom: 20px;
+        right: 20px;
+    }
+    .o_print_custom {
+        right: 66px;
+    }
+}
\ No newline at end of file
diff --git a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
index 56b3c4fd..6927c283 100644
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
@@ -4,12 +4,12 @@
         <field name="name">sf.demand.plan.print.wizard.tree</field>
         <field name="model">sf.demand.plan.print.wizard</field>
         <field name="arch" type="xml">
-            <tree string="打印">
+            <tree string="打印" class="print_demand"  js_class="print_demand" >
                 <field name="model_id"/>
                 <field name="filename_url"/>
                 <field name="type"/>
-                <field name="machining_drawings" widget="adaptive_viewer"/>
-                <field name="cnc_worksheet" widget="pdf_viewer"/>
+                <field name="machining_drawings"  attrs="{'column_invisible': True }"/>
+                <field name="cnc_worksheet" attrs="{'column_invisible': True }" />
                 <field name="status"/>
             </tree>
         </field>

From c2000aa9c54894402c3489723272df84eadac15b Mon Sep 17 00:00:00 2001
From: hyyy <123@qq.com>
Date: Mon, 16 Jun 2025 17:28:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_demand_plan/static/src/js/print_demand.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_demand_plan/static/src/js/print_demand.js b/sf_demand_plan/static/src/js/print_demand.js
index b1ecd7e7..e66484f0 100644
--- a/sf_demand_plan/static/src/js/print_demand.js
+++ b/sf_demand_plan/static/src/js/print_demand.js
@@ -91,14 +91,14 @@ odoo.define('sf_demand.print_demand', function (require) {
         },
         _onPrintClick(e) {
             console.log(e, 'asdsadadsadasdad', this);
-            var selectedIds = this.getSelectedIds();
+            var print_ids = this.getSelectedIds();
     
-            console.log(selectedIds);
+            console.log(print_ids);
                     
             this._rpc({
                 model: 'sf.demand.plan.print.wizard',
                 method: 'demand_plan_print',
-                kwargs: selectedIds,
+                kwargs: print_ids,
                 // context: this.state.getContext()
             }).then(function() {
                 self.do_notify("成功", "打印任务已发送到打印机");

From 95b5c862428567700e50f30a33521e5e1897f490 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 16 Jun 2025 17:42:05 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=8A=95=E6=96=99=E9=BD=90=E5=A5=97?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_demand_plan/models/sf_production_demand_plan.py   | 9 +++------
 sf_demand_plan/wizard/sf_demand_plan_print_wizard.py | 6 ++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sf_demand_plan/models/sf_production_demand_plan.py b/sf_demand_plan/models/sf_production_demand_plan.py
index de2c1203..4eb8d449 100644
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/sf_demand_plan/models/sf_production_demand_plan.py
@@ -272,18 +272,15 @@ class SfProductionDemandPlan(models.Model):
             else:
                 record.actual_end_date = None
 
-    @api.depends('sale_order_id.mrp_production_ids.move_raw_ids.forecast_availability',
-                 'sale_order_id.mrp_production_ids.move_raw_ids.quantity_done')
+    @api.depends('sale_order_id.mrp_production_ids.move_raw_ids.reserved_availability')
     def _compute_material_check(self):
         for record in self:
             if record.sale_order_id and record.sale_order_id.mrp_production_ids:
                 manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
                     lambda mo: mo.product_id == record.product_id)
                 if manufacturing_orders and manufacturing_orders.move_raw_ids:
-                    total_forecast_availability = sum(manufacturing_orders.mapped('move_raw_ids.forecast_availability'))
-                    total_quantity_done = sum(manufacturing_orders.mapped('move_raw_ids.quantity_done'))
-                    total_sum = total_forecast_availability + total_quantity_done
-                    if float_compare(total_sum, record.product_uom_qty,
+                    total_reserved_availability = sum(manufacturing_orders.mapped('move_raw_ids.reserved_availability'))
+                    if float_compare(total_reserved_availability, record.product_uom_qty,
                                      precision_rounding=record.product_id.uom_id.rounding) >= 0:
                         record.material_check = '1'  # 已齐套
                     else:
diff --git a/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py b/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
index ddd154e6..8fe70302 100644
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
@@ -30,8 +30,10 @@ class SfDemandPlanPrintWizard(models.TransientModel):
     workorder_id = fields.Many2one('mrp.workorder', string='工单')
     cnc_worksheet = fields.Binary('程序单')
 
-    def demand_plan_print(self):
-        for record in self:
+    def demand_plan_print(self, print_ids):
+        plan_print_ids = self.env['sf.demand.plan.print.wizard'].sudo().search(
+            [('id', 'in', print_ids)])
+        for record in plan_print_ids:
             pdf_data = record.machining_drawings if record.type == '1' else record.cnc_worksheet
             if pdf_data:
                 try:

From 8c43fc2b769292d748b0b64a277cf0c17517f606 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 17 Jun 2025 09:41:08 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/sf_demand_plan_print_wizard.py        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py b/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
index 8fe70302..25c7791a 100644
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard.py
@@ -30,9 +30,14 @@ class SfDemandPlanPrintWizard(models.TransientModel):
     workorder_id = fields.Many2one('mrp.workorder', string='工单')
     cnc_worksheet = fields.Binary('程序单')
 
+    @api.model
     def demand_plan_print(self, print_ids):
         plan_print_ids = self.env['sf.demand.plan.print.wizard'].sudo().search(
             [('id', 'in', print_ids)])
+        if not plan_print_ids:
+            return {'message': '记录不存在'}
+        success_records = []
+        failed_records = []
         for record in plan_print_ids:
             pdf_data = record.machining_drawings if record.type == '1' else record.cnc_worksheet
             if pdf_data:
@@ -48,9 +53,20 @@ class SfDemandPlanPrintWizard(models.TransientModel):
                     elif record.type == '2':
                         c_num += 1
                     record.demand_plan_id.print_count = f"T{t_num}C{c_num}"
+                    success_records.append({
+                        'filename_url': record.filename_url,
+                    })
                 except Exception as e:
                     record.status = 'fail'
                     _logger.error(f"文件{record.filename_url}打印失败: {str(e)}")
+                    failed_records.append({
+                        'filename_url': record.filename_url,
+                    })
+        if failed_records:
+            message = f"成功打印 {len(success_records)} 个文件，失败 {len(failed_records)} 个"
+        else:
+            message = f"所有 {len(success_records)} 个文件打印成功"
+        return {'message': message}
 
 
 class MrpWorkorder(models.Model):

From 568f3e4f3021dd8d3e8c67a4de6e9f20d40d2618 Mon Sep 17 00:00:00 2001
From: hyyy <123@qq.com>
Date: Tue, 17 Jun 2025 09:58:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B1=95=E7=A4=BA=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_demand_plan/static/src/js/print_demand.js | 32 +++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/sf_demand_plan/static/src/js/print_demand.js b/sf_demand_plan/static/src/js/print_demand.js
index e66484f0..6dacc7b3 100644
--- a/sf_demand_plan/static/src/js/print_demand.js
+++ b/sf_demand_plan/static/src/js/print_demand.js
@@ -10,7 +10,8 @@ odoo.define('sf_demand.print_demand', function (require) {
     var CustomListRenderer = ListRenderer.extend({
         _render: function () {
             var self = this;
-            this.getParent()?.$buttons.hide()
+            this.getParent()?.$buttons.hide();
+            
             return this._super.apply(this, arguments).then(function () {
                 // 添加图片预览容器到页面左侧
                 if (!$('.table-image-preview-container').length) {
@@ -34,7 +35,12 @@ odoo.define('sf_demand.print_demand', function (require) {
                 }
             });
         },
-        
+        start: function() {
+            setTimeout(() => {
+                this.$el.find('.o_data_row').eq(0).trigger('click')
+            }, 500);
+            return this._super();
+        },
         events: _.extend({}, ListRenderer.prototype.events, {
             'click .o_data_row': '_onCustomRowClick',
             'click .o_print_custom': '_onPrintClick',
@@ -48,7 +54,6 @@ odoo.define('sf_demand.print_demand', function (require) {
             var $row = $(ev.currentTarget);
             var index = $row.index();
             var data = this.state.data[index];
-            console.log(this, 'this', data);
             if(data.fileData?.fileUrl) {
 
             } else {
@@ -71,7 +76,6 @@ odoo.define('sf_demand.print_demand', function (require) {
                         Object.assign(data.fileData, attachment)
                         this._getTypeInfo(attachment.mimetype, data.fileData)
                     }
-                    console.log(data, 'data', attachment);
                     const fileUrl = this.getFileUrl(data.fileData.attachment_type, data, key)
                     data.fileData.fileUrl = fileUrl
                 }
@@ -90,22 +94,28 @@ odoo.define('sf_demand.print_demand', function (require) {
             })
         },
         _onPrintClick(e) {
-            console.log(e, 'asdsadadsadasdad', this);
             var print_ids = this.getSelectedIds();
     
-            console.log(print_ids);
                     
             this._rpc({
                 model: 'sf.demand.plan.print.wizard',
                 method: 'demand_plan_print',
-                kwargs: print_ids,
+                args: [ print_ids ] ,
                 // context: this.state.getContext()
-            }).then(function() {
-                self.do_notify("成功", "打印任务已发送到打印机");
+            }).then((e) => {
+                
+                this.getParent()?.getParent()?.env.services?.notification.notify( {
+                    type: 'info',
+                    message: e.message,
+                })
+                // self.do_notify("成功", "打印任务已发送到打印机");
             }).catch(function(error) {
                 console.error("打印错误:", error);
-                self.do_warn("打印失败", error.data.message || "未知错误");
-            });
+                // self.do_warn("打印失败", error.data.message || "未知错误");
+            }).finally(e => {
+                this.getParent().reload()
+                
+            })
             
         },
         getFileUrl(attachment_type, data, key) {

From 33205c5d2978ce3b120d3419fa18f4f67ab558c3 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 17 Jun 2025 10:57:13 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E5=B0=B1=E7=BB=AA=E6=9C=AA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E4=BA=A7=E5=93=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_demand_plan/models/sf_production_demand_plan.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sf_demand_plan/models/sf_production_demand_plan.py b/sf_demand_plan/models/sf_production_demand_plan.py
index 4eb8d449..c0121d58 100644
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/sf_demand_plan/models/sf_production_demand_plan.py
@@ -501,7 +501,10 @@ class SfProductionDemandPlan(models.Model):
         action = self.env["ir.actions.actions"]._for_xml_id("stock.action_picking_tree_all")
         picking_ids = None
         if self.supply_method in ('automation', 'manual'):
-            picking_ids = self.sale_order_id.mrp_production_ids.mapped('picking_ids').filtered(
+            mrp_production_ids = self.sale_order_id.mrp_production_ids.filtered(
+                lambda p: p.product_id.id == self.product_id.id
+            )
+            picking_ids = mrp_production_ids.mapped('picking_ids').filtered(
                 lambda p: p.state == 'assigned')
         elif self.supply_method in ('purchase', 'outsourcing'):
             picking_ids = self.sale_order_id.picking_ids.filtered(