解决合并develop冲突

jikimo_purchase_request/models/purchase_order.py

@@ -94,20 +94,12 @@ class PurchaseOrder(models.Model):
     
     def button_cancel(self):
         """
-            1. 先将采购订单行与目标库存移动断开链接，避免采购单取消后，调拨单被调整为mts的问题
+            将取消的采购订单关联的库存移动撤销
-            2. 取消采购订单
-            3. 将采购订单行与目标库存移动重新建立链接
         """
-        created_purchase_request_line_ids = {}
-        if self.order_line.move_dest_ids.created_purchase_request_line_id:
         move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
-            created_purchase_request_line_ids = {move.id: move.created_purchase_request_line_id for move in move_ids}
-            self.order_line.write({'move_dest_ids': [(5, 0, 0)]})
         res =super(PurchaseOrder, self).button_cancel()
-        for move_id, created_purchase_request_line_id in created_purchase_request_line_ids.items():
+        if move_ids.mapped('created_purchase_request_line_id'):
-            self.env['stock.move'].browse(move_id).created_purchase_request_line_id = created_purchase_request_line_id
+            move_ids.write({'state': 'waiting', 'is_done': False})
-        # if move_ids.mapped('created_purchase_request_line_id'):
-        #     move_ids.write({'state': 'waiting', 'is_done': False})
         return res
 
     def write(self, vals):

jikimo_purchase_request/models/sale_order.py

@@ -44,7 +44,7 @@ class StatusChange(models.Model):
         else:
             action.update({
                 'name': _("从 %s生成采购请求单", self.name),
-                'domain': [('id', 'in', pr_ids.ids)],
+                'domain': [('id', 'in', pr_ids)],
                 'view_mode': 'tree,form',
             })
         return action

jikimo_purchase_request/models/stock_picking.py

@@ -42,9 +42,7 @@ class StockPicking(models.Model):
             purchase_request_lines = self.move_ids.move_orig_ids.purchase_line_id.purchase_request_lines
             if purchase_request_lines:
                purchase_request_lines.move_dest_ids = [
-                    (4, x.id) for x in backorder_ids.move_ids if
+                   (4, x.id) for x in backorder_ids.move_ids if x.product_id.id in purchase_request_lines.mapped('product_id.id')
-                    x.product_id.id in purchase_request_lines.mapped('product_id.id') and \
-                    not x.created_purchase_request_line_id
                 ]
         return res
 

jikimo_purchase_request_tier_validation/models/stock_rule.py

@@ -4,10 +4,9 @@ class StockRule(models.Model):
     _inherit = 'stock.rule'
 
     def _run_buy(self, procurements):
+        res = super(StockRule, self)._run_buy(procurements)
         # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
         origins = list(set([procurement[0].origin for procurement in procurements]))
-        res = super(StockRule, self)._run_buy(procurements)
-        # origins = list(set([procurement[0].origin for procurement in procurements]))
         for origin in origins:
             pr_ids = self.env["purchase.request"].sudo().search(
                 [('origin', 'like', origin), ('rule_new_add', '=', True), ('state', '=', 'draft')])

sf_base/__manifest__.py

@@ -35,6 +35,7 @@
         ],
         'web.assets_backend': [
             'sf_base/static/src/scss/*.scss',
+            'sf_base/static/src/js/*.js',
         ],
 
     },

sf_base/models/basic_parameters_fixture.py

@@ -67,52 +67,6 @@ class BasicParametersFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
-        # ‘磁吸托盘’ 字段
-    magnet_tray_length = fields.Float('磁吸托盘长度(mm)', digits=(16, 2))
-    magnet_tray_width = fields.Float('磁吸托盘宽度(mm)', digits=(16, 2))
-    magnet_tray_height = fields.Float('磁吸托盘厚度(mm)', digits=(16, 2))
-    magnet_tray_diameter = fields.Float('磁吸托盘直径(mm)', digits=(16, 2))
-    magnet_tray_weight = fields.Float('磁吸托盘重量(kg)', digits=(16, 2))
-
-    magnet_max_adsorp_length = fields.Float('磁吸托盘最大吸附长度(mm)', digits=(16, 2))
-    magnet_max_adsorp_width = fields.Float('磁吸托盘最大吸附宽度(mm)', digits=(16, 2))
-    magnet_max_adsorp_height = fields.Float('磁吸托盘最大吸附厚度(mm)', digits=(16, 2))
-    magnet_max_adsorp_diameter = fields.Float('磁吸托盘最大吸附直径(mm)', digits=(16, 2))
-    magnet_max_adsorp_force = fields.Float('磁吸托盘最大吸附力(N)', digits=(16, 2))
-
-    magnet_unlocking_method = fields.Selection(
-        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
-        string='磁吸托盘锁紧方式'
-    )
-    magnet_flatness = fields.Char('磁吸托盘平面精度(mm)', size=20)
-    magnet_max_load = fields.Float('磁吸托盘最大负载(kg)', digits=(16, 2))
-
-    # ‘气吸托盘’ 字段
-    air_tray_length = fields.Float('气吸托盘长度(mm)', digits=(16, 2))
-    air_tray_width = fields.Float('气吸托盘宽度(mm)', digits=(16, 2))
-    air_tray_height = fields.Float('气吸托盘高度(mm)', digits=(16, 2))
-    air_tray_diameter = fields.Float('气吸托盘直径(mm)', digits=(16, 2))
-    air_tray_weight = fields.Float('气吸托盘重量(kg)', digits=(16, 2))
-
-    air_max_adsorp_length = fields.Float('气吸托盘最大吸附长度(mm)', digits=(16, 2))
-    air_max_adsorp_width = fields.Float('气吸托盘最大吸附宽度(mm)', digits=(16, 2))
-    air_max_adsorp_height = fields.Float('气吸托盘最大吸附厚度(mm)', digits=(16, 2))
-    air_max_adsorp_diameter = fields.Float('气吸托盘最大吸附直径(mm)', digits=(16, 2))
-    air_max_adsorp_force = fields.Float('气吸托盘最大吸附力(N)', digits=(16, 2))
-
-    air_unlocking_method = fields.Selection(
-        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
-        string='气吸托盘锁紧方式'
-    )
-    air_flatness = fields.Char('气吸托盘平面精度(mm)', size=20)
-    air_max_load = fields.Float('气吸托盘最大负载(kg)', digits=(16, 2))
-    air_boolean_chip_blowing_function = fields.Boolean('气吸托盘是否有吹屑功能')
-    air_way_to_install = fields.Selection(
-        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')],
-        string='气吸托盘安装方式'
-    )
-
-
     code = fields.Char('编码')
     active = fields.Boolean('有效', default=True)
 
@@ -131,10 +85,6 @@ class BasicParametersFixture(models.Model):
             return self._json_adapter_board_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '三爪卡盘':
             return self._json_scroll_chuck_param(fixture_materials_data)
-        elif fixture_materials_name == '磁吸托盘':
-            return self._json_magnet_tray_param(fixture_materials_data)
-        elif fixture_materials_name == '气吸托盘':
-            return self._json_air_tray_param(fixture_materials_data)
         return {}
 
     def _json_zero_chuck_param(self, obj):
@@ -334,57 +284,3 @@ class BasicParametersFixture(models.Model):
                 'centering_diameter': obj['centering_diameter'],
                 'type_of_drive': obj['type_of_drive'],
                 'active': obj['active']}
-
-    def _json_magnet_tray_param(self, obj):
-        """磁吸托盘：将data数据转换成list数据"""
-        return {
-            'code': obj['code'],
-            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
-                [('code', '=', obj.get('fixture_model_code'))]).id,
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'max_adsorp_length': obj['max_adsorp_length'],
-            'max_adsorp_width': obj['max_adsorp_width'],
-            'max_adsorp_height': obj['max_adsorp_height'],
-            'max_adsorp_diameter': obj.get('max_adsorp_diameter'),
-            'max_adsorp_force': obj['max_adsorp_force'],
-            'flatness': obj.get('flatness'),
-            'max_load': obj.get('max_load'),
-            'unlocking_method': obj.get('unlocking_method'),
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]
-            ).id if obj.get('materials_model_id') else False,
-            'active': obj.get('active', True),
-        }
-
-    def _json_air_tray_param(self, obj):
-        """气吸托盘：将data数据转换成list数据"""
-        return {
-            'code': obj['code'],
-            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
-                [('code', '=', obj.get('fixture_model_code'))]).id,
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'max_adsorp_length': obj['max_adsorp_length'],
-            'max_adsorp_width': obj['max_adsorp_width'],
-            'max_adsorp_height': obj['max_adsorp_height'],
-            'max_adsorp_diameter': obj.get('max_adsorp_diameter'),
-            'max_adsorp_force': obj['max_adsorp_force'],
-            'flatness': obj.get('flatness'),
-            'max_load': obj.get('max_load'),
-            'unlocking_method': obj.get('unlocking_method'),
-            'boolean_chip_blowing_function': obj.get('blowing_function', False),
-            'way_to_install': obj.get('way_to_install'),
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]
-            ).id if obj.get('materials_model_id') else False,
-            'active': obj.get('active', True),
-        }

sf_base/models/common.py

@@ -42,7 +42,6 @@ class MrsMaterialModel(models.Model):
     materials_num = fields.Char("编码号")
     name = fields.Char('型号名')
     need_h = fields.Boolean("热处理", default="false")
-    need_m = fields.Boolean("是否磁吸", default="false")
     mf_materia_post = fields.Char("热处理后密度")
     density = fields.Float("密度(kg/m³)")
     materials_id = fields.Many2one('sf.production.materials', "材料名")

sf_base/models/fixture.py

@@ -35,7 +35,6 @@ class FixtureModel(models.Model):
     glb_url = fields.Char(string="图片")
     status = fields.Boolean('状态')
     active = fields.Boolean('有效', default=False)
-    code = fields.Char(string='编码', readonly=True)
 
     zero_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                      string='零点卡盘基本参数')
@@ -47,14 +46,11 @@ class FixtureModel(models.Model):
                                            string='虎钳夹具基本参数')
     magnet_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                          string='磁吸夹具基本参数')
-    magnet_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
-                                     string='磁吸托盘基本参数')
     adapter_board_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                                 string='转接板(锁板)夹具基本参数')
     scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                        string='三爪卡盘基本参数')
-    air_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
+    code = fields.Char(string='编码', readonly=True)
-                                    string='气吸托盘基本参数')
 
     # def _get_code(self, fixture_model_type_code):
     #     fixture_model = self.env['sf.fixture.model'].sudo().search(

sf_base/static/src/js/custom_barcode_handlers.js

@@ -0,0 +1,62 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { barcodeGenericHandlers } from '@barcodes/barcode_handlers';
+import { patch } from "@web/core/utils/patch";
+
+// 定义新的 clickOnButton 函数
+function customClickOnButton(selector) {
+    console.log("This is the custom clickOnButton function!");
+
+    const buttons = document.body.querySelectorAll(selector);
+
+    let length = buttons.length;
+    if (length > 0) {
+        buttons[length - 1].click();
+    } else {
+        console.warn(`Button with selector ${selector} not found`);
+    }
+}
+
+patch(barcodeGenericHandlers, "start", {
+    start(env, { ui, barcode, notification }) {
+        // 使用新定义的 clickOnButton 函数
+        const COMMANDS = {
+            "O-CMD.EDIT": () => customClickOnButton(".o_form_button_edit"),
+            "O-CMD.DISCARD": () => customClickOnButton(".o_form_button_cancel"),
+            "O-CMD.SAVE": () => customClickOnButton(".o_form_button_save"),
+            "O-CMD.PREV": () => customClickOnButton(".o_pager_previous"),
+            "O-CMD.NEXT": () => customClickOnButton(".o_pager_next"),
+            "O-CMD.PAGER-FIRST": () => updatePager("first"),
+            "O-CMD.PAGER-LAST": () => updatePager("last"),
+            "O-CMD.CONFIRM": () => customClickOnButton(".jikimo_button_confirm"),
+            "O-CMD.FLUSHED": () => customClickOnButton(".jikimo_button_flushed"),
+        };
+
+        barcode.bus.addEventListener("barcode_scanned", (ev) => {
+            const barcode = ev.detail.barcode;
+            if (barcode.startsWith("O-BTN.")) {
+                let targets = [];
+                try {
+                    targets = getVisibleElements(ui.activeElement, `[barcode_trigger=${barcode.slice(6)}]`);
+                } catch (_e) {
+                    console.warn(`Barcode '${barcode}' is not valid`);
+                }
+                for (let elem of targets) {
+                    elem.click();
+                }
+            }
+            if (barcode.startsWith("O-CMD.")) {
+                const fn = COMMANDS[barcode];
+                if (fn) {
+                    fn();
+                } else {
+                    notification.add(env._t("Barcode: ") + `'${barcode}'`, {
+                        title: env._t("Unknown barcode command"),
+                        type: "danger"
+                    });
+                }
+            }
+        });
+    }
+})

sf_base/static/src/js/remove_focus.js

@@ -0,0 +1,42 @@
+/** @odoo-module **/
+
+import { registry } from '@web/core/registry';
+
+import { formView } from '@web/views/form/form_view';
+import { FormController } from '@web/views/form/form_controller';
+
+import { listView } from '@web/views/list/list_view';
+import { ListController } from '@web/views/list/list_controller'
+
+import { onRendered, onMounted } from "@odoo/owl";
+
+export class RemoveFocusFormController extends FormController {
+    setup() {
+        super.setup();
+
+        onMounted(() => {
+            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
+        })
+    }
+}
+
+registry.category('views').add('remove_focus_form_view', {
+    ...formView,
+    Controller: RemoveFocusFormController,
+});
+
+
+export class RemoveFocusListController extends ListController {
+    setup() {
+        super.setup();
+
+        onMounted(() => {
+            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
+        })
+    }
+}
+
+registry.category('views').add('remove_focus_list_view', {
+    ...listView,
+    Controller: RemoveFocusListController,
+});

sf_base/views/common_view.xml

@@ -263,7 +263,6 @@
                                 <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="0"/>
                                 <field name="density" readonly="1" required="1"  class="custom_required"/>
-                                <field name="need_m" default="false" readonly="1"/>
                             </group>
                             <group>
                                 <field name="rough_machining" required="1"/>
@@ -307,7 +306,6 @@
                     <field name="tensile_strength"/>
                     <field name="hardness" optional="show"/>
                     <field name="need_h"/>
-                    <field name="need_m"/>
                     <field name="apply" widget="many2many_tags" optional="show"/>
                     <field name="density" optional="show"/>
                     <field name="rough_machining" optional="hide"/>
