From 338d620d5be889de203d0eedccd5b19fe314340b Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 29 Apr 2024 15:53:40 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=20=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=B0=E5=85=B7=E4=BD=93=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/models/model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index fdbd0c33..e526d5b9 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -838,7 +838,7 @@ class Sf_stock_move_line(models.Model):
                 if obj:
                     obj.product_id = record.product_id.id
                     # obj.location_status = '占用'
-                    obj.product_num += record.reserved_uom_qty
+                    obj.product_num += record.qty_done
 
     @api.onchange('destination_location_id')
     def _check_destination_location_id(self):

From cc590134f59f39703f71b34081c1135846b56817 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 29 Apr 2024 16:00:27 +0800
Subject: [PATCH 2/4] 1

---
 sf_tool_management/views/tool_base_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 61bbd110..06a60b1c 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -914,7 +914,7 @@
                                             <field name="pad_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
                                                    attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')],
-                                                    'required': [('pad_freight_id', '!=', False), ('dismantle_cause', 'in', ['更换为其他刀具'])]}"/>
+                                                    'required': [('pad_product_id', '!=', False), ('dismantle_cause', 'in', ['更换为其他刀具'])]}"/>
                                         </group>
                                     </group>
                                 </group>

From a1f0a580a65d5e8cce6e671d86e141c91bb8e75c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 29 Apr 2024 17:25:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=20=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=A3=85=E5=A4=B9=E5=B2=97=E5=9C=A8=E5=B7=A5=E4=BB=B6=E8=A3=85?=
 =?UTF-8?q?=E5=A4=B9=E5=8D=95=E8=AF=A6=E6=83=85=E6=89=AB=E6=8F=8Frfid?=
 =?UTF-8?q?=E7=A0=81=E6=8A=A5=E9=94=99=20=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 12d7505b..4ad7e2d2 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1006,7 +1006,10 @@ class SfWorkOrderBarcodes(models.Model):
         #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
         workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)])
         if workorder_old:
-            raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % workorder_old.production_id.name)
+            name = ''
+            for workorder in workorder_old:
+                name = '%s  %s' % (name, workorder.production_id.name)
+            raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name)
         if workorder:
             if workorder.routing_type == '装夹预调':
                 if workorder.state in ['done']:

From 402a4e1740a9b6808410c60f24160b491c3d27ab Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 30 Apr 2024 17:09:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81=E4=BA=A7=E5=93=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=B7=A5=E7=BC=96=E7=A8=8B=E7=9A=84=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=EF=BC=9B=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?from=E8=A7=86=E5=9B=BE=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E7=BC=96=E7=A8=8B=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_production_addional_change.xml        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 7054f73d..c7665f5a 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -78,6 +78,7 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
+                    <field name="manual_quotation" readonly="1"/>
                     <field name="programming_state" readonly="1"/>
                     <field name="production_line_id" readonly="1"/>
                 </xpath>
@@ -258,6 +259,18 @@
             </field>
         </record>
 
+        <record id="product_template_search_view_manual_quotation" model="ir.ui.view">
+            <field name="name">product.template.search</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_search_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='consumable']" position="after">
+                    <separator/>
+                    <filter string="人工编程" name="manual_quotation" domain="[('manual_quotation', '=', True)]"/>
+                </xpath>
+            </field>
+        </record>
+
         <!-- 工单的操作按钮只让制造用户可见 -->
         <record id="sf_mrp_production_workorder_tree_editable_view" model="ir.ui.view">
             <field name="name">sf.mrp.production.workorder.tree.editable</field>