@@ -354,7 +352,6 @@
                                             <field name="materials_no"/>
                                             <field name="name"/>
                                             <field name="need_h"/>
-                                            <field name="need_m"/>
                                             <field name="mf_materia_post"/>
                                             <field name="density"/>
                                             <field name='materials_id' default="default" invisible="1"/>

sf_base/views/fixture_view.xml

@@ -328,52 +328,6 @@
                                     <field name="type_of_drive"/>
                                 </tree>
                             </field>
-                            <field name="air_tray_ids"
-                                attrs="{'invisible': [('fixture_material_type', '!=', '气吸托盘')]}">
-                                <tree editable="bottom" class="center" delete="0">
-                                    <field name="code" invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="length"/>
-                                    <field name="width"/>
-                                    <field name="height"/>
-                                    <field name="diameter"/>
-                                    <field name="weight" string="重量(kg)"/>
-                                    <field name="max_adsorp_length"/>
-                                    <field name="max_adsorp_width"/>
-                                    <field name="max_adsorp_height"/>
-                                    <field name="max_adsorp_diameter"/>
-                                    <field name="max_adsorp_force"/>
-                                    <field name="flatness"/>
-                                    <field name="max_load"/>
-                                    <field name="unlocking_method"/>
-                                    <field name="boolean_chip_blowing_function"/>
-                                    <field name="way_to_install"/>
-                                    <field name="materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
-                                    <field name="active" invisible="1"/>
-                                </tree>
-                            </field>
-                            <field name="magnet_tray_ids"
-                                attrs="{'invisible': [('fixture_material_type', '!=', '磁吸托盘')]}">
-                                <tree editable="bottom" class="center" delete="0">
-                                    <field name="code" invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="length"/>
-                                    <field name="width"/>
-                                    <field name="height"/>
-                                    <field name="diameter"/>
-                                    <field name="weight" string="重量(kg)"/>
-                                    <field name="max_adsorp_length"/>
-                                    <field name="max_adsorp_width"/>
-                                    <field name="max_adsorp_height"/>
-                                    <field name="max_adsorp_diameter"/>
-                                    <field name="max_adsorp_force"/>
-                                    <field name="flatness"/>
-                                    <field name="max_load"/>
-                                    <field name="unlocking_method"/>
-                                    <field name="materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
-                                    <field name="active" invisible="1"/>
-                                </tree>
-                            </field>
                             <field name="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">

sf_demand_plan/__manifest__.py

@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': '机企猫智能工厂 需求计划',
-    'version': '1.1',
+    'version': '1.0',
     'summary': '智能工厂计划管理',
     'sequence': 1,
     'description': """
@@ -10,14 +10,18 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_plan','jikimo_printing'],
+    'depends': ['sf_plan'],
     'data': [
         'security/ir.model.access.csv',
         'data/stock_route_group.xml',
-        'views/demand_plan_info.xml',
+<<<<<<< HEAD
-        'views/demand_plan.xml',
-        'views/stock_route.xml',
         'views/sale_order_views.xml',
+        'views/demand_plan.xml',
+        'views/demand_main_plan.xml',
+=======
+        'views/demand_plan.xml',
+>>>>>>> develop
+        'views/stock_route.xml',
         'wizard/sf_demand_plan_print_wizard_view.xml',
         'wizard/sf_release_plan_wizard_views.xml',
         'views/menu_view.xml',
@@ -30,7 +34,6 @@
         'web.assets_backend': [
             'sf_demand_plan/static/src/scss/style.css',
             'sf_demand_plan/static/src/js/print_demand.js',
-            'sf_demand_plan/static/src/js/custom_button.js',
         ]
     },
     'license': 'LGPL-3',

sf_demand_plan/migrations/1.1/post-migrate.py

@@ -6,13 +6,13 @@ from odoo import api, SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
-
+#需求计划模块升级的时候，同步处理存量需求明细数据，关联上新加的需求计划主表
 def migrate(cr, version):
     # 获取环境
     env = api.Environment(cr, SUPERUSER_ID, {})
 
     ProductionLine = env['sf.production.demand.plan']
-    DemandPlan = env['sf.demand.plan']
+    DemandPlan = env['sf.demand.main.plan']
 
     lines = ProductionLine.search([('demand_plan_id', '=', False)])
     for line in lines:

sf_demand_plan/models/__init__.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-
+from . import mrp_bom
-from . import sf_demand_plan
+from . import mrp_production
+from . import sf_demand_main_plan
 from . import sf_production_demand_plan
 from . import sale_order
 from . import stock_route
-from . import mrp_bom
-from . import mrp_production
 from . import stock_rule
 from . import purchase_request
 from . import purchase_order
+

sf_demand_plan/models/mrp_bom.py

@@ -18,12 +18,3 @@ class MrpBom(models.Model):
             subcontract = self.get_supplier(product.materials_type_id)
             bom_id.subcontractor_id = subcontract.partner_id.id
         return bom_id
-    
-    def name_get(self):
-        """重写name_get方法，只显示BOM编码"""
-        result = []
-        for record in self:
-            # 只显示BOM编码，如果编码为空则显示产品名称
-            display_name = record.code or record.product_tmpl_id.name or f'BOM-{record.id}'
-            result.append((record.id, display_name))
-        return result

sf_demand_plan/models/mrp_production.py

@@ -21,23 +21,6 @@ class MrpProduction(models.Model):
                 production.production_type = None
 
     def _get_purchase_request(self):
-        """获取跟制造订单相关的采购申请单（根据采购申请单行项目的产品匹配）"""
+        """获取跟制造订单相关的采购申请单"""
-        pr_ids = self.env['purchase.request'].sudo().search(
+        pr_ids = self.env['purchase.request'].sudo().search([('origin', '=', self.name)])
-            [('line_ids.demand_plan_line_id', 'in', self.demand_plan_line_id.ids)])
         return pr_ids
-
-    @api.depends('procurement_group_id', 'procurement_group_id.stock_move_ids.group_id')
-    def _compute_picking_ids(self):
-        for order in self:
-            if order.product_id.product_tmpl_id.single_manufacturing == True and not order.is_remanufacture:
-                first_order = self.env['mrp.production'].search(
-                    [('demand_plan_line_id', '=', order.demand_plan_line_id.id), ('product_id', '=', order.product_id.id)], limit=1, order='id asc')
-                order.picking_ids = self.env['stock.picking'].search([
-                    ('group_id', '=', first_order.procurement_group_id.id), ('group_id', '!=', False),
-                ])
-                order.delivery_count = len(first_order.picking_ids)
-            else:
-                order.picking_ids = self.env['stock.picking'].search([
-                    ('group_id', '=', order.procurement_group_id.id), ('group_id', '!=', False),
-                ])
-                order.delivery_count = len(order.picking_ids)

sf_demand_plan/models/purchase_order.py

@@ -5,44 +5,18 @@ from odoo.tools import float_compare
 class PurchaseOrder(models.Model):
     _inherit = 'purchase.order'
 
-    def button_confirm(self):
+    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-        if self.order_line[0].demand_plan_line_id:
+                                          string="需求计划明细", readonly=True)
-            self = self.with_context(
-                demand_plan_line_id=self.order_line[0].demand_plan_line_id.id
-            )
-        res = super(PurchaseOrder, self).button_confirm()
-        return res
 
-    @api.depends('origin')
+    @api.depends('origin', 'demand_plan_line_id')
     def _compute_purchase_type(self):
         for purchase in self:
             if purchase.order_line[0].product_id.categ_id.name == '坯料':
                 if purchase.order_line[0].product_id.materials_type_id.gain_way == '外协':
                     purchase.purchase_type = 'outsourcing'
             else:
-                if purchase.order_line[0].demand_plan_line_id.supply_method == 'outsourcing':
+                if purchase.demand_plan_line_id.supply_method == 'outsourcing':
                     purchase.purchase_type = 'outsourcing'
 
-                elif purchase.order_line[0].demand_plan_line_id.supply_method == 'purchase':
+                elif purchase.demand_plan_line_id.supply_method == 'purchase':
                     purchase.purchase_type = 'outside'
-
-
-class PurchaseOrderLine(models.Model):
-    _inherit = 'purchase.order.line'
-
-    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
-                                          string="需求计划明细", readonly=True)
-
-    @api.model
-    def create(self, vals):
-        res = super(PurchaseOrderLine, self).create(vals)
-        if not res.demand_plan_line_id and res.order_id.origin:
-            origin = [origin.replace(' ', '') for origin in res.order_id.origin.split(',')]
-            if self.env.context.get('demand_plan_line_id'):
-                res.demand_plan_line_id = self.env.context.get('demand_plan_line_id')
-            elif 'MO' in res.order_id.origin:
-                # 原单据是制造订单
-                mp_ids = self.env['mrp.production'].sudo().search([('name', 'in', origin)])
-                if mp_ids:
-                    res.demand_plan_line_id = mp_ids[0].demand_plan_line_id.id
-        return res

sf_demand_plan/models/purchase_request.py

@@ -28,8 +28,83 @@ class PurchaseRequestLine(models.Model):
 class PurchaseRequestLineMakePurchaseOrder(models.TransientModel):
     _inherit = "purchase.request.line.make.purchase.order"
 
-    @api.model
+    def make_purchase_order(self):
-    def _prepare_purchase_order_line(self, po, item):
+        res = []
-        ret = super(PurchaseRequestLineMakePurchaseOrder, self)._prepare_purchase_order_line(po, item)
+        purchase_obj = self.env["purchase.order"]
-        ret['demand_plan_line_id'] = item.line_id.demand_plan_line_id.id
+        po_line_obj = self.env["purchase.order.line"]
-        return ret
+        purchase = False
+
+        if len(set([item_id.line_id.supply_method for item_id in self.item_ids])) > 1:
+            raise ValidationError('不同供货方式不可合并创建询价单!')
+
+        for item in self.item_ids:
+            line = item.line_id
+            if item.product_qty <= 0.0:
+                raise UserError(_("Enter a positive quantity."))
+            if self.purchase_order_id:
+                purchase = self.purchase_order_id
+            if not purchase:
+                po_data = self._prepare_purchase_order(
+                    line.request_id.picking_type_id,
+                    line.request_id.group_id,
+                    line.company_id,
+                    line.request_id.origin,
+                )
+                po_data['demand_plan_line_id'] = item.line_id.demand_plan_line_id.id
+                # po_data.update({'related_product':line.related_product.id})
+                purchase = purchase_obj.create(po_data)
+
+            # Look for any other PO line in the selected PO with same
+            # product and UoM to sum quantities instead of creating a new
+            # po line
+            domain = self._get_order_line_search_domain(purchase, item)
+            available_po_lines = po_line_obj.search(domain)
+            new_pr_line = True
+            # If Unit of Measure is not set, update from wizard.
+            if not line.product_uom_id:
+                line.product_uom_id = item.product_uom_id
+            # Allocation UoM has to be the same as PR line UoM
+            alloc_uom = line.product_uom_id
+            wizard_uom = item.product_uom_id
+            if available_po_lines and not item.keep_description:
+                new_pr_line = False
+                po_line = available_po_lines[0]
+                po_line.purchase_request_lines = [(4, line.id)]
+                po_line.move_dest_ids |= line.move_dest_ids
+                po_line_product_uom_qty = po_line.product_uom._compute_quantity(
+                    po_line.product_uom_qty, alloc_uom
+                )
+                wizard_product_uom_qty = wizard_uom._compute_quantity(
+                    item.product_qty, alloc_uom
+                )
+                all_qty = min(po_line_product_uom_qty, wizard_product_uom_qty)
+                self.create_allocation(po_line, line, all_qty, alloc_uom)
+            else:
+                po_line_data = self._prepare_purchase_order_line(purchase, item)
+                if item.keep_description:
+                    po_line_data["name"] = item.name
+                if line.related_product:
+                    po_line_data.update({'related_product': line.related_product.id})
+                po_line = po_line_obj.create(po_line_data)
+                po_line_product_uom_qty = po_line.product_uom._compute_quantity(
+                    po_line.product_uom_qty, alloc_uom
+                )
+                wizard_product_uom_qty = wizard_uom._compute_quantity(
+                    item.product_qty, alloc_uom
+                )
+                all_qty = min(po_line_product_uom_qty, wizard_product_uom_qty)
+                self.create_allocation(po_line, line, all_qty, alloc_uom)
+            self._post_process_po_line(item, po_line, new_pr_line)
+            res.append(purchase.id)
+
+        purchase_requests = self.item_ids.mapped("request_id")
+        purchase_requests.button_in_progress()
+        return {
+            "domain": [("id", "in", res)],
+            "name": _("RFQ"),
+            "view_mode": "tree,form",
+            "res_model": "purchase.order",
+            "view_id": False,
+            "context": False,
+            "type": "ir.actions.act_window",
+        }

sf_demand_plan/models/sale_order.py

@@ -9,24 +9,22 @@ class ReSaleOrder(models.Model):
         compute='_compute_mrp_production_ids',
         string='与此销售订单相关联的制造订单',
         groups='mrp.group_mrp_user', store=True)
-
+    demand_plan_ids = fields.Many2many(comodel_name="sf.demand.main.plan",
-    demand_plan_ids = fields.Many2many(comodel_name="sf.demand.plan",
                                       string="需求计划", readonly=True)
-
     demand_plan_count = fields.Integer(
-        string="需求计划生成计数",
+        "需求计划生成计数",
-        compute='_compute_demand_plan_count'
+        compute='_compute_demand_plan_count',
     )
-
+    #暂时不知道哪里用到了
     @api.depends('demand_plan_ids.line_ids.status')
     def _compute_purchase_request_count(self):
-        for so in self:
+        for record in self:
-            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', so.name)])
+            pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', record.name)])
             if pr_ids:
-                so.purchase_request_purchase_order_count = len(pr_ids)
+                record.purchase_request_purchase_order_count = len(pr_ids)
             else:
-                so.purchase_request_purchase_order_count = 0
+                record.purchase_request_purchase_order_count = 0
-
+    #计算需求计划生成计数
     @api.depends('demand_plan_ids.line_ids')
     def _compute_demand_plan_count(self):
         for line in self:
@@ -35,33 +33,47 @@ class ReSaleOrder(models.Model):
 
     def sale_order_create_line(self, product, item):
         ret = super(ReSaleOrder, self).sale_order_create_line(product, item)
-        vals = {
+        # vals = {
+        #     'sale_order_id': ret.order_id.id,
+        #     'sale_order_line_id': ret.id,
+        # }
+        # demand_plan_info = self.env['sf.demand.main.plan'].sudo().create(vals)
+        # vals.update({'demand_plan_id': demand_plan_info.id, 'plan_uom_qty': ret.product_uom_qty})
+        # demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
+        # demand_plan_info.write({'line_ids': demand_plan.ids})
+        # 优化方案1：使用事务确保数据一致性
+        with self.env.cr.savepoint():
+            # 1. 先创建主计划
+            demand_plan_info = self.env['sf.demand.main.plan'].sudo().create({
                 'sale_order_id': ret.order_id.id,
                 'sale_order_line_id': ret.id,
-        }
+            })
-        demand_plan_info = self.env['sf.demand.plan'].sudo().create(vals)
+            # 2. 创建明细计划时直接建立关联（利用One2many的inverse特性）
-        vals.update({'demand_plan_id': demand_plan_info.id, 'plan_uom_qty': ret.product_uom_qty,
+            demand_plan = self.env['sf.production.demand.plan'].sudo().create({
-                     'new_supply_method': 'custom_made', 'custom_made_type': 'manual'})
+                'demand_plan_id': demand_plan_info.id,
-        demand_plan = self.env['sf.production.demand.plan'].sudo().create(vals)
+                'plan_uom_qty': ret.product_uom_qty,
-        demand_plan_info.write({'line_ids': demand_plan.ids})
+                'sale_order_id': ret.order_id.id,     
+                'sale_order_line_id': ret.id,        
+            })
+        # 3. 不需要手动更新line_ids，Odoo的ORM会自动处理One2many关系
         if demand_plan.product_id.machining_drawings_name:
             filename_url = demand_plan.product_id.machining_drawings_name.rsplit('.', 1)[0]
             wizard_vals = {
+                'demand_plan_id': demand_plan.id,
                 'model_id': demand_plan.model_id,
                 'filename_url': filename_url,
-                'machining_drawings': product.machining_drawings,
                 'type': '1',
             }
             self.env['sf.demand.plan.print.wizard'].sudo().create(wizard_vals)
         ret.order_id.demand_plan_ids = [(4, demand_plan_info.id)]
         return ret
-
+    #从sf工厂调过来时，调用了，这里重写
     def confirm_to_supply_method(self):
         self.state = 'sale'
         for line in self.order_line:
             if line.product_id.auto_machining:
                 line.supply_method = 'automation'
-
+    #在销售订单打开需求计划列表
     def action_view_demand_plan(self):
         self.ensure_one()
         demand_plan_ids = self.env['sf.production.demand.plan'].sudo().search([('sale_order_id', '=', self.id)]).ids
@@ -72,3 +84,4 @@ class ReSaleOrder(models.Model):
             'domain': [('id', 'in', demand_plan_ids)],
             'view_mode': 'tree',
         }
+

sf_demand_plan/models/sf_demand_main_plan.py

@@ -3,15 +3,20 @@
 from odoo import models, fields, api, _
 from odoo.tools import float_compare
 from odoo.exceptions import ValidationError
-import re
 
 
-class SfDemandPlan(models.Model):
+class SfDemandMainPlan(models.Model):
-    _name = 'sf.demand.plan'
+    _name = 'sf.demand.main.plan'
-    _description = 'sf_demand_plan'
+    _description = 'sf_demand_main_plan'
+
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
 
     state = fields.Selection([
-        ('10', '待工艺设计'),
+        ('10', '需求确认'),
+        ('20', '待工艺设计'),
         ('30', '部分下达'),
         ('40', '已下达'),
         ('50', '取消'),
@@ -36,9 +41,6 @@ class SfDemandPlan(models.Model):
 
     blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
                                   related='product_id.blank_type')
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型',
-                                       related='product_id.blank_precision')
-    manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False)
     embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long', store=True)
     is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
     pending_qty = fields.Float(
@@ -62,10 +64,12 @@ class SfDemandPlan(models.Model):
                                                     compute='_compute_model_process_parameters_ids'
                                                     , store=True
                                                     )
-    model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
+    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',
+                                                 related='product_id.model_machining_precision')
+
     inventory_quantity_auto_apply = fields.Float(
         string="成品库存",
-        compute='_compute_inventory_quantity_auto_apply'
+        compute='_compute_inventory_quantity_auto_apply', store=True
     )
 
     priority = fields.Selection([
@@ -75,22 +79,12 @@ class SfDemandPlan(models.Model):
         ('4', '低'),
     ], string='优先级', default='3')
 
-    overdelivery_allowed = fields.Boolean('可超量发货', default=False)
-
     hide_button_release_plan = fields.Boolean(
         string='显示下达计划按钮',
         compute='_compute_hide_button_release_plan',
         default=False
     )
 
-    readonly_custom_made_type = fields.Boolean(
-        string='字段自制类型只读',
-        compute='_compute_readonly_custom_made_type',
-        default=False
-    )
-    demand_plan_number = fields.Char('需求计划号', compute='_compute_demand_plan_number', readonly=True, store=True)
-    origin = fields.Char('来源', related='sale_order_id.name', readonly=True, store=True)
-
     @api.depends('product_id.part_number', 'product_id.model_name')
     def _compute_part_number(self):
         for line in self:
@@ -115,9 +109,6 @@ class SfDemandPlan(models.Model):
     def _compute_embryo_long(self):
         for line in self:
             if line.product_id:
-                if line.product_id.blank_type == '圆料':
-                    line.embryo_long = f"Ø{round(line.product_id.model_width, 3)}*{round(line.product_id.model_long, 3)}"
-                else:
                 line.embryo_long = f"{round(line.product_id.model_long, 3)}*{round(line.product_id.model_width, 3)}*{round(line.product_id.model_height, 3)}"
             else:
                 line.embryo_long = None
@@ -156,8 +147,12 @@ class SfDemandPlan(models.Model):
         for line in self:
             sum_plan_uom_qty = sum(line.line_ids.mapped('plan_uom_qty'))
             pending_qty = line.product_uom_qty - sum_plan_uom_qty
-            if float_compare(pending_qty, 0,
+            rounding = line.product_id.uom_id.rounding or 0.01#设置默认精度
-                             precision_rounding=line.product_id.uom_id.rounding) == -1:
+            # 如果精度小于等于0，则设置为0.01   
+            if rounding<=0:
+                rounding = 0.01
+            # 如果计划量小于等于0，则设置为0
+            if float_compare(pending_qty, 0, precision_rounding=rounding) == -1:
                 line.pending_qty = 0
             else:
                 line.pending_qty = pending_qty
@@ -170,40 +165,32 @@ class SfDemandPlan(models.Model):
     @api.depends('line_ids.status')
     def _compute_hide_button_release_plan(self):
         for line in self:
-            line.hide_button_release_plan = bool(line.line_ids.filtered(
+            line.hide_button_release_plan = bool(line.line_ids.filtered(lambda p: p.status != '60'))
-                lambda p: p.status == '30'))
+
+    def button_release_plan(self):
+        pass
 
     @api.depends('line_ids.status', 'sale_order_id.state')
     def _compute_state(self):
         for line in self:
+            #已下达的订单
             status_line = line.line_ids.filtered(lambda p: p.status == '60')
-            if not line.line_ids:
+            if line.sale_order_id.state == 'cancel':
-                line.state = '10'
-            elif line.sale_order_id.state == 'cancel':
                 line.state = '50'
                 line.line_ids.status = '100'
             elif len(line.line_ids) == len(status_line):
                 line.state = '40'
+            #排除上面全部下达的情形后，如果有已下达订单，则状态为部分
             elif bool(status_line):
                 line.state = '30'
             else:
                 line.state = '10'
 
-    @api.depends('line_ids.status')
-    def _compute_readonly_custom_made_type(self):
-        for line in self:
-            production_demand_plan = line.line_ids.filtered(
-                lambda p: p.status in ('50', '60') and p.new_supply_method == 'custom_made')
-            line.readonly_custom_made_type = bool(production_demand_plan)
-
-    @api.constrains('line_ids')
-    def check_line_ids(self):
-        for item in self:
-            if not item.line_ids:
-                raise ValidationError('计划不能为空！')
-
     def write(self, vals):
-        res = super(SfDemandPlan, self).write(vals)
+        res = super(SfDemandMainPlan, self).write(vals)
+        line_ids = self.line_ids.filtered(lambda p: p.plan_uom_qty == 0 or p.plan_uom_qty < 0)
+        if line_ids:
+            raise ValidationError(f"计划量不能小于等于0")
         if 'line_ids' in vals:
             for line in self.line_ids:
                 if not line.sale_order_id:
@@ -215,51 +202,5 @@ class SfDemandPlan(models.Model):
     def name_get(self):
         result = []
         for plan in self:
-            result.append((plan.id, plan.demand_plan_number))
+            result.append((plan.id, plan.sale_order_id.name))
         return result
-
-    def button_production_release_plan(self):
-        line_ids = self.line_ids.filtered(lambda p: p.status == '30')
-        sum_product_uom_qty = sum(line_ids.mapped('plan_uom_qty'))
-        customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-        check_overdelivery_allowed = False
-        for line in line_ids:
-            if line.location_id.id == customer_location_id:
-                if not self.overdelivery_allowed:
-                    if float_compare(sum_product_uom_qty, self.product_uom_qty,
-                                     precision_rounding=line.product_id.uom_id.rounding) == 1:
-                        check_overdelivery_allowed = True                
-        if check_overdelivery_allowed:
-             raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-        elif float_compare(sum_product_uom_qty, self.product_uom_qty,
-                           precision_rounding=self.product_id.uom_id.rounding) == 1:
-            return {
-                'name': _('需求计划'),
-                'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
-                    'sf_demand_plan.sf_release_plan_wizard_form').id,
-                           'form')],
-                'res_model': 'sf.release.plan.wizard',
-                'target': 'new',
-                'context': {
-                    'default_demand_plan_line_id': line_ids.ids,
-                    'default_release_message': f"您正在下达计划量 {sum_product_uom_qty}，需求数量为 {self.product_uom_qty}，已超过需求数量，是否继续？",
-                }}
-        else:
-            for demand_plan_line_id in line_ids:
-                demand_plan_line_id.action_confirm()
-
-    # 需求要求取值格式是来源+来源明细行ID,但是来源明细行ID取得就是product_id.name得最后一位，所以这里也直接截取product_id.name
-    @api.depends('product_id.name')
-    def _compute_demand_plan_number(self):
-        for line in self:
-            product_name = line.product_id.name or ''
-            plan_no = None
-            if line.product_id:
-                # 使用正则表达式匹配P-后面的所有字符
-                match = re.search(r'P-(.*)', product_name)
-                if match:
-                    plan_no = match.group(1)
-                line.demand_plan_number = plan_no
-            else:
-                line.demand_plan_number = None

sf_demand_plan/models/sf_production_demand_plan.py

@@ -12,29 +12,54 @@ import re
 class SfProductionDemandPlan(models.Model):
     _name = 'sf.production.demand.plan'
     _description = 'sf_production_demand_plan'
-
     def get_location_id(self):
-        customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
+        stock_location = self.env['stock.location'].sudo().search([('name', '=', '客户')], limit=1)
-        return customer_location_id
+        return stock_location.id   
+
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
+    demand_plan_id = fields.Many2one(comodel_name="sf.demand.main.plan",
+                                     string="物料需求", readonly=True)
+    priority = fields.Selection([
+        ('1', '紧急'),
+        ('2', '高'),
+        ('3', '中'),
+        ('4', '低'),
+    ], string='优先级', related='demand_plan_id.priority')
 
-    priority = fields.Selection(related='demand_plan_id.priority', string='优先级', store=True)
     status = fields.Selection([
         ('10', '草稿'),
         ('20', '待确认'),
-        ('30', '待工艺设计'),
+        ('30', '需求确认'),
         ('50', '待下达生产'),
         ('60', '已下达'),
         ('100', '取消'),
         ], string='状态', default='30', readonly=True)
-    demand_plan_id = fields.Many2one(comodel_name="sf.demand.plan",
+    
-                                     string="物料需求", readonly=True)
+    plan_uom_qty = fields.Float(string="计划量")
-    sale_order_id = fields.Many2one(comodel_name="sale.order", string="销售订单", readonly=True)
+    procurement_reason = fields.Selection([
-    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line", string="销售订单明细", readonly=True)
+        ('销售订单', "销售订单"),
+        ('需求预测', "需求预测"),
+        ('生产报废', "生产报废"),
+    ], string='补货原因', default='销售订单')
+
+    blank_arrival_date = fields.Date('采购计划到货(坯料)')
+    finished_product_arrival_date = fields.Date('采购计划到货(成品)')
+    bom_id = fields.Many2one('mrp.bom', string="BOM", readonly=True)
+    location_id = fields.Many2one('stock.location', string='需求位置', default=get_location_id, readonly=True)
+
+
+    sale_order_id = fields.Many2one(comodel_name="sale.order",
+                                    string="销售订单", readonly=True)
+    sale_order_line_id = fields.Many2one(comodel_name="sale.order.line",
+                                         string="销售订单明细", readonly=True)
     sale_order_line_number = fields.Char(string='销售订单行', compute='_compute_sale_order_line_number', store=True)
     company_id = fields.Many2one(
         related='sale_order_id.company_id',
         store=True, index=True, precompute=True)
-    customer_name = fields.Char('客户', related='sale_order_id.customer_name', store=True)
+    customer_name = fields.Char('客户', related='sale_order_id.customer_name')
     order_remark = fields.Text(related='sale_order_id.remark',
                                string="订单备注", store=True)
     glb_url = fields.Char(related='sale_order_line_id.glb_url', string='glb文件地址')
@@ -45,25 +70,14 @@ class SfProductionDemandPlan(models.Model):
     model_id = fields.Char('模型ID', related='product_id.model_id')
     part_name = fields.Char('零件名称', related='product_id.part_name')
     part_number = fields.Char('零件图号', related='demand_plan_id.part_number')
+    #part_number = fields.Char('零件图号', compute='_compute_part_number', store=True)
     is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
-
-    new_supply_method = fields.Selection([
-        ('custom_made', "自制"),
-        ('purchase', "外购"),
-        ('outsourcing', "委外加工"),
-    ], string='供货方式', required=True)
-
-    custom_made_type = fields.Selection([
-        ('automation', "自动化产线加工"),
-        ('manual', "人工线下加工"),
-    ], string='产线类型', compute='_compute_custom_made_type', store=True)
-
     supply_method = fields.Selection([
         ('automation', "自动化产线加工"),
         ('manual', "人工线下加工"),
         ('purchase', "外购"),
         ('outsourcing', "委外加工"),
-    ], string='供货方式', compute='_compute_supply_method', store=True, readonly=True)
+        ], string='供货方式', default='manual')
     product_uom_qty = fields.Float(
         string="需求数量",
         related='sale_order_line_id.product_uom_qty', store=True)
@@ -71,30 +85,56 @@ class SfProductionDemandPlan(models.Model):
     inventory_quantity_auto_apply = fields.Float(
         string="成品库存",
         related='demand_plan_id.inventory_quantity_auto_apply'
+        #compute='_compute_inventory_quantity_auto_apply'
     )
     qty_delivered = fields.Float(
         "交货数量", related='sale_order_line_id.qty_delivered')
     qty_to_deliver = fields.Float(
-        "待交货数量", compute='_compute_qty_to_deliver', store=True)
+        "待交货数量", related='sale_order_line_id.qty_to_deliver')
     model_long = fields.Char('尺寸(mm)', compute='_compute_model_long')
     blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
                                   related='product_id.blank_type')
-    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型',
+<<<<<<< HEAD
-                                       related='product_id.blank_precision')
+    #blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', related='product_id.blank_precision')
-    unit_number = fields.Float('单件用量', digits=(16, 3), related='product_id.unit_number')
+    #materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
     embryo_long = fields.Char('坯料尺寸(mm)', related='demand_plan_id.embryo_long')
-    materials_id = fields.Char('材料', related='demand_plan_id.materials_id', store=True)
+    materials_id = fields.Char('材料', related='demand_plan_id.materials_id')
-    model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
+
+=======
+    blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', related='product_id.blank_precision')
+    embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long')
+    materials_id = fields.Char('材料', compute='_compute_materials_id', store=True)
+>>>>>>> develop
+    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',
+                                                 related='product_id.model_machining_precision')
+    #model_process_parameters_ids = fields.Many2many('sf.production.process.parameter',
+     #                                               'plan_process_parameter_rel',
+     #                                               string='表面工艺',
+     #                                               compute='_compute_model_process_parameters_ids'
+     #                                               , store=True
+     #                                               )
     model_process_parameters_ids = fields.Many2many(related='demand_plan_id.model_process_parameters_ids',
                                                     string='表面工艺', )
+
     product_remark = fields.Char("产品备注", related='product_id.model_remark')
     order_code = fields.Char('E-SHOP订单号', related='sale_order_id.order_code')
-    order_state = fields.Selection(
+<<<<<<< HEAD
-        string='订单状态',
+    order_state = fields.Selection( string='订单状态',related='sale_order_line_id.state')
-        related='sale_order_line_id.state')
+    
+    #route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
     route_ids = fields.Many2many('stock.route', 'stock_route_demand_plan', 'demand_plan_id', 'route_id', '库存路线',
                                 domain=[('demand_plan_selectable', '=', True)], compute='_compute_route_ids',
                                 store=True)
+
+=======
+    order_state = fields.Selection(
+        string='订单状态',
+        related='sale_order_line_id.state')
+    route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
+    route_ids = fields.Many2many('stock.route', 'stock_route_demand_plan', 'demand_plan_id', 'route_id', '路线',
+                                 domain=[('demand_plan_selectable', '=', True)], compute='_compute_route_ids',
+                                 store=True)
+>>>>>>> develop
     contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
     date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
     contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
@@ -115,24 +155,12 @@ class SfProductionDemandPlan(models.Model):
         compute='_compute_mrp_production_ids',
         string='与此相需求计划关联的制造订单',
         store=True)
-
     hide_release_production_order = fields.Boolean(
         string='显示下发生产按钮',
         compute='_compute_hide_release_production_order',
         default=False
     )
 
-    readonly_custom_made_type = fields.Boolean(
-        related='demand_plan_id.readonly_custom_made_type',
-        string='字段自制类型只读'
-    )
-
-    is_processing = fields.Boolean(
-        string='正在处理中',
-        default=False,
-        help='用于防止重复点击按钮'
-    )
-
     # hide_action_open_mrp_production = fields.Boolean(
     #     string='显示待工艺确认按钮',
     #     compute='_compute_hid_button',
@@ -164,76 +192,6 @@ class SfProductionDemandPlan(models.Model):
     # )
     #
     # outsourcing_purchase_request = fields.Char('委外采购申请单')
-
-    plan_uom_qty = fields.Float(string="计划量", required=True)
-    procurement_reason = fields.Selection([
-        ('销售订单', "销售订单"),
-        ('需求预测', "需求预测"),
-        ('生产报废', "生产报废"),
-    ], string='补货原因', default='销售订单', readonly=True)
-
-    blank_arrival_date = fields.Date('采购计划到货(坯料)')
-    finished_product_arrival_date = fields.Date('采购计划到货(成品)')
-    bom_id = fields.Many2one('mrp.bom', string="BOM", readonly=True)
-    location_id = fields.Many2one('stock.location', string='需求位置', default=get_location_id, readonly=True)
-    manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False)
-
-    @api.constrains('plan_uom_qty')
-    def _check_plan_uom_qty(self):
-        line_ids = self.filtered(lambda p: p.plan_uom_qty == 0 or p.plan_uom_qty < 0)
-        if line_ids:
-            raise ValidationError(_("计划量不能小于等于0"))
-
-    @api.constrains('supply_method')
-    def _check_supply_method(self):
-        product_name = []
-        product = []
-        for line in self:
-            if line.supply_method == 'purchase' and line.is_incoming_material:
-                product_name.append(line.product_id.display_name)
-            if line.supply_method == 'automation' and line.manual_quotation:
-                product.append(line.product_id.display_name)
-
-        if product_name:
-            unique_product_names = list(set(product_name))
-            raise UserError('当前（%s）产品为客供料，不能选择外购' % ','.join(unique_product_names))
-        if product:
-            unique_product = list(set(product))
-            raise UserError('当前（%s）产品为人工编程，不能选择自动化产线加工' % ','.join(unique_product))
-
-    @api.depends('new_supply_method')
-    def _compute_custom_made_type(self):
-        DemandPlan = self.env['sf.production.demand.plan'].sudo()
-        for line in self:
-            if line.new_supply_method != "custom_made":
-                line.custom_made_type = False
-            else:
-                demand_plan_id = line.demand_plan_id._origin.id
-                demand_plan = DemandPlan.search([
-                    ('demand_plan_id', '=', demand_plan_id),
-                    ('new_supply_method', '=', 'custom_made'),
-                    ('status', 'in', ('50', '60'))
-                ], limit=1)
-                if demand_plan:
-                    line.custom_made_type = demand_plan.custom_made_type
-
-    @api.depends('new_supply_method', 'custom_made_type')
-    def _compute_supply_method(self):
-        for line in self:
-            if line.new_supply_method == 'custom_made':
-                line.supply_method = line.custom_made_type
-            else:
-                line.supply_method = line.new_supply_method
-
-    @api.depends('sale_order_line_id.qty_to_deliver')
-    def _compute_qty_to_deliver(self):
-        for line in self:
-            if float_compare(line.sale_order_line_id.qty_to_deliver, 0,
-                             precision_rounding=line.product_id.uom_id.rounding) == -1:
-                line.qty_to_deliver = 0
-            else:
-                line.qty_to_deliver = line.sale_order_line_id.qty_to_deliver
-
     @api.depends('supply_method')
     def _compute_route_ids(self):
         for pdp in self:
@@ -246,6 +204,74 @@ class SfProductionDemandPlan(models.Model):
                     continue
             pdp.route_ids = None
 
+<<<<<<< HEAD
+=======
+    hide_action_stock_picking = fields.Boolean(
+        string='显示调拨单按钮',
+        compute='_compute_hide_action_stock_picking',
+        default=False
+    )
+
+    hide_action_outsourcing_stock_picking = fields.Boolean(
+        string='委外显示调拨单按钮',
+        compute='_compute_hide_action_stock_picking',
+        default=False
+    )
+
+    hide_action_view_programming = fields.Boolean(
+        string='显示编程单按钮',
+        compute='_compute_hid_button',
+        default=False
+    )
+
+    outsourcing_purchase_request = fields.Char('委外采购申请单')
+
+    @api.depends('supply_method')
+    def _compute_route_ids(self):
+        for pdp in self:
+            if pdp.supply_method:
+                group_id = self.env['stock.route.group'].sudo().search([('code', '=', pdp.supply_method)])
+                route_ids = self.env['stock.route'].sudo().search(
+                    [('demand_plan_selectable', '=', True), ('stock_route_group_ids', '=', group_id.id)])
+                if route_ids:
+                    pdp.route_ids = route_ids.ids
+                    break
+            pdp.route_ids = None
+
+    @api.depends('sale_order_id.state', 'sale_order_id.mrp_production_ids.schedule_state', 'sale_order_id.order_line',
+                 'sale_order_id.mrp_production_ids.state')
+    def _compute_status(self):
+        for record in self:
+            if record.sale_order_id:
+                sale_order_state = record.sale_order_id.state
+                if sale_order_state in ('draft', 'sent', 'supply method'):
+                    record.status = '20'  # 待确认
+                if record.supply_method in ('purchase', 'outsourcing') and sale_order_state in (
+                        'sale', 'processing', 'physical_distribution', 'delivered',
+                        'done') and sale_order_state != 'cancel':
+                    record.status = '60'  # 已下达
+                if record.supply_method in ('automation', 'manual'):
+                    if sale_order_state in (
+                            'sale', 'processing', 'physical_distribution', 'delivered',
+                            'done') and sale_order_state != 'cancel':
+                        record.status = '30'  # 需求确认
+                    # 检查所有制造订单的排程单状态,有一个为待排程状态,就为待下达生产
+                    pending_productions = record.sale_order_id.mrp_production_ids.filtered(
+                        lambda p: p.state == 'confirmed' and p.product_id.id == record.product_id.id
+                    )
+                    if pending_productions:
+                        record.status = '50'  # 待下达生产
+                    # 检查所有制造订单的排程单状态
+                    if record.sale_order_id.mrp_production_ids:
+                        product_productions = record.sale_order_id.mrp_production_ids.filtered(
+                            lambda p: p.product_id.id == record.product_id.id
+                        )
+                        if product_productions and all(order.schedule_state != '未排' for order in product_productions):
+                            record.status = '60'  # 已下达
+                if sale_order_state == 'cancel' or not record.sale_order_line_id:
+                    record.status = '100'  # 取消
+>>>>>>> develop
+
     @api.depends('sale_order_line_id.product_id.name')
     def _compute_sale_order_line_number(self):
         for line in self:
@@ -262,26 +288,84 @@ class SfProductionDemandPlan(models.Model):
             else:
                 line.model_long = None
 
-    @api.depends('mrp_production_ids.workorder_ids.date_start')
+<<<<<<< HEAD
+=======
+    @api.depends('product_id.model_long', 'product_id.model_width', 'product_id.model_height', 'product_id.blank_type')
+    def _compute_embryo_long(self):
+        for line in self:
+            if line.product_id:
+                if line.product_id.blank_type == '圆料':
+                    line.embryo_long = f"Ø{round(line.product_id.model_width, 3)}*{round(line.product_id.model_long, 3)}"
+                else:
+                    line.embryo_long = f"{round(line.product_id.model_long, 3)}*{round(line.product_id.model_width, 3)}*{round(line.product_id.model_height, 3)}"
+            else:
+                line.embryo_long = None
+
+    @api.depends('product_id.materials_id')
+    def _compute_materials_id(self):
+        for line in self:
+            if line.product_id:
+                line.materials_id = f"{line.product_id.materials_id.name}/{line.product_id.materials_type_id.name}"
+            else:
+                line.materials_id = None
+
+    @api.depends('product_id.model_process_parameters_ids')
+    def _compute_model_process_parameters_ids(self):
+        for line in self:
+            if line.product_id and line.product_id.model_process_parameters_ids:
+                line.model_process_parameters_ids = [(6, 0, line.product_id.model_process_parameters_ids.ids)]
+            else:
+                line.model_process_parameters_ids = [(5, 0, 0)]
+
+    def _compute_inventory_quantity_auto_apply(self):
+        location_id = self.env['stock.location'].search([('name', '=', '成品存货区')], limit=1).id
+        product_ids = self.mapped('product_id').ids
+        if product_ids:
+            quant_data = self.env['stock.quant'].read_group(
+                domain=[
+                    ('product_id', 'in', product_ids),
+                    ('location_id', '=', location_id)
+                ],
+                fields=['product_id', 'inventory_quantity_auto_apply'],
+                groupby=['product_id']
+            )
+            quantity_map = {item['product_id'][0]: item['inventory_quantity_auto_apply'] for item in quant_data}
+        else:
+            quantity_map = {}
+        for line in self:
+            if line.product_id:
+                line.inventory_quantity_auto_apply = quantity_map.get(line.product_id.id, 0.0)
+            else:
+                line.inventory_quantity_auto_apply = 0.0
+
+>>>>>>> develop
+    @api.depends('sale_order_id.mrp_production_ids.workorder_ids.date_start')
     def _compute_actual_start_date(self):
         for record in self:
-            if record.mrp_production_ids:
+            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:
                     start_dates = [
-                    workorder.date_start for mo in record.mrp_production_ids
+                        workorder.date_start for mo in manufacturing_orders
                         for workorder in mo.workorder_ids if workorder.date_start
                     ]
                     record.actual_start_date = min(start_dates) if start_dates else None
                 else:
                     record.actual_start_date = None
+            else:
+                record.actual_start_date = None
 
-    @api.depends('mrp_production_ids.workorder_ids.state',
+    @api.depends('sale_order_id.mrp_production_ids.workorder_ids.state',
-                 'mrp_production_ids.workorder_ids.date_finished')
+                 'sale_order_id.mrp_production_ids.workorder_ids.date_finished')
     def _compute_actual_end_date(self):
         for record in self:
-            if record.mrp_production_ids:
+            if record.sale_order_id and record.sale_order_id.mrp_production_ids:
-                finished_orders = record.mrp_production_ids.filtered(lambda mo: mo.state == 'done')
+                manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
+                    lambda mo: mo.product_id == record.product_id)
+                finished_orders = manufacturing_orders.filtered(lambda mo: mo.state == 'done')
                 sum_product_qty = sum(finished_orders.mapped('product_qty'))
-                if finished_orders and float_compare(sum_product_qty, record.plan_uom_qty,
+                if finished_orders and float_compare(sum_product_qty, record.product_uom_qty,
                                                      precision_rounding=record.product_id.uom_id.rounding) >= 0:
                     end_dates = [
                         workorder.date_finished for mo in finished_orders
@@ -293,17 +377,20 @@ class SfProductionDemandPlan(models.Model):
             else:
                 record.actual_end_date = None
 
-    @api.depends('mrp_production_ids.move_raw_ids.reserved_availability')
+    @api.depends('sale_order_id.mrp_production_ids.move_raw_ids.reserved_availability')
     def _compute_material_check(self):
         for record in self:
-            if record.mrp_production_ids and record.mrp_production_ids.move_raw_ids:
+            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:
                     # 获取完成的制造订单
-                done_manufacturing = record.mrp_production_ids.filtered(lambda mo: mo.state == 'done')
+                    done_manufacturing = manufacturing_orders.filtered(lambda mo: mo.state == 'done')
                     product_qty = sum(done_manufacturing.mapped('product_qty'))
                     # 需求数量-完成数量
-                product_uom_qty = record.plan_uom_qty - product_qty
+                    product_uom_qty = record.product_uom_qty - product_qty
-                total_reserved_availability = sum(
+                    total_reserved_availability = sum(manufacturing_orders.mapped('move_raw_ids.reserved_availability'))
-                    record.mrp_production_ids.mapped('move_raw_ids.reserved_availability'))
                     if float_compare(total_reserved_availability, product_uom_qty,
                                      precision_rounding=record.product_id.uom_id.rounding) >= 0:
                         record.material_check = '1'  # 已齐套
@@ -311,6 +398,8 @@ class SfProductionDemandPlan(models.Model):
                         record.material_check = '0'  # 未齐套
                 else:
                     record.material_check = None
+            else:
+                record.material_check = None
 
     @api.depends('status')
     def _compute_mrp_production_ids(self):
@@ -324,11 +413,10 @@ class SfProductionDemandPlan(models.Model):
     @api.depends('mrp_production_ids.state')
     def _compute_hide_release_production_order(self):
         for record in self:
-            # 检查这条需求计划所有制造订单的排程单状态,有一个为待排程状态,就显示改按钮
+            # 检查这条需求计划所有制造订单的排程单状态,有一个为待排程状态,就显示该按钮
             record.hide_release_production_order = bool(record.mrp_production_ids.filtered(
                 lambda p: p.state == 'confirmed'
             ))
-
     @api.constrains('planned_start_date')
     def _check_planned_start_date(self):
         for record in self:
@@ -358,37 +446,22 @@ class SfProductionDemandPlan(models.Model):
         for pro_plan in pro_plan_list:
             pro_plan.do_production_schedule()
 
+<<<<<<< HEAD
     def update_sale_order_state(self):
-        # demand_plan = self.env['sf.demand.plan'].sudo().search([('sale_order_id', '=', self.sale_order_id.id)])
+        demand_plan = self.env['sf.demand.main.plan'].sudo().search([('sale_order_id', '=', self.sale_order_id.id)])
-        # demand_plan_state = demand_plan.filtered(lambda line: line.state != '40')
+        demand_plan_state = demand_plan.filtered(lambda line: line.state != '40')
-        production_demand_plan = self.env['sf.production.demand.plan'].sudo().search(
+        if not demand_plan_state:
-            [('sale_order_id', '=', self.sale_order_id.id)])
-        production_demand_plan_state = production_demand_plan.filtered(lambda line: line.status in ('10', '20', '30'))
-        if not production_demand_plan_state:
             # 修改销售订单为加工中
             self.sale_order_id.state = 'processing'
 
-    def edit_button(self):
+=======
-        self.ensure_one()
+>>>>>>> develop
-        action = {
-            'name': _("需求计划"),
-            'type': 'ir.actions.act_window',
-            'view_mode': 'form',
-            'views': [[self.env.ref('sf_demand_plan.view_sf_demand_plan_form').id, 'form']],
-            'res_model': 'sf.demand.plan',
-            'res_id': self.demand_plan_id.id,
-        }
-        if self.demand_plan_id.state == '40':
-            action.update({'flags': {'mode': 'readonly'}})
-        return action
-
     def button_action_print(self):
-        model_id = self.mapped('model_id')
         return {
             'res_model': 'sf.demand.plan.print.wizard',
             'type': 'ir.actions.act_window',
             'name': _("打印"),
-            'domain': [('model_id', 'in', model_id)],
+            'domain': [('demand_plan_id', 'in', self.ids)],
             'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
             'target': 'new',
         }
@@ -601,96 +674,44 @@ class SfProductionDemandPlan(models.Model):
     #         programming_no = list(set(programming_mrp_production_ids))
     #         numbers_str = "、".join(programming_no)
     #         raise ValidationError(f"编程单号：{numbers_str}，请去云平台处理")
-    @api.model
-    def unlink(self):
-        for item in self:
-            if item.status not in ('10', '20', '30'):
-                raise ValidationError(u'只能删除状态为【草稿,待确认，待工艺设计】的需求计划。')
-            else:
-                super(SfProductionDemandPlan, item).unlink()
     
-    def button_batch_release_plan(self):
+    def action_edit_demand_plan_form(self):
-        filtered_plan = self.filtered(lambda mo: mo.status == '30')
+        """编辑需求计划详细信息"""
-        if not filtered_plan:
+        self.ensure_one()
-            raise UserError(_("没有需要下达的计划！"))
+        action = {
-        # 按产品分组并计算总数
+            'name': _("需求计划"),
-        product_data = {}
-        for plan in filtered_plan:
-            check_overdelivery_allowed = False
-            if not plan.demand_plan_id.overdelivery_allowed:
-                customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-                if plan.location_id.id == customer_location_id:
-                    check_overdelivery_allowed = True 
-            if plan.product_id not in product_data:
-                # 初始化产品数据，从产品上获取需求量
-                product_data[plan.product_id] = {
-                    'plan_uom_qty': 0.0,
-                    'product_uom_qty': plan.product_uom_qty
-                }
-
-            # 累加计划数量
-            product_data[plan.product_id]['plan_uom_qty'] += plan.plan_uom_qty
-            product_data[plan.product_id]['overdelivery_allowed'] = check_overdelivery_allowed
-        # 检查需求超过计划数量的产品
-        warning_messages = []
-        error_messages = []
-        for product, data in product_data.items():
-            if data['overdelivery_allowed'] and float_compare(data['plan_uom_qty'], data['product_uom_qty'],precision_rounding=product.uom_id.rounding) == 1:
-                error_messages.append(f"您正在下达的产品 {product.display_name},已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-            elif float_compare(data['plan_uom_qty'], data['product_uom_qty'],
-                             precision_rounding=product.uom_id.rounding) == 1:
-                warning_messages.append(
-                    _("您正在下达的产品 %s，计划量%s，需求数量为%s，已超过需求数量") %
-                    (product.display_name, data['plan_uom_qty'], data['product_uom_qty'])
-                )
-        if error_messages:
-            error_message = "\n".join(error_messages)
-            raise ValidationError(error_message)
-        elif warning_messages:
-            warning_message = "\n".join(warning_messages)
-            return {
-                'name': _('需求计划'),
             'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
+            'view_mode': 'form',
-                    'sf_demand_plan.sf_release_plan_wizard_form').id,
+            'views': [[self.env.ref('sf_demand_plan.view_sf_demand_main_plan_form').id, 'form']],
-                           'form')],
+            'res_model': 'sf.demand.main.plan',
-                'res_model': 'sf.release.plan.wizard',
+            'res_id': self.demand_plan_id.id,
-                'target': 'new',
+        }
-                'context': {
+        #打开需求计划视图时，如果状态时已下达，则只读，不能添加明细了
-                    'default_demand_plan_line_id': self.ids,
+        if self.demand_plan_id.state == '40':
-                    'default_release_message': warning_message,
+            action.update({'flags': {'mode': 'readonly'}})
-                }}
+        return action
-        else:
+    #删除需求计划
-            for demand_plan_line_id in filtered_plan:
+    def button_delete(self):
-                demand_plan_line_id.action_confirm()
+        self.ensure_one()
-
+        if len(self.demand_plan_id.line_ids) == 1:
+            raise ValidationError(f"最后一条计划，不能删除！")
+        self.unlink()
+    #需求明细行里下达需求计划
     def button_release_plan(self):
         self.ensure_one()
-        if self.is_processing:
+        if not self.supply_method:
-            return
+            raise ValidationError(f"供货方式不能为空！")
-        self.is_processing = True
+        #点击时校验，累计计划量>需求数量，则提示，新增了个提示确认视图
-        check_overdelivery_allowed = False
+        if self.plan_uom_qty > self.product_uom_qty:
-        if not self.demand_plan_id.overdelivery_allowed:
-            customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-            if self.location_id.id == customer_location_id:
-                check_overdelivery_allowed = True
-        if check_overdelivery_allowed:
-            if float_compare(self.plan_uom_qty, self.product_uom_qty,
-                             precision_rounding=self.product_id.uom_id.rounding) == 1:
-                raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-        elif float_compare(self.plan_uom_qty, self.product_uom_qty,
-                           precision_rounding=self.product_id.uom_id.rounding) == 1:
             return {
                 'name': _('需求计划'),
                 'type': 'ir.actions.act_window',
-                'views': [(self.env.ref(
+                'views': [(self.env.ref('sf_demand_plan.sf_release_plan_wizard_form').id,'form')],
-                    'sf_demand_plan.sf_release_plan_wizard_form').id,
-                           'form')],
                 'res_model': 'sf.release.plan.wizard',
                 'target': 'new',
                 'context': {
-                    'default_demand_plan_line_id': self.ids,
+                    'default_demand_plan_line_id': self.id,
-                    'default_release_message': f"您正在下达计划量 {self.plan_uom_qty}，需求数量为 {self.product_uom_qty}，已超过需求数量，是否继续？",
+                    'default_release_message': f"您正在下达计划量 {self.plan_uom_qty}，累计计划量为 {self.demand_plan_id.planned_qty}，需求数量为 {self.product_uom_qty}，已超过需求数量，是否继续？",
                 }}
         self.action_confirm()
 
@@ -700,14 +721,29 @@ class SfProductionDemandPlan(models.Model):
         )
         self.mrp_bom_create()
         self._action_launch_stock_rule()
+        #自动化产线，人工产线，待下达生产
         if self.supply_method in ('automation', 'manual'):
             self.write({'status': '50'})
-            self.update_sale_order_state()
         else:
+            #外购，委外，已下达
             self.write({'status': '60'})
             self.update_sale_order_state()
 
     def mrp_bom_create(self):
+        # 检查是否已有相同供货方式的BOM
+        if self.supply_method in ('automation', 'manual'):
+            #同一需求计划下，相同供货方式的产品可以共享BOM
+            line_ids = self.demand_plan_id.line_ids.filtered(
+                lambda p: p.supply_method in ('automation', 'manual') and p.status in ('50', '60'))
+            if line_ids:                                                                                                                                                                                                                             
+                self.bom_id = line_ids[0].bom_id.id # 复用已有BOM
+                return
+        elif self.supply_method == 'outsourcing':
+            line_ids = self.demand_plan_id.line_ids.filtered(
+                lambda p: p.supply_method == 'outsourcing' and p.status == '60')
+            if line_ids:
+                self.bom_id = line_ids[0].bom_id.id
+                return
         bom_type = ''
         # 根据供货方式修改成品模板
         if self.supply_method == 'automation':
@@ -727,21 +763,9 @@ class SfProductionDemandPlan(models.Model):
 
         # 复制成品模板上的属性
         self.product_id.product_tmpl_id.copy_template(product_template_id)
-        if self.supply_method in ('automation', 'manual'):
+
-            line_ids = self.demand_plan_id.line_ids.filtered(
-                lambda p: p.supply_method in ('automation', 'manual') and p.status in ('50', '60'))
-            if line_ids:
-                self.bom_id = line_ids[0].bom_id.id
-                return
-        elif self.supply_method == 'outsourcing':
-            line_ids = self.demand_plan_id.line_ids.filtered(
-                lambda p: p.supply_method == 'outsourcing' and p.status == '60')
-            if line_ids:
-                self.bom_id = line_ids[0].bom_id.id
-                return
-        future_time = datetime.now() + timedelta(hours=8)
         # 生成BOM单据编码
-        code = f"{self.product_id.default_code}-{bom_type}-{future_time.strftime('%Y%m%d%H%M%S')}"
+        code = f"{self.product_id.default_code}-{bom_type}-{datetime.now().strftime('%Y%m%d%H%M%S')}"
 
         order_id = self.sale_order_id
         product = self.product_id
@@ -839,12 +863,7 @@ class SfProductionDemandPlan(models.Model):
                 self.bom_id = product_bom_outsource.id
             elif self.product_id.materials_type_id.gain_way == '采购':
                 purchase_id = self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo()
-                purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id,
+                purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id,item,order_id,'purchase',product_seria,product)
-                                                                                            item,
-                                                                                            order_id,
-                                                                                            'purchase',
-                                                                                            product_seria,
-                                                                                            product)
                 if purchase_embryo and purchase_embryo == -3:
                     raise UserError('该订单模型的材料型号暂未设置获取方式和供应商,请先配置再进行分配')
                 else:
@@ -855,8 +874,10 @@ class SfProductionDemandPlan(models.Model):
                         purchase_embryo)
                     self.bom_id = product_bom_purchase.id
 
+    #以下方法待了解
     def _action_launch_stock_rule(self):
         procurements = []
+        #创建采购需求
         group_id = self.sale_order_id.procurement_group_id
         if not group_id:
             group_id = self.env['procurement.group'].create(self._prepare_procurement_group_vals())
@@ -873,6 +894,7 @@ class SfProductionDemandPlan(models.Model):
         line_uom = self.sale_order_line_id.product_uom
         quant_uom = self.product_id.uom_id
         plan_uom_qty, procurement_uom = line_uom._adjust_uom_quantities(self.plan_uom_qty, quant_uom)
+        #运行采购规则
         procurements.append(self.env['procurement.group'].Procurement(
             self.product_id, plan_uom_qty, procurement_uom,
             self.sale_order_id.partner_shipping_id.property_stock_customer,
@@ -881,6 +903,7 @@ class SfProductionDemandPlan(models.Model):
             procurement_group = self.env['procurement.group']
             if self.env.context.get('import_file'):
                 procurement_group = procurement_group.with_context(import_file=False)
+            #确认拣货单
             procurement_group.run(procurements)
         orders = self.mapped('sale_order_id')
         for order in orders:
@@ -919,5 +942,5 @@ class SfProductionDemandPlan(models.Model):
         }
         return values
 
-    def button_plan_detail(self):
+
-        pass
+        

sf_demand_plan/models/stock_route.py

@@ -19,7 +19,11 @@ class SfStockRoute(models.Model):
                     [('supply_method', 'in', stock_route_group)])
                 if demand_plan_ids:
                     sr.demand_plan_ids = demand_plan_ids.ids
+<<<<<<< HEAD
                     continue
+=======
+                    break
+>>>>>>> develop
             sr.demand_plan_ids = None
 
     # def name_get(self):

sf_demand_plan/security/ir.model.access.csv

@@ -5,12 +5,16 @@ access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for disp
 access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
 access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0
 
-
+<<<<<<< HEAD
-access_sf_demand_plan,sf.demand.plan,model_sf_demand_plan,base.group_user,1,0,0,0
+access_sf_demand_main_plan,sf.demand.main.plan,model_sf_demand_main_plan,base.group_user,1,0,0,0
-access_sf_demand_plan_for_dispatch,sf.demand.plan for dispatch,model_sf_demand_plan,sf_base.group_plan_dispatch,1,1,0,0
+access_sf_demand_main_plan_for_dispatch,sf.demand.main.plan for dispatch,model_sf_demand_main_plan,sf_base.group_plan_dispatch,1,1,0,0
 
 access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
 access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
 
 access_sf_release_plan_wizard,sf.release.plan.wizard,model_sf_release_plan_wizard,base.group_user,1,0,0,0
 access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1
+=======
+access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
+access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
+>>>>>>> develop

sf_demand_plan/static/src/js/custom_button.js

@@ -1,59 +0,0 @@
-/** @odoo-module **/
-
-import { registry } from "@web/core/registry";
-import { ListRenderer } from "@web/views/list/list_renderer";
-import { useService } from "@web/core/utils/hooks";
-import { useEffect } from "@odoo/owl";
-
-export class CustomDemandPlanListRenderer extends ListRenderer {
-    setup() {
-        super.setup();
-        this.orm = useService("orm");
-        this.notification = useService("notification");
-        console.log('setup', this.props);
-
-        // 监听selection属性的变化
-        useEffect(() => {
-            this.updateButtonState();
-        }, () => [this.props.list.selection]);
-    }
-
-    /**
-     * 更新按钮状态
-     */
-    async updateButtonState() {
-        const selectedRecords = this.props.list.selection;
-        const isStatus30 = selectedRecords.some(record => record.data.status != "30");
-        const button = $(this.__owl__.parent.bdom.parentEl).find('button[name="button_batch_release_plan"]');
-        console.log('isStatus30', isStatus30, button);
-        if (isStatus30) {
-            // 禁用按钮
-            button.attr('disabled', true);
-        } else {
-            button.attr('disabled', false);
-        }
-    }
-}
-// 使用setTimeout延迟注册，避免在模块加载时立即执行
-setTimeout(() => {
-    const registerCustomRenderer = () => {
-        try {
-            const listView = registry.category("views").get("list");
-            if (listView) {
-                registry.category("views").add("custom_demand_plan_list", {
-                    ...listView,
-                    Renderer: CustomDemandPlanListRenderer,
-                });
-                console.log("Custom demand plan list renderer registered successfully");
-            } else {
-                console.warn("List view not found, retrying...");
-                // 如果还没找到，再等一段时间
-                setTimeout(registerCustomRenderer, 1000);
-            }
-        } catch (error) {
-            console.error("Error registering custom renderer:", error);
-        }
-    };
-
-    registerCustomRenderer();
-}, 1000); 

sf_demand_plan/static/src/scss/style.css

@@ -83,7 +83,7 @@
     }
 }
 
-/*.demand_plan_tree th[data-name=planned_start_date] + th::before{*/
+th[data-name=processing_time] + th::before{
-/*    content: '待执行单据';*/
+    content: '待执行单据';
-/*    line-height: 38px;*/
+    line-height: 38px;
-/*}*/
+}

sf_demand_plan/views/demand_main_plan.xml

@@ -0,0 +1,70 @@
+<odoo>
+    <record id="view_sf_demand_main_plan_form" model="ir.ui.view">
+        <field name="name">sf.demand.main.plan.form</field>
+        <field name="model">sf.demand.main.plan</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <field name="hide_button_release_plan" invisible="1"/>
+                    <!--                    <button string="下达计划" name="button_release_plan" type="object"-->
+                    <!-- class="btn-primary" attrs="{'invisible': [('hide_button_release_plan', '=', False)]}"/>-->
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="product_id"/>
+                            <field name="part_name"/>
+                            <field name="part_number"/>
+                            <field name="materials_id"/>
+                            <field name="blank_type"/>
+                            <field name="embryo_long"/>
+                            <field name="is_incoming_material"/>
+                            <field name="pending_qty"/>
+                            <field name="planned_qty"/>
+                            <field name="model_id"/>
+                        </group>
+                        <group>
+                            <field name="customer_name"/>
+                            <field name="product_uom_qty"/>
+                            <field name="deadline_of_delivery"/>
+                            <field name="contract_date"/>
+                            <field name="contract_code"/>
+                            <field name="model_process_parameters_ids" widget="many2many_tags"/>
+                            <field name="model_machining_precision"/>
+                            <field name="inventory_quantity_auto_apply"/>
+                            <field name="priority" attrs="{'readonly': [('state',  'in', ('40','50'))]}"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="计划">
+                            <field name="line_ids" attrs="{'readonly': [('state', 'in', ('40','50'))]}">
+                                <tree editable="bottom" delete="false">
+                                    <field name="status"/>
+                                    <field name="supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
+                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
+                                    <field name="location_id" optional="hide"/>
+                                    <field name="bom_id" optional="hide"/>
+                                    <field name="plan_uom_qty"/>
+                                    <field name="blank_arrival_date"/>
+                                    <field name="finished_product_arrival_date"/>
+                                    <field name="planned_start_date"/>
+                                    <field name="actual_start_date"/>
+                                    <field name="actual_end_date"/>
+                                    <field name="plan_remark"/>
+                                    <field name="procurement_reason"/>
+                                    <field name="write_date" string="更新时间"/>
+                                    <field name="hide_release_production_order" invisible="1"/>
+                                    <button string="下达计划" name="button_release_plan" type="object" class="btn-primary" attrs="{'invisible': [('status', 'in', ('50','60','100'))]}" />
+                                    <button name="button_release_production" type="object" string="下发生产" class="btn-primary" attrs="{'invisible': [('hide_release_production_order', '=', False)]}" />
+                                    <button name="button_delete" type="object" string="删除" class="btn-primary" attrs="{'invisible': [('status', 'not in', ('10','20','30'))]}" confirm='是否确认删除？'/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+</odoo>

sf_demand_plan/views/demand_plan.xml

@@ -4,14 +4,10 @@
         <field name="model">sf.production.demand.plan</field>
         <field name="arch" type="xml">
             <tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
-                  class="demand_plan_tree freeze-columns-before-part_number" create="false" delete="false"
+                  class="demand_plan_tree freeze-columns-before-part_number"  create="false" delete="false">
-                  js_class="custom_demand_plan_list">
                 <header>
                     <button string="打印" name="button_action_print" type="object"
                             class="btn-primary"/>
-                    <button string="下达计划" name="button_batch_release_plan" type="object"
-                            class="btn-primary"
-                    />
                 </header>
                 <field name="sequence" widget="handle"/>
                 <field name="id" optional="hide"/>
@@ -23,34 +19,22 @@
                 <field name="model_id" optional="hide"/>
                 <field name="part_name"/>
                 <field name="part_number"/>
-                <field name="manual_quotation" optional="hide"/>
                 <field name="is_incoming_material"/>
-                <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
+                <field name="supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                <field name="readonly_custom_made_type" invisible="1"/>
-                <field name="custom_made_type"
-                       attrs="{'readonly': ['|',('status', '!=', '30'),('readonly_custom_made_type', '=', True)],
-                                           'required': [('new_supply_method', '=', 'custom_made')]}"/>
                 <field name="product_uom_qty"/>
-                <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
                 <field name="deadline_of_delivery"/>
-                <field name="inventory_quantity_auto_apply" optional="hide"/>
+                <field name="inventory_quantity_auto_apply"/>
-                <field name="qty_delivered" optional="hide"/>
+                <field name="qty_delivered"/>
-                <field name="qty_to_deliver" optional="hide"/>
+                <field name="qty_to_deliver"/>
                 <field name="model_long"/>
                 <field name="blank_type" optional="hide"/>
                 <field name="blank_precision"/>
                 <field name="embryo_long"/>
-                <field name="unit_number" optional="hide"/>
-                <field name="materials_id"/>
-                <field name="model_machining_precision"/>
-                <field name="model_process_parameters_ids" widget="many2many_tags"/>
                 <field name="product_remark" optional="hide"/>
                 <field name="order_code" optional="hide"/>
                 <field name="sale_order_id" optional="hide"/>
                 <field name="sale_order_line_number" optional="hide"/>
                 <field name="order_state"/>
-                <field name="route_ids" widget="many2many_tags" optional="hide"
-                       context="{'demand_plan_search_stock_route_id': id}"/>
                 <field name="contract_date"/>
                 <field name="date_order"/>
                 <field name="contract_code"/>
@@ -84,14 +68,10 @@
                 <field name="write_uid" optional="hide" string="更新人"/>
                 <field name="print_count"/>
                 <field name="hide_release_production_order" invisible="1"/>
-                <button string="下达计划" name="button_release_plan" type="object"
-                        class="btn-primary"
-                        attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
-                />
                 <button name="button_release_production" type="object" string="下发生产" class="btn-primary"
                         attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
                 />
-                <button name="edit_button" type="object" string="拆分" class="btn-primary"/>
+                <button name="action_edit_demand_plan_form" type="object" string="编辑" class="btn-primary"/>
             </tree>
         </field>
     </record>
@@ -130,7 +110,6 @@
             </search>
         </field>
     </record> 
-
     <record id="sf_production_demand_plan_action" model="ir.actions.act_window">
         <field name="name">需求计划</field>
         <field name="type">ir.actions.act_window</field>

sf_demand_plan/views/demand_plan_info.xml

@@ -1,123 +0,0 @@
-<odoo>
-    <record id="view_sf_demand_plan_form" model="ir.ui.view">
-        <field name="name">sf.demand.plan.form</field>
-        <field name="model">sf.demand.plan</field>
-        <field name="arch" type="xml">
-            <form>
-                <header>
-                    <field name="state" widget="statusbar"/>
-                    <field name="hide_button_release_plan" invisible="1"/>
-                    <button string="下达计划" name="button_production_release_plan" type="object"
-                            class="btn-primary"
-                            attrs="{'invisible': [('hide_button_release_plan', '=', False)]}"/>
-                </header>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="demand_plan_number"/>
-                            <field name="product_id"/>
-                            <field name="part_name"/>
-                            <field name="part_number"/>
-                            <field name="materials_id"/>
-                            <field name="blank_type"/>
-                            <field name="blank_precision"/>
-                            <field name="embryo_long"/>    
-                            <field name="manual_quotation"/>                      
-                            <field name="is_incoming_material"/>
-                            <field name="pending_qty"/>
-                            <field name="planned_qty"/>
-                            <field name="model_id"/>
-                        </group>
-                        <group>
-                            <field name="customer_name"/>
-                            <field name="product_uom_qty"/>
-                            <field name="deadline_of_delivery"/>
-                            <field name="contract_date"/>
-                            <field name="contract_code"/>
-                            <field name="model_process_parameters_ids" widget="many2many_tags"/>
-                            <field name="model_machining_precision"/>
-                            <field name="inventory_quantity_auto_apply"/>
-                            <field name="priority" attrs="{'readonly': [('state',  'in', ('40','50'))]}"/>
-                            <field name="overdelivery_allowed"/>
-                            <field name="origin"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="计划">
-                            <field name="line_ids" attrs="{'invisible': [('state', 'in', ('40','50'))]}">
-                                <tree editable="bottom" create="false" delete="false">
-                                    <field name="status"/>
-                                    <field name="readonly_custom_made_type" invisible="1"/>
-                                    <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="custom_made_type"
-                                           attrs="{
-                                             'readonly': ['|', '|', ('new_supply_method', '!=', 'custom_made'), ('status', '!=', '30'), ('readonly_custom_made_type', '=', True)],
-                                             'required': [('new_supply_method', '=', 'custom_made')]}"/>
-                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
-                                    <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide"/>
-                                    <field name="processing_time" optional="hide"/>
-                                    <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="blank_arrival_date"/>
-                                    <field name="finished_product_arrival_date"/>
-                                    <field name="planned_start_date"/>
-                                    <field name="actual_start_date"/>
-                                    <field name="actual_end_date"/>
-                                    <field name="plan_remark"/>
-                                    <field name="procurement_reason"/>
-                                    <field name="write_date" string="更新时间"/>
-                                    <field name="hide_release_production_order" invisible="1"/>
-                                    <button string="下达计划" name="button_release_plan" type="object"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
-                                    />
-                                    <button name="button_release_production" type="object" string="下发生产"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                                    />
-                                </tree>
-                            </field>
-                            <field name="line_ids" attrs="{'invisible': [('state', 'not in', ('40','50'))]}">
-                                <tree editable="bottom">
-                                    <field name="status"/>
-                                    <field name="readonly_custom_made_type" invisible="1"/>
-                                    <field name="new_supply_method" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="custom_made_type"
-                                           attrs="{
-                                             'readonly': ['|', '|', ('new_supply_method', '!=', 'custom_made'), ('status', '!=', '30'), ('readonly_custom_made_type', '=', True)],
-                                             'required': [('new_supply_method', '=', 'custom_made')]}"/>
-                                    <field name="route_ids" widget="many2many_tags" optional="hide"/>
-                                    <field name="location_id" optional="hide"/>
-                                    <field name="bom_id" optional="hide" readonly="1" options="{'no_create': True}"/>
-                                    <field name="processing_time" optional="hide"/>
-                                    <field name="plan_uom_qty" attrs="{'readonly': [('status', '!=', '30')]}"/>
-                                    <field name="blank_arrival_date"/>
-                                    <field name="finished_product_arrival_date"/>
-                                    <field name="planned_start_date"/>
-                                    <field name="actual_start_date"/>
-                                    <field name="actual_end_date"/>
-                                    <field name="plan_remark"/>
-                                    <field name="procurement_reason"/>
-                                    <field name="write_date" string="更新时间"/>
-                                    <field name="hide_release_production_order" invisible="1"/>
-                                    <button string="下达计划" name="button_release_plan" type="object"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('status', 'in', ('50','60','100'))]}"
-                                    />
-                                    <button name="button_release_production" type="object" string="下发生产"
-                                            class="btn-primary"
-                                            attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
-                                    />
-                                    <button string="详情" name="button_plan_detail" type="object"
-                                            class="btn-primary"
-                                    />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-</odoo>

sf_demand_plan/wizard/sf_demand_plan_print_wizard.py

@@ -9,6 +9,11 @@ class SfDemandPlanPrintWizard(models.TransientModel):
     _name = 'sf.demand.plan.print.wizard'
     _description = u'打印向导'
 
+    demand_plan_id = fields.Many2one('sf.production.demand.plan', string='需求计划ID')
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        related='demand_plan_id.product_id',
+        string='产品', store=True, index=True)
     model_id = fields.Char('模型ID')
     filename_url = fields.Char('文件名/URL')
     type = fields.Selection([
@@ -20,7 +25,7 @@ class SfDemandPlanPrintWizard(models.TransientModel):
         ('success', '成功'),
         ('fail', '失败'),
     ], string='状态', default='not_start')
-    machining_drawings = fields.Binary('2D加工图纸')
+    machining_drawings = fields.Binary('2D加工图纸', related='product_id.machining_drawings', store=True)
 
     cnc_worksheet = fields.Binary('程序单')
 
@@ -37,19 +42,16 @@ class SfDemandPlanPrintWizard(models.TransientModel):
             if pdf_data:
                 try:
                     # 执行打印
-                    # self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
+                    self.env['jikimo.printing'].sudo().print_pdf(pdf_data)
                     record.status = 'success'
-                    production_demand_plan_id = self.env['sf.production.demand.plan'].sudo().search(
+                    t_part, c_part = record.demand_plan_id.print_count.split('C')
-                        [('model_id', '=', record.model_id)])
-                    for production_demand_plan in production_demand_plan_id:
-                        t_part, c_part = production_demand_plan.print_count.split('C')
                     t_num = int(t_part[1:])
                     c_num = int(c_part)
                     if record.type == '1':
                         t_num += 1
                     elif record.type == '2':
                         c_num += 1
-                        production_demand_plan.print_count = f"T{t_num}C{c_num}"
+                    record.demand_plan_id.print_count = f"T{t_num}C{c_num}"
                     success_records.append({
                         'filename_url': record.filename_url,
                     })
@@ -76,11 +78,15 @@ class MrpWorkorder(models.Model):
                 demand_plan_print = self.env['sf.demand.plan.print.wizard'].sudo().search(
                     [('model_id', '=', record.model_id), ('type', '=', '2')])
                 if demand_plan_print:
-                    demand_plan_print.write(
+                    self.env['sf.demand.plan.print.wizard'].sudo().write(
                         {'cnc_worksheet': record.cnc_worksheet, 'filename_url': record.cnc_worksheet_name})
                 else:
+                    demand_plan = self.env['sf.production.demand.plan'].sudo().search(
+                        [('product_id', '=', record.product_id.id)])
+                    if demand_plan:
                         wizard_vals = {
-                        'model_id': record.model_id,
+                            'demand_plan_id': demand_plan.id,
+                            'model_id': demand_plan.model_id,
                             'type': '2',
                             'cnc_worksheet': record.cnc_worksheet,
                             'filename_url': record.cnc_worksheet_name

sf_demand_plan/wizard/sf_release_plan_wizard.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import models, fields, api, _
-from werkzeug.exceptions import InternalServerError
 
 _logger = logging.getLogger(__name__)
 
@@ -10,18 +9,14 @@ class SfReleasePlanWizard(models.TransientModel):
     _name = 'sf.release.plan.wizard'
     _description = u'下达计划向导'
 
-    demand_plan_line_id = fields.Many2many(comodel_name="sf.production.demand.plan",
+    demand_plan_id = fields.Many2one(comodel_name="sf.demand.main.plan",
+                                     string="需求计划", readonly=True)
+
+    demand_plan_line_id = fields.Many2one(comodel_name="sf.production.demand.plan",
                                           string="需求计划明细", readonly=True)
 
     release_message = fields.Char(string='提示', readonly=True)
 
     def confirm(self):
         if self.demand_plan_line_id:
-            for demand_plan_line_id in self.demand_plan_line_id:
+            self.demand_plan_line_id.action_confirm()
-                try:
-                    demand_plan_line_id.action_confirm()
-                except Exception as e:
-                    self.env.cr.rollback()
-                    demand_plan_line_id.write({'is_processing': False})
-                    self.env.cr.commit()
-                    raise InternalServerError('操作失败', e)

sf_dlm/models/stock_rule_inherit.py

@@ -6,50 +6,50 @@ from odoo import models, fields, api, _
 class StockRuleInherit(models.Model):
     _inherit = 'stock.rule'
 
-    # @api.model
+    @api.model
-    # def _run_buy(self, procurements):
+    def _run_buy(self, procurements):
-    #     # 判断补货组的采购类型
+        # 判断补货组的采购类型
-    #     procurements_group = {'standard': [], 'outsourcing': []}
+        procurements_group = {'standard': [], 'outsourcing': []}
-    #     for procurement, rule in procurements:
+        for procurement, rule in procurements:
-    #         is_outsourcing = False
+            is_outsourcing = False
-    #         product = procurement.product_id
+            product = procurement.product_id
-    #         # 获取主 BOM
+            # 获取主 BOM
-    #         bom = self.env['mrp.bom'].search([('product_tmpl_id', '=', product.product_tmpl_id.id)], limit=1)
+            bom = self.env['mrp.bom'].search([('product_tmpl_id', '=', product.product_tmpl_id.id)], limit=1)
-    #
+
-    #         if bom:
+            if bom:
-    #             # 遍历 BOM 中的组件（即坯料等）
+                # 遍历 BOM 中的组件（即坯料等）
-    #             for line in bom.bom_line_ids:
+                for line in bom.bom_line_ids:
-    #                 raw_material = line.product_id
+                    raw_material = line.product_id
-    #                 # 检查路线
+                    # 检查路线
-    #                 for route in raw_material.route_ids:
+                    for route in raw_material.route_ids:
-    #                     # print('route.name:', route.name)
+                        # print('route.name:', route.name)
-    #                     if route.name == '按订单补给外包商':
+                        if route.name == '按订单补给外包商': 
-    #                         is_outsourcing = True
+                            is_outsourcing = True
-    #
+  
-    #         if is_outsourcing:
+            if is_outsourcing:
-    #             procurements_group['outsourcing'].append((procurement, rule))
+                procurements_group['outsourcing'].append((procurement, rule))
-    #         else:
+            else:
-    #             procurements_group['standard'].append((procurement, rule))
+                procurements_group['standard'].append((procurement, rule))
-    #
+
-    #     for key, value in procurements_group.items():
+        for key, value in procurements_group.items():
-    #         super(StockRuleInherit, self)._run_buy(value)
+            super(StockRuleInherit, self)._run_buy(value)
-    #
+
-    #         if key == 'outsourcing':
+            if key == 'outsourcing':
-    #             for procurement, rule in value:
+                for procurement, rule in value:
-    #                 supplier = procurement.values.get('supplier')
+                    supplier = procurement.values.get('supplier')
-    #                 if supplier:
+                    if supplier:
-    #                     domain = rule._make_po_get_domain(procurement.company_id, procurement.values,
+                        domain = rule._make_po_get_domain(procurement.company_id, procurement.values,
-    #                                                         supplier.partner_id)
+                                                            supplier.partner_id)
-    #                     logging.info("domain=============: %s", domain)
+                        logging.info("domain=============: %s", domain)
-    #                 po = self.env['purchase.order'].sudo().search([
+                    po = self.env['purchase.order'].sudo().search([
-    #                     ('partner_id', '=', supplier.partner_id.id),
+                        ('partner_id', '=', supplier.partner_id.id),
-    #                     ('company_id', '=', procurement.company_id.id),  # 保证公司一致
+                        ('company_id', '=', procurement.company_id.id),  # 保证公司一致
-    #                     ('origin', 'like', procurement.origin),  # 根据来源匹配
+                        ('origin', 'like', procurement.origin),  # 根据来源匹配
-    #                     ('state', '=', 'draft')  # 状态为草稿
+                        ('state', '=', 'draft')  # 状态为草稿
-    #                 ], limit=1)
+                    ], limit=1)
-    #                 logging.info("po=: %s", po)
+                    logging.info("po=: %s", po)
-                    # if po:
+                    if po:
-                    #     po.write({'purchase_type': 'outsourcing'})
+                        po.write({'purchase_type': 'outsourcing'})
 
         # # 首先调用父类的 _run_buy 方法，以保留原有逻辑
         # super(StockRuleInherit, self)._run_buy(procurements)

sf_dlm_management/views/product_template_management_view.xml

@@ -524,16 +524,14 @@
                                 <field name="height_tolerance_value"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
                                 <field name="diameter"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘', '零点托盘', '三爪卡盘', '磁吸托盘', '气吸托盘'])]}"/>
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘', '零点托盘', '三爪卡盘'])]}"/>
                                 <field name="weight"/>
                                 <field name="chucking_power_max"
                                        attrs="{'invisible': [('fixture_material_type', '=','磁吸夹具')]}"/>
-                                   <field name="carrying_capacity_max"
+                                <field name="carrying_capacity_max"/>
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
                                 <field name="rigidity"/>
                             </group>
                             <group>
-                                   <!-- 夹持工件尺寸 -->
                                 <label for="gripper_length_min" string="夹持工件最小尺寸"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
                                 <div class="o_address_format"
@@ -557,10 +555,9 @@
                                     <label for="gripper_width_max" string="宽"/>
                                     <field name="gripper_width_max" class="o_address_zip"/>
                                     <span>&amp;nbsp;</span>
-                                          <label for="gripper_height_max" string="高"/>
+                                    <label for="gripper_width_max" string="高"/>
-                                          <field name="gripper_height_max" class="o_address_zip"/>
+                                    <field name="gripper_width_max" class="o_address_zip"/>
                                 </div>
-
                                 <field name="gripper_diameter_min" string="夹持工件最小直径(mm)"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
                                 <field name="gripper_diameter_max" string="夹持工件最大直径(mm)"
@@ -579,7 +576,7 @@
                                 <field name="connector_diameter" placeholder="请选择" string="连接头直径(mm)"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘'])]}"/>
                                 <field name="way_to_install" placeholder="请选择" string="安装方式"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘','气吸托盘'])]}"/>
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘'])]}"/>
                                 <field name="rated_air_pressure" string="额定气压(Mpa)"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具'])]}"/>
 
@@ -595,72 +592,18 @@
                                 <field name="magnetic_pole_plate_grinding_allowance" string="磁极板磨削余量(mm)"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
 
-                                   <!-- 磁吸托盘字段 -->
+                                <field name="screw_size" string="螺牙大小(mm)"
-                                   <field name="magnet_tray_length" string="磁吸托盘长度(mm)"
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['转接板(锁板)夹具'])]}"/>
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                <field name="via_hole_diameter" string="过孔直径(mm)"
-                                   <field name="magnet_tray_width" string="磁吸托盘宽度(mm)"
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['转接板(锁板)夹具'])]}"/>
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_tray_height" string="磁吸托盘厚度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_tray_diameter" string="磁吸托盘直径(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_tray_weight" string="磁吸托盘重量(kg)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
 
-                                   <field name="magnet_max_adsorp_length" string="磁吸托盘最大吸附长度(mm)"
+                                <field name="mounting_hole_depth" string="安装孔深度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['三爪卡盘'])]}"/>
-                                   <field name="magnet_max_adsorp_width" string="磁吸托盘最大吸附宽度(mm)"
+                                <field name="centering_diameter" string="定心直径(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['三爪卡盘'])]}"/>
-                                   <field name="magnet_max_adsorp_height" string="磁吸托盘最大吸附厚度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_max_adsorp_diameter" string="磁吸托盘最大吸附直径(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_max_adsorp_force" string="磁吸托盘最大吸附力(N)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-
-                                   <field name="magnet_unlocking_method" string="磁吸托盘锁紧方式"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_flatness" string="磁吸托盘平面精度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-                                   <field name="magnet_max_load" string="磁吸托盘最大负载(kg)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
-
-                                   <!-- 气吸托盘字段 -->
-                                   <field name="air_tray_length" string="气吸托盘长度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_tray_width" string="气吸托盘宽度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_tray_height" string="气吸托盘高度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_tray_diameter" string="气吸托盘直径(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_tray_weight" string="气吸托盘重量(kg)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-
-                                   <field name="air_max_adsorp_length" string="气吸托盘最大吸附长度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_max_adsorp_width" string="气吸托盘最大吸附宽度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_max_adsorp_height" string="气吸托盘最大吸附高度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_max_adsorp_diameter" string="气吸托盘最大吸附直径(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_max_adsorp_force" string="气吸托盘最大吸附力(N)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-
-                                   <field name="air_unlocking_method" string="气吸托盘锁紧方式"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_flatness" string="气吸托盘平面精度(mm)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_max_load" string="气吸托盘最大负载(kg)"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_boolean_chip_blowing_function" string="气吸托盘是否有吹屑功能"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
-                                   <field name="air_way_to_install" string="气吸托盘安装方式"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
 
                                 <field name="boolean_chip_blowing_function" string="是否有吹屑功能"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘','气吸托盘'])]}"/>
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
                                 <field name="materials_model_id" placeholder="请选择" options="{'no_create': True}"/>
                                 <field name="interface_materials_model_id" placeholder="请选择" string="接口类型"
                                        options="{'no_create': True}"
@@ -668,10 +611,11 @@
                                 <field name="type_of_drive" placeholder="请选择" string="驱动方式"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘','气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
                                 <field name="unlocking_method" string="解锁方式" placeholder="请选择"
-                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','气吸托盘', '磁吸托盘'])]}"/>
+                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
                                 <field name="machine_tool_type_id" string="适用机床型号" placeholder="请选择"
                                        options="{'no_create': True}"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
+
                             </group>
                         </group>
                     </page>

sf_manufacturing/__manifest__.py

@@ -11,7 +11,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse', 'jikimo_attachment_viewer',
-                'jikimo_sale_multiple_supply_methods', 'product', 'jikimo_tree_header_buttons_always_visible'],
+                'jikimo_sale_multiple_supply_methods', 'product'],
     'data': [
         'data/cron_data.xml',
         'data/stock_data.xml',

sf_manufacturing/models/product_template.py

@@ -1215,51 +1215,6 @@ class ResProductFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
-    # ‘磁吸托盘’ 字段
-    magnet_tray_length = fields.Float('磁吸托盘长度(mm)', digits=(16, 2))
-    magnet_tray_width = fields.Float('磁吸托盘宽度(mm)', digits=(16, 2))
-    magnet_tray_height = fields.Float('磁吸托盘厚度(mm)', digits=(16, 2))
-    magnet_tray_diameter = fields.Float('磁吸托盘直径(mm)', digits=(16, 2))
-    magnet_tray_weight = fields.Float('磁吸托盘重量(kg)', digits=(16, 2))
-
-    magnet_max_adsorp_length = fields.Float('磁吸托盘最大吸附长度(mm)', digits=(16, 2))
-    magnet_max_adsorp_width = fields.Float('磁吸托盘最大吸附宽度(mm)', digits=(16, 2))
-    magnet_max_adsorp_height = fields.Float('磁吸托盘最大吸附厚度(mm)', digits=(16, 2))
-    magnet_max_adsorp_diameter = fields.Float('磁吸托盘最大吸附直径(mm)', digits=(16, 2))
-    magnet_max_adsorp_force = fields.Float('磁吸托盘最大吸附力(N)', digits=(16, 2))
-
-    magnet_unlocking_method = fields.Selection(
-        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
-        string='磁吸托盘锁紧方式'
-    )
-    magnet_flatness = fields.Char('磁吸托盘平面精度(mm)', size=20)
-    magnet_max_load = fields.Float('磁吸托盘最大负载(kg)', digits=(16, 2))
-
-    # ‘气吸托盘’ 字段
-    air_tray_length = fields.Float('气吸托盘长度(mm)', digits=(16, 2))
-    air_tray_width = fields.Float('气吸托盘宽度(mm)', digits=(16, 2))
-    air_tray_height = fields.Float('气吸托盘高度(mm)', digits=(16, 2))
-    air_tray_diameter = fields.Float('气吸托盘直径(mm)', digits=(16, 2))
-    air_tray_weight = fields.Float('气吸托盘重量(kg)', digits=(16, 2))
-
-    air_max_adsorp_length = fields.Float('气吸托盘最大吸附长度(mm)', digits=(16, 2))
-    air_max_adsorp_width = fields.Float('气吸托盘最大吸附宽度(mm)', digits=(16, 2))
-    air_max_adsorp_height = fields.Float('气吸托盘最大吸附厚度(mm)', digits=(16, 2))
-    air_max_adsorp_diameter = fields.Float('气吸托盘最大吸附直径(mm)', digits=(16, 2))
-    air_max_adsorp_force = fields.Float('气吸托盘最大吸附力(N)', digits=(16, 2))
-
-    air_unlocking_method = fields.Selection(
-        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
-        string='气吸托盘锁紧方式'
-    )
-    air_flatness = fields.Char('气吸托盘平面精度(mm)', size=20)
-    air_max_load = fields.Float('气吸托盘最大负载(kg)', digits=(16, 2))
-    air_boolean_chip_blowing_function = fields.Boolean('气吸托盘是否有吹屑功能')
-    air_way_to_install = fields.Selection(
-        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')],
-        string='气吸托盘安装方式'
-    )
-
     @api.onchange('specification_fixture_id')
     def _onchange_specification_fixture_id(self):
         if self.specification_fixture_id:

sf_manufacturing/models/stock.py

@@ -217,7 +217,6 @@ class StockRule(models.Model):
                 '''
                 创建制造订单时生成序列号
                 '''
-                if production.product_id.tracking != "none":
                 production.action_generate_serial()
                 origin_production = production.move_dest_ids and production.move_dest_ids[
                     0].raw_material_production_id or False
@@ -443,7 +442,7 @@ class ProductionLot(models.Model):
     @api.model
     def _get_next_serial(self, company, product):
         """Return the next serial number to be attributed to the product."""
-        if product.tracking != "none":
+        if product.tracking == "serial":
             last_serial = self.env['stock.lot'].search(
                 [('company_id', '=', company.id), ('product_id', '=', product.id), ('name', 'ilike', product.name)],
                 limit=1, order='name desc')
@@ -454,9 +453,7 @@ class ProductionLot(models.Model):
                 return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name if (
                         not move_line_id or
                         (last_serial and last_serial.name > move_line_id.lot_name)) else move_line_id.lot_name, 2)[1]
-            else:
         return "%s-%03d" % (product.name, 1)
-        return False
 
     qr_code_image = fields.Binary(string='二维码', compute='_generate_qr_code')
 

sf_mrs_connect/controllers/controllers.py

@@ -44,8 +44,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
             if productions:
                 # 修改需求计划中的程序工时
                 demand_plan = request.env['sf.production.demand.plan'].with_user(
-                    request.env.ref("base.user_admin")).search(
+                    request.env.ref("base.user_admin")).search([('model_id', '=', ret['folder_name'])])
-                    [('model_id', '=', ret['folder_name']), ('new_supply_method', '=', 'custom_made')])
                 if demand_plan and ret['total_estimated_time']:
                     demand_plan.write(
                         {'processing_time': ret['total_estimated_time']})

sf_mrs_connect/models/sync_common.py

@@ -9,7 +9,6 @@ from odoo import models
 from odoo.exceptions import ValidationError
 from odoo.addons.sf_base.commons.common import Common
 
-
 _logger = logging.getLogger(__name__)
 
 
@@ -179,7 +178,6 @@ class sfMaterialModel(models.Model):
                         materials_model.mf_materia_post = item['mf_materia_post']
                         materials_model.materials_id = materials.id
                         materials_model.need_h = item['need_h']
-                        materials_model.need_m = item['need_m']
                         materials_model.density = item['density']
                         materials_model.active = item['active']
                     else:
@@ -194,7 +192,6 @@ class sfMaterialModel(models.Model):
                             "active": item['active'],
                             "materials_id": materials.id,
                             "need_h": item['need_h'],
-                            "need_m": item['need_m'],
                             "mf_materia_post": item['mf_materia_post'],
                             "density": item['density'],
                         })
@@ -231,7 +228,6 @@ class sfMaterialModel(models.Model):
                             "standards_id": self.env['sf.international.standards'].search(
                                 [("name", '=', item['standards_id'])]).id,
                             "need_h": item['need_h'],
-                            "need_m": item['need_m'],
                             "alloy_code": item['alloy_code'],
                             "mf_materia_post": item['mf_materia_post'],
                             "density": item['density'],
@@ -252,7 +248,6 @@ class sfMaterialModel(models.Model):
                         materials_model.mf_materia_post = item['mf_materia_post']
                         materials_model.materials_id = materials.id
                         materials_model.need_h = item['need_h']
-                        materials_model.need_m = item['need_m']
                         materials_model.density = item['density']
                         materials_model.active = item['active']
                         materials_model.materials_code= item['materials_code']
@@ -1615,10 +1610,6 @@ class SyncfixtureMaterialsBasicParameters(models.Model):
                     self._write_or_create(all_list.get('adapter_board_yesterday_list'), '转接板(锁板)夹具')
                 if all_list.get('scroll_chuck_all_list'):
                     self._write_or_create(all_list.get('scroll_chuck_yesterday_list'), '三爪卡盘')
-                if all_list.get('air_blow_tray_all_list'):
-                    self._write_or_create(all_list.get('air_tray_yesterday_list'), '气吸托盘')
-                if all_list.get('magnet_tray_all_list'):
-                    self._write_or_create(all_list.get('magnet_tray_yesterday_list'), '磁吸托盘')
         else:
             raise ValidationError("夹具型号基本参数认证未通过")
 
@@ -1647,10 +1638,6 @@ class SyncfixtureMaterialsBasicParameters(models.Model):
                     self._write_or_create(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
                 if all_list.get('scroll_chuck_all_list'):
                     self._write_or_create(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
-                if all_list.get('air_blow_tray_all_list'):
-                    self._write_or_create(all_list.get('air_tray_all_list'), '气吸托盘')
-                if all_list.get('magnet_tray_all_list'):
-                    self._write_or_create(all_list.get('magnet_tray_all_list'), '磁吸托盘')
         else:
             raise ValidationError("夹具型号基本参数认证未通过")
 

sf_plan_management/i18n/zh_CN.po

@@ -45759,11 +45759,6 @@ msgstr ""
 msgid "热处理"
 msgstr ""
 
-#. module: sf_base
-#: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__need_m
-msgid "是否磁吸"
-msgstr ""
-
 #. module: sf_base
 #: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__mf_materia_post
 msgid "热处理后密度"

sf_quality/__manifest__.py

@@ -22,7 +22,6 @@
         'data/report_actions.xml',
         'views/view.xml',
         'views/quality_cnc_test_view.xml',
-        'views/stock_picking.xml',
         'views/mrp_workorder.xml',
         'views/quality_check_view.xml',
         'views/quality_company.xml',

sf_quality/models/stock.py

@@ -1,29 +1,24 @@
 import logging
 
-from odoo import api, models, fields
+from odoo import api, models
 from odoo.exceptions import ValidationError, UserError
 
 
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
-    whether_show_quality_check = fields.Boolean('是否显示质量检测按钮', default=True)
-
     def _compute_check(self):
         super()._compute_check()
         for picking in self:
             picking_to_quality = picking.get_picking_to_quality()
             if not picking_to_quality:
                 picking.quality_check_todo = False
-                picking.whether_show_quality_check = False
                 break
             else:
-                picking.whether_show_quality_check = True
                 need_quality_line = picking.get_need_quality_line(picking_to_quality)
                 if not need_quality_line or all(not line.get('need_done_check_ids') for line in need_quality_line):
                     picking.quality_check_todo = False
 
-
     def check_quality(self):
         self.ensure_one()
         # checkable_products = self.mapped('move_line_ids').mapped('product_id')

sf_quality/views/stock_picking.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="stock_picking_view_form_inherit_quality_sf_quality" model="ir.ui.view">
-        <field name="name">stock.picking.view.form.sf.quality</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="quality_control.stock_picking_view_form_inherit_quality"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']" position="inside">
-                <field name="whether_show_quality_check" invisible="1"/>
-            </xpath>
-            <xpath expr="//button[@name='action_open_quality_check_picking'][1]" position="attributes">
-                <attribute name="attrs">{'invisible': ['|', '|','|', ('check_ids', '=', []), ('quality_check_fail', '=',
-                    True), ('quality_check_todo', '!=', True), ('whether_show_quality_check', '!=', True)]}
-                </attribute>
-            </xpath>
-            <xpath expr="//button[@name='action_open_quality_check_picking'][2]" position="attributes">
-                <attribute name="attrs">{'invisible': ['|', '|','|', ('check_ids', '=', []), ('quality_check_fail', '=',
-                    True), ('quality_check_todo', '=', True), ('whether_show_quality_check', '!=', True)]}
-                </attribute>
-            </xpath>
-            <xpath expr="//button[@name='action_open_quality_check_picking'][3]" position="attributes">
-                <attribute name="attrs">{'invisible': ['|', '|',('check_ids', '=', []), ('quality_check_fail', '!=',
-                    True), ('whether_show_quality_check', '!=', True)]}
-                </attribute>
-            </xpath>
-        </field>
-    </record>
-</odoo>

sf_sale/models/sale_order.py

@@ -155,7 +155,7 @@ class ReSaleOrder(models.Model):
             'glb_url': item['glb_url'],
             'remark': item.get('remark'),
             'embryo_redundancy_id': item.get('embryo_redundancy_id'),
-            'is_incoming_material': True if item.get('incoming_size') else False,
+            'is_incoming_material': True if item.get('embryo_redundancy_id') else False,
             'manual_quotation': item.get('manual_quotation'),
             'model_id': item['model_id'],
             'delivery_end_date': item['delivery_end_date']
@@ -287,7 +287,7 @@ class ResaleOrderLine(models.Model):
     check_status = fields.Selection(related='order_id.check_status')
     remark = fields.Char('备注')
 
-    is_incoming_material = fields.Boolean('客供料',  store=True)
+    is_incoming_material = fields.Boolean('客供料', compute='_compute_is_incoming_material', store=True)
     embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
     manual_quotation = fields.Boolean('人工编程', default=False)
     model_url = fields.Char('模型文件地址')

sf_warehouse/__manifest__.py

@@ -16,7 +16,6 @@
         # 'security/sf_stock_security.xml',
         'security/ir.model.access.csv',
         'wizard/wizard_view.xml',
-        'views/product.xml',
         'views/view.xml',
         'views/shelf_location.xml',
         'views/change_stock_move_views.xml',

sf_warehouse/models/__init__.py

@@ -1,3 +1,2 @@
 from . import model
 from . import sync_common
-from . import product

sf_warehouse/models/model.py

@@ -1082,10 +1082,6 @@ class SfStockPicking(models.Model):
         重写验证方法,当验证时意味着调拨单已经完成，已经移动到了目标货位，所以需要将当前货位的状态改为空闲
         """
         res = super(SfStockPicking, self).button_validate()
-        if any(ml.state == 'done' for ml in self.move_line_ids):
-            # 验证产品库存为负库存问题
-            self.move_ids.product_id.verify_product_repertory(self.location_id)
-
         for line in self.move_line_ids:
             if line:
                 if line.destination_location_id:

sf_warehouse/models/product.py

@@ -1,29 +0,0 @@
-from odoo import models, fields
-from odoo.exceptions import ValidationError
-
-
-class SfProductCategory(models.Model):
-    _inherit = 'product.category'
-
-    negative_inventory_allowed = fields.Boolean('可负库存', default=True)
-
-
-class SfProductTemplate(models.Model):
-    _inherit = 'product.product'
-
-    def verify_product_repertory(self, location_id):
-        """
-             验证产品  负库存
-        """
-        if not location_id:
-            raise ValidationError('当前位置为空！！')
-        elif len(location_id) != 1:
-            raise ValidationError(f'存在多个当前位置{[item.name for item in location_id]}')
-        elif location_id.usage == 'supplier':
-            return True
-        for pp in self:
-            if not pp.categ_id.negative_inventory_allowed:
-                sq = pp.stock_quant_ids.filtered(lambda sq: sq.quantity < 0 and sq.location_id == location_id)
-                if sq:
-                    raise ValidationError(
-                        f'产品{pp.name}的产品类型设置为不可负库存，当前操作会导致产品{pp.name}在库存{location_id.name}上的库存数量为负！！！')

sf_warehouse/views/product.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="product_category_form_view_sf_warehouse" model="ir.ui.view">
-        <field name="name">product.category.property.form.warehouse</field>
-        <field name="model">product.category</field>
-        <field name="inherit_id" ref="account.view_category_property_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//group[@name='account_property']" position="after">
-                <group name="other">
-                    <group string="其他">
-                        <field name="negative_inventory_allowed"/>
-                    </group>
-                </group>
-            </xpath>
-        </field>
-    </record>
-</odoo>