Compare commits

..

10 Commits

Author SHA1 Message Date
guanhuan
cdb3cc7c03 需求计划详情调拨单显示 2025-07-18 15:33:51 +08:00
guanhuan
19417dd569 库存移动新增需求计划关联 2025-07-17 17:41:04 +08:00
hyyy
20415d0d3f 下拉选项检测 2025-07-16 17:37:29 +08:00
guanhuan
4d959eab59 新增产线类型方法校验 2025-07-16 15:46:03 +08:00
guanhuan
5a98b20988 下达计划按钮重复点击生成重复数据 2025-07-16 09:32:28 +08:00
hyyy
7eea5a0ff2 重复点击 2025-07-15 16:25:28 +08:00
guanhuan
0c3407572f 需求计划详情 2025-07-15 11:51:14 +08:00
hyyy
e5404efb60 批量下达计划禁用 2025-07-15 11:39:20 +08:00
guanhuan
46f60028aa 需求位置修改 2025-07-15 10:40:19 +08:00
guanhuan
bfc071debd 需求位置修改 2025-07-15 10:34:28 +08:00
21 changed files with 497 additions and 286 deletions

View File

@@ -4,4 +4,4 @@ wechatpy==1.8.18
pycryptodome==3.22.0
openupgradelib==3.10.0
opcua==0.98.13
openpyxl
openpyxl

View File

@@ -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', "材料名")

View File

@@ -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"/>

View File

@@ -10,7 +10,7 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
'depends': ['sf_plan','jikimo_printing'],
'depends': ['sf_plan', 'jikimo_printing', 'purchase_request', 'purchase_request_tier_validation'],
'data': [
'security/ir.model.access.csv',
'data/stock_route_group.xml',
@@ -20,6 +20,7 @@
'views/sale_order_views.xml',
'wizard/sf_demand_plan_print_wizard_view.xml',
'wizard/sf_release_plan_wizard_views.xml',
'wizard/sf_demand_plan_detail_wizard_view.xml',
'views/menu_view.xml',
],
'demo': [
@@ -30,6 +31,7 @@
'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',

View File

@@ -9,3 +9,5 @@ from . import mrp_production
from . import stock_rule
from . import purchase_request
from . import purchase_order
from . import stock_move
from . import stock_picking

View File

@@ -36,7 +36,7 @@ class PurchaseOrderLine(models.Model):
@api.model
def create(self, vals):
res = super(PurchaseOrderLine, self).create(vals)
if not res.demand_plan_line_id:
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')

View File

@@ -14,10 +14,10 @@ class SfProductionDemandPlan(models.Model):
_description = 'sf_production_demand_plan'
def get_location_id(self):
stock_location = self.env['stock.location'].sudo().search([('name', '=', '客户')], limit=1)
return stock_location.id
customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
return customer_location_id
priority = fields.Selection(related='demand_plan_id.priority', string='优先级')
priority = fields.Selection(related='demand_plan_id.priority', string='优先级', store=True)
status = fields.Selection([
('10', '草稿'),
('20', '待确认'),
@@ -34,7 +34,7 @@ class SfProductionDemandPlan(models.Model):
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')
customer_name = fields.Char('客户', related='sale_order_id.customer_name', store=True)
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文件地址')
@@ -83,7 +83,7 @@ class SfProductionDemandPlan(models.Model):
related='product_id.blank_precision')
unit_number = fields.Float('单件用量', digits=(16, 3), related='product_id.unit_number')
embryo_long = fields.Char('坯料尺寸(mm)', related='demand_plan_id.embryo_long')
materials_id = fields.Char('材料', related='demand_plan_id.materials_id')
materials_id = fields.Char('材料', related='demand_plan_id.materials_id', store=True)
model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
model_process_parameters_ids = fields.Many2many(related='demand_plan_id.model_process_parameters_ids',
string='表面工艺', )
@@ -127,6 +127,12 @@ class SfProductionDemandPlan(models.Model):
string='字段自制类型只读'
)
is_processing = fields.Boolean(
string='正在处理中',
default=False,
help='用于防止重复点击按钮'
)
# hide_action_open_mrp_production = fields.Boolean(
# string='显示待工艺确认按钮',
# compute='_compute_hid_button',
@@ -615,11 +621,6 @@ class SfProductionDemandPlan(models.Model):
# 按产品分组并计算总数
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] = {
@@ -629,22 +630,17 @@ class SfProductionDemandPlan(models.Model):
# 累加计划数量
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'],
if 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)
if warning_messages and check_overdelivery_allowed:
raise ValidationError(f"已禁止向合作伙伴/客户超量发货,请更换“补货原因”或将“可超量发货”设置为“是”。")
elif warning_messages:
warning_message = "\n".join(warning_messages)
return {
@@ -662,6 +658,9 @@ class SfProductionDemandPlan(models.Model):
def button_release_plan(self):
self.ensure_one()
if self.is_processing:
return
self.is_processing = True
check_overdelivery_allowed = False
if not self.demand_plan_id.overdelivery_allowed:
customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
@@ -701,18 +700,6 @@ class SfProductionDemandPlan(models.Model):
self.update_sale_order_state()
def mrp_bom_create(self):
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
bom_type = ''
# 根据供货方式修改成品模板
if self.supply_method == 'automation':
@@ -732,6 +719,18 @@ 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')}"
@@ -911,3 +910,62 @@ class SfProductionDemandPlan(models.Model):
'demand_plan_line_id': self.id
}
return values
def button_plan_detail(self):
self.ensure_one()
purchase_request_ids = self.env['purchase.request'].sudo().search(
[('line_ids.demand_plan_line_id', 'in', self.ids)])
purchase_order_ids = self.env['purchase.order'].sudo().search(
[('order_line.demand_plan_line_id', 'in', self.ids)])
picking_ids = self.env['stock.picking'].sudo().search(
[('demand_plan_line_ids', 'in', self.ids)])
return {
'name': _('详情'),
'type': 'ir.actions.act_window',
'view_mode': 'form',
'res_model': 'sf.demand.plan.detail.wizard',
'target': 'new',
'views': [(False, 'form')],
'context': {
'default_mrp_production_ids': self.mrp_production_ids.ids,
'default_purchase_request_ids': purchase_request_ids.ids,
'default_standard_purchase_order_ids': purchase_order_ids.filtered(
lambda o: o.purchase_type == 'standard'
).ids,
'default_consignment_purchase_order_ids': purchase_order_ids.filtered(
lambda o: o.purchase_type == 'consignment'
).ids,
'default_outsourcing_purchase_order_ids': purchase_order_ids.filtered(
lambda o: o.purchase_type == 'outsourcing'
).ids,
'default_outside_purchase_order_ids': purchase_order_ids.filtered(
lambda o: o.purchase_type == 'outside'
).ids,
'default_in_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'IN'
).ids,
'default_dl_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'DL'
).ids,
'default_int_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'INT'
).ids,
'default_pc_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'PC'
).ids,
'default_sfp_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'SFP'
).ids,
'default_onin_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'OCIN'
).ids,
'default_ocout_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'OCOUT'
).ids,
'default_out_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'OUT'
).ids,
'default_res_stock_picking_ids': picking_ids.filtered(
lambda o: o.picking_type_sequence_code == 'RES'
).ids,
}}

View File

@@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import api, fields, models
class StockMove(models.Model):
_inherit = 'stock.move'
demand_plan_line_ids = fields.Many2many(comodel_name="sf.production.demand.plan",
string="需求计划明细", compute='_compute_demand_plan_line_ids', store=True)
@api.depends('origin', 'move_orig_ids')
def _compute_demand_plan_line_ids(self):
sorted_records = self.sorted(key=lambda r: -r.id)
for line in sorted_records:
origin = [origin.replace(' ', '') for origin in line.origin.split(',')]
if line.created_purchase_request_line_id:
line.demand_plan_line_ids = line.created_purchase_request_line_id.demand_plan_line_id.ids
elif line.origin and 'MO' in line.origin:
mp_ids = self.env['mrp.production'].sudo().search([('name', '=', origin[0])])
line.demand_plan_line_ids = mp_ids.demand_plan_line_id.ids if mp_ids else []
elif line.origin and 'P' in line.origin:
purchase_order_ids = self.env['purchase.order'].sudo().search([('name', '=', origin[0])])
if purchase_order_ids.order_line:
line.demand_plan_line_ids = purchase_order_ids.order_line.demand_plan_line_id.ids
elif line.move_orig_ids:
demand_plan_lines = self.env['sf.production.demand.plan']
for move_orig in line.move_orig_ids:
demand_plan_lines |= move_orig.demand_plan_line_ids
line.demand_plan_line_ids = demand_plan_lines.ids
else:
line.demand_plan_line_ids = []
if not line.demand_plan_line_ids and self.env.context.get('demand_plan_line_id'):
plan_ids = self.env.context['demand_plan_line_id']
line.demand_plan_line_ids = [plan_ids]

View File

@@ -0,0 +1,16 @@
from odoo import fields, api, models, _
class StockPicking(models.Model):
_inherit = "stock.picking"
demand_plan_line_ids = fields.Many2many(comodel_name="sf.production.demand.plan",
string="需求计划明细", compute='_compute_demand_plan_line_ids', store=True)
@api.depends('move_ids_without_package')
def _compute_demand_plan_line_ids(self):
for line in self:
demand_plan_lines = self.env['sf.production.demand.plan']
if line.move_ids_without_package and line.move_ids_without_package.demand_plan_line_ids:
demand_plan_lines |= line.move_ids_without_package.demand_plan_line_ids
line.demand_plan_line_ids = demand_plan_lines.ids

View File

@@ -13,4 +13,7 @@ access_stock_route_group,stock.route.group,model_stock_route_group,base.group_us
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_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_sf_demand_plan_detail_wizard,sf.demand.plan.detail.wizard,model_sf_demand_plan_detail_wizard,base.group_user,1,0,0,0
access_sf_demand_plan_detail_wizard_for_dispatch,sf.demand.plan.detail.wizard for dispatch,model_sf_demand_plan_detail_wizard,sf_base.group_plan_dispatch,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
13 access_sf_demand_plan_detail_wizard_for_dispatch sf.demand.plan.detail.wizard for dispatch model_sf_demand_plan_detail_wizard sf_base.group_plan_dispatch 1 1 1 1
14
15
16
17
18
19

View File

@@ -0,0 +1,58 @@
/** @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"]');
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);

View File

@@ -4,7 +4,8 @@
<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"/>
@@ -91,6 +92,10 @@
attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
/>
<button name="edit_button" type="object" string="拆分" class="btn-primary"/>
<button string="详情" name="button_plan_detail" type="object"
class="btn-primary"
attrs="{'invisible': [('status', 'not in', ('50','60'))]}"
/>
</tree>
</field>
</record>

View File

@@ -108,6 +108,10 @@
class="btn-primary"
attrs="{'invisible': [('hide_release_production_order', '=', False)]}"
/>
<button string="详情" name="button_plan_detail" type="object"
class="btn-primary"
attrs="{'invisible': [('status', 'not in', ('50','60'))]}"
/>
</tree>
</field>
</page>

View File

@@ -1,2 +1,3 @@
from . import sf_demand_plan_print_wizard
from . import sf_release_plan_wizard
from . import sf_demand_plan_detail_wizard

View File

@@ -0,0 +1,74 @@
# -*- coding: utf-8 -*-
import logging
from odoo import models, fields, api, _
_logger = logging.getLogger(__name__)
class SfDemandPlanDetailWizard(models.TransientModel):
_name = 'sf.demand.plan.detail.wizard'
_description = u'需求计划详情向导'
mrp_production_ids = fields.Many2many('mrp.production', string='关联制造订单', readonly=True)
purchase_request_ids = fields.Many2many('purchase.request', string='关联采购申请', readonly=True)
standard_purchase_order_ids = fields.Many2many('purchase.order', string='关联标准采购',
relation='standard_purchase_order_rel',
column1='plan_detail_wizard_id', column2='purchase_order_id',
readonly=True)
consignment_purchase_order_ids = fields.Many2many('purchase.order', string='关联工序外协采购',
relation='consignment_purchase_order_rel',
column1='plan_detail_wizard_id', column2='purchase_order_id',
readonly=True)
outsourcing_purchase_order_ids = fields.Many2many('purchase.order', string='关联委外加工采购',
relation='outsourcing_purchase_order_rel',
column1='plan_detail_wizard_id', column2='purchase_order_id',
readonly=True)
outside_purchase_order_ids = fields.Many2many('purchase.order', string='关联外购订单采购',
relation='outside_purchase_order_rel',
column1='plan_detail_wizard_id', column2='purchase_order_id',
readonly=True)
in_stock_picking_ids = fields.Many2many('stock.picking', string='关联收料入库调拨单',
relation='in_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
dl_stock_picking_ids = fields.Many2many('stock.picking', string='关联客供料入库调拨单',
relation='dl_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
int_stock_picking_ids = fields.Many2many('stock.picking', string='关联内部调拨',
relation='int_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
pc_stock_picking_ids = fields.Many2many('stock.picking', string='关联生产发料调拨单',
relation='pc_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
sfp_stock_picking_ids = fields.Many2many('stock.picking', string='关联生产入库调拨单',
relation='sfp_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
onin_stock_picking_ids = fields.Many2many('stock.picking', string='关联外协入库调拨单',
relation='onin_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
ocout_stock_picking_ids = fields.Many2many('stock.picking', string='关联外协出库调拨单',
relation='ocout_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
out_stock_picking_ids = fields.Many2many('stock.picking', string='关联发料出库调拨单',
relation='out_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)
res_stock_picking_ids = fields.Many2many('stock.picking', string='关联委外发料调拨单',
relation='res_stock_picking_rel',
column1='plan_detail_wizard_id', column2='stock_picking_id',
readonly=True)

View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="action_plan_detail_form" model="ir.ui.view">
<field name="name">sf.demand.plan.detail.wizard.form</field>
<field name="model">sf.demand.plan.detail.wizard</field>
<field name="arch" type="xml">
<form string="详情">
<notebook>
<page string="采购申请" attrs="{'invisible': [('purchase_request_ids', '=', [])]}">
<field name="purchase_request_ids" widget="many2many"/>
</page>
<page string="制造订单" attrs="{'invisible': [('mrp_production_ids', '=', [])]}">
<field name="mrp_production_ids" widget="many2many"/>
</page>
<page string="标准采购" attrs="{'invisible': [('standard_purchase_order_ids', '=', [])]}">
<field name="standard_purchase_order_ids" widget="many2many"/>
</page>
<page string="工序外协采购" attrs="{'invisible': [('consignment_purchase_order_ids', '=', [])]}">
<field name="consignment_purchase_order_ids" widget="many2many"/>
</page>
<page string="委外加工采购" attrs="{'invisible': [('outsourcing_purchase_order_ids', '=', [])]}">
<field name="outsourcing_purchase_order_ids" widget="many2many"/>
</page>
<page string="外购订单采购" attrs="{'invisible': [('outside_purchase_order_ids', '=', [])]}">
<field name="outside_purchase_order_ids" widget="many2many"/>
</page>
<page string="收料入库" attrs="{'invisible': [('in_stock_picking_ids', '=', [])]}">
<field name="in_stock_picking_ids" widget="many2many"/>
</page>
<page string="客供料入库" attrs="{'invisible': [('dl_stock_picking_ids', '=', [])]}">
<field name="dl_stock_picking_ids" widget="many2many"/>
</page>
<page string="内部调拨" attrs="{'invisible': [('int_stock_picking_ids', '=', [])]}">
<field name="int_stock_picking_ids" widget="many2many"/>
</page>
<page string="生产发料" attrs="{'invisible': [('pc_stock_picking_ids', '=', [])]}">
<field name="pc_stock_picking_ids" widget="many2many"/>
</page>
<page string="生产入库" attrs="{'invisible': [('sfp_stock_picking_ids', '=', [])]}">
<field name="sfp_stock_picking_ids" widget="many2many"/>
</page>
<page string="外协入库" attrs="{'invisible': [('onin_stock_picking_ids', '=', [])]}">
<field name="onin_stock_picking_ids" widget="many2many"/>
</page>
<page string="外协出库" attrs="{'invisible': [('ocout_stock_picking_ids', '=', [])]}">
<field name="ocout_stock_picking_ids" widget="many2many"/>
</page>
<page string="发料出库" attrs="{'invisible': [('out_stock_picking_ids', '=', [])]}">
<field name="out_stock_picking_ids" widget="many2many"/>
</page>
<page string="委外发料" attrs="{'invisible': [('res_stock_picking_ids', '=', [])]}">
<field name="res_stock_picking_ids" widget="many2many"/>
</page>
</notebook>
</form>
</field>
</record>
</odoo>

View File

@@ -5,7 +5,7 @@ from odoo import models, fields, api, _
_logger = logging.getLogger(__name__)
class SfDemandPlanPrintWizard(models.TransientModel):
class SfDemandPlanPrintWizard(models.Model):
_name = 'sf.demand.plan.print.wizard'
_description = u'打印向导'

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import logging
from odoo import models, fields, api, _
from werkzeug.exceptions import InternalServerError
_logger = logging.getLogger(__name__)
@@ -17,4 +18,10 @@ class SfReleasePlanWizard(models.TransientModel):
def confirm(self):
if self.demand_plan_line_id:
for demand_plan_line_id in self.demand_plan_line_id:
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)

View File

@@ -1,4 +1,4 @@
from . import ftp_operate
from . import res_config_setting
from . import sync_common
from . import order_price
from . import order_price

View File

@@ -1506,149 +1506,149 @@ class SyncMulti_Mounting_Type(models.Model):
raise ValidationError("联装类型认证未通过")
# class SyncFixtureModel(models.Model):
# _inherit = 'sf.fixture.model'
# _description = '同步夹具型号列表'
class SyncFixtureModel(models.Model):
_inherit = 'sf.fixture.model'
_description = '同步夹具型号列表'
# url = '/api/fixture_model/list'
url = '/api/fixture_model/list'
# # 定时同步夹具型号列表
# def sync_fixture_model_yesterday(self):
# config = self.env['res.config.settings'].get_values()
# headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
# strUrl = config['sf_url'] + self.url
# r = requests.post(strUrl, json={}, data=None, headers=headers)
# r = r.json()
# result = json.loads(r['result'])
# if result['status'] == 1:
# if result.get('fixture_model_yesterday_list'):
# for item in result['fixture_model_yesterday_list']:
# if item:
# fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
# val = {
# "name": item['name'],
# "code": item['code'],
# "fixture_material_id": self.env['sf.fixture.material'].search(
# [('code', '=', item['fixture_material_code'])]).id,
# "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
# [('code', '=', item['multi_mounting_type_code'])]).id,
# "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
# "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
# "status": item['status'],
# "active": item['active'],
# }
# if not fixture_model:
# self.create(val)
# else:
# fixture_model.write(val)
# 定时同步夹具型号列表
def sync_fixture_model_yesterday(self):
config = self.env['res.config.settings'].get_values()
headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
strUrl = config['sf_url'] + self.url
r = requests.post(strUrl, json={}, data=None, headers=headers)
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
if result.get('fixture_model_yesterday_list'):
for item in result['fixture_model_yesterday_list']:
if item:
fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
val = {
"name": item['name'],
"code": item['code'],
"fixture_material_id": self.env['sf.fixture.material'].search(
[('code', '=', item['fixture_material_code'])]).id,
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
[('code', '=', item['multi_mounting_type_code'])]).id,
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
"status": item['status'],
"active": item['active'],
}
if not fixture_model:
self.create(val)
else:
fixture_model.write(val)
# else:
# raise ValidationError("夹具型号认证未通过")
else:
raise ValidationError("夹具型号认证未通过")
# # 定时同步所有夹具型号列表
# def sync_all_fixture_model(self):
# config = self.env['res.config.settings'].get_values()
# headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
# strUrl = config['sf_url'] + self.url
# r = requests.post(strUrl, json={}, data=None, headers=headers)
# r = r.json()
# result = json.loads(r['result'])
# # print('result:%s' % result)
# if result['status'] == 1:
# if result.get('fixture_model_all_list'):
# for item in result['fixture_model_all_list']:
# if item:
# fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
# val = {
# "name": item['name'],
# "code": item['code'],
# "fixture_material_id": self.env['sf.fixture.material'].search(
# [('code', '=', item['fixture_material_code'])]).id,
# "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
# [('code', '=', item['multi_mounting_type_code'])]).id,
# "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
# "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
# "status": item['status'],
# "active": item['active'],
# }
# if not fixture_model:
# self.create(val)
# else:
# fixture_model.write(val)
# else:
# raise ValidationError("夹具型号认证未通过")
# 定时同步所有夹具型号列表
def sync_all_fixture_model(self):
config = self.env['res.config.settings'].get_values()
headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
strUrl = config['sf_url'] + self.url
r = requests.post(strUrl, json={}, data=None, headers=headers)
r = r.json()
result = json.loads(r['result'])
# print('result:%s' % result)
if result['status'] == 1:
if result.get('fixture_model_all_list'):
for item in result['fixture_model_all_list']:
if item:
fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
val = {
"name": item['name'],
"code": item['code'],
"fixture_material_id": self.env['sf.fixture.material'].search(
[('code', '=', item['fixture_material_code'])]).id,
"multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
[('code', '=', item['multi_mounting_type_code'])]).id,
"brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
"model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
"status": item['status'],
"active": item['active'],
}
if not fixture_model:
self.create(val)
else:
fixture_model.write(val)
else:
raise ValidationError("夹具型号认证未通过")
# class SyncfixtureMaterialsBasicParameters(models.Model):
# _inherit = 'sf.fixture.materials.basic.parameters'
# _description = '同步夹具型号基本参数列表'
class SyncfixtureMaterialsBasicParameters(models.Model):
_inherit = 'sf.fixture.materials.basic.parameters'
_description = '同步夹具型号基本参数列表'
# url = '/api/fixture_parameters/list'
url = '/api/fixture_parameters/list'
# # 定时同步夹具型号基本信息
# def sync_fixture_materials_basic_parameters_yesterday(self):
# config = self.env['res.config.settings'].get_values()
# headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
# strUrl = config['sf_url'] + self.url
# r = requests.post(strUrl, json={}, data=None, headers=headers)
# r = r.json()
# result = json.loads(r['result'])
# if result['status'] == 1:
# if result.get('fixture_parameters_yesterday_list'):
# all_list = result.get('fixture_parameters_yesterday_list')
# if all_list.get('zero_chuck_all_list'):
# self._write_or_create(all_list.get('zero_chuck_yesterday_list'), '零点卡盘')
# if all_list.get('zero_tray_all_list'):
# self._write_or_create(all_list.get('zero_tray_yesterday_list'), '零点托盘')
# if all_list.get('pneumatic_fixture_all_list'):
# self._write_or_create(all_list.get('pneumatic_fixture_yesterday_list'), '气动夹具')
# if all_list.get('jaw_vice_all_list'):
# self._write_or_create(all_list.get('jaw_vice_yesterday_list'), '虎钳夹具')
# if all_list.get('magnet_fixture_all_list'):
# self._write_or_create(all_list.get('magnet_fixture_yesterday_list'), '磁吸夹具')
# if all_list.get('adapter_board_all_list'):
# 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'), '三爪卡盘')
# else:
# raise ValidationError("夹具型号基本参数认证未通过")
# 定时同步夹具型号基本信息
def sync_fixture_materials_basic_parameters_yesterday(self):
config = self.env['res.config.settings'].get_values()
headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
strUrl = config['sf_url'] + self.url
r = requests.post(strUrl, json={}, data=None, headers=headers)
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
if result.get('fixture_parameters_yesterday_list'):
all_list = result.get('fixture_parameters_yesterday_list')
if all_list.get('zero_chuck_all_list'):
self._write_or_create(all_list.get('zero_chuck_yesterday_list'), '零点卡盘')
if all_list.get('zero_tray_all_list'):
self._write_or_create(all_list.get('zero_tray_yesterday_list'), '零点托盘')
if all_list.get('pneumatic_fixture_all_list'):
self._write_or_create(all_list.get('pneumatic_fixture_yesterday_list'), '气动夹具')
if all_list.get('jaw_vice_all_list'):
self._write_or_create(all_list.get('jaw_vice_yesterday_list'), '虎钳夹具')
if all_list.get('magnet_fixture_all_list'):
self._write_or_create(all_list.get('magnet_fixture_yesterday_list'), '磁吸夹具')
if all_list.get('adapter_board_all_list'):
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'), '三爪卡盘')
else:
raise ValidationError("夹具型号基本参数认证未通过")
# # 定时同步所有夹具型号基本信息
# def sync_all_fixture_materials_basic_parameters(self):
# config = self.env['res.config.settings'].get_values()
# headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
# strUrl = config['sf_url'] + self.url
# r = requests.post(strUrl, json={}, data=None, headers=headers)
# r = r.json()
# result = json.loads(r['result'])
# if result['status'] == 1:
# if result.get('fixture_parameters_all_list'):
# all_list = result.get('fixture_parameters_all_list')
# if all_list.get('zero_chuck_all_list'):
# self._write_or_create(all_list.get('zero_chuck_all_list'), '零点卡盘')
# if all_list.get('zero_tray_all_list'):
# self._write_or_create(all_list.get('zero_tray_all_list'), '零点托盘')
# if all_list.get('pneumatic_fixture_all_list'):
# self._write_or_create(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
# if all_list.get('jaw_vice_all_list'):
# self._write_or_create(all_list.get('jaw_vice_all_list'), '虎钳夹具')
# if all_list.get('magnet_fixture_all_list'):
# self._write_or_create(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
# if all_list.get('adapter_board_all_list'):
# 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'), '三爪卡盘')
# else:
# raise ValidationError("夹具型号基本参数认证未通过")
# 定时同步所有夹具型号基本信息
def sync_all_fixture_materials_basic_parameters(self):
config = self.env['res.config.settings'].get_values()
headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
strUrl = config['sf_url'] + self.url
r = requests.post(strUrl, json={}, data=None, headers=headers)
r = r.json()
result = json.loads(r['result'])
if result['status'] == 1:
if result.get('fixture_parameters_all_list'):
all_list = result.get('fixture_parameters_all_list')
if all_list.get('zero_chuck_all_list'):
self._write_or_create(all_list.get('zero_chuck_all_list'), '零点卡盘')
if all_list.get('zero_tray_all_list'):
self._write_or_create(all_list.get('zero_tray_all_list'), '零点托盘')
if all_list.get('pneumatic_fixture_all_list'):
self._write_or_create(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
if all_list.get('jaw_vice_all_list'):
self._write_or_create(all_list.get('jaw_vice_all_list'), '虎钳夹具')
if all_list.get('magnet_fixture_all_list'):
self._write_or_create(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
if all_list.get('adapter_board_all_list'):
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'), '三爪卡盘')
else:
raise ValidationError("夹具型号基本参数认证未通过")
# def _write_or_create(self, fixture_parameters_list, material_name):
# for item in fixture_parameters_list:
# if item:
# basic_parameters = self.search([('code', '=', item.get('code')), ('active', 'in', [True, False])])
# if not basic_parameters:
# self.create(self._get_basic_parameters_list(item, material_name))
# else:
# basic_parameters.write(self._get_basic_parameters_list(item, material_name))
def _write_or_create(self, fixture_parameters_list, material_name):
for item in fixture_parameters_list:
if item:
basic_parameters = self.search([('code', '=', item.get('code')), ('active', 'in', [True, False])])
if not basic_parameters:
self.create(self._get_basic_parameters_list(item, material_name))
else:
basic_parameters.write(self._get_basic_parameters_list(item, material_name))
class SyncFunctionalFixtureType(models.Model):
@@ -3230,109 +3230,4 @@ class EmbryoRedundancySync(models.Model):
"height": item['height'],
"active": item['active'],
"remark": item['remark'],
})
class SyncfixtureMaterialsBasicParameters(models.Model):
_inherit = 'sf.fixture.materials.basic.parameters'
_description = 'Redis 优先同步夹具基本参数'
def sync_all_fixture_materials_basic_parameters(self):
rc = RedisClient()
key = 'mrs:fixture_param_all_list'
all_list = rc.get_json(key)
# ✅ Redis 无数据时,请求 MRS 端刷新 Redis 缓存
if not all_list:
config = self.env['res.config.settings'].get_values()
headers = Common.get_headers(config['token'], config['sf_secret_key'])
refresh_url = config['mrs_url'] + '/api/refresh_redis/fixture_param'
try:
res = requests.post(refresh_url, headers=headers, json={}, timeout=10)
res.raise_for_status()
except Exception as e:
raise ValidationError(f"Redis 无数据MRS 缓存刷新失败: {str(e)}")
# 再次尝试从 Redis 获取
all_list = rc.get_json(key)
if not all_list:
raise ValidationError("Redis 刷新后仍无数据,无法同步夹具基本参数")
# ✅ 同步函数作为局部函数定义在方法体内部
def _sync_list(param_list, material_name):
for item in param_list or []:
if not item or not item.get('code'):
continue
record = self.search([('code', '=', item['code'])], limit=1)
vals = self._get_basic_parameters_list(item, material_name)
if record:
record.write(vals)
else:
self.create(vals)
# ✅ 各类夹具参数同步调用
_sync_list(all_list.get('zero_chuck_all_list'), '零点卡盘')
_sync_list(all_list.get('zero_tray_all_list'), '零点托盘')
_sync_list(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
_sync_list(all_list.get('jaw_vice_all_list'), '虎钳夹具')
_sync_list(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
_sync_list(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
_sync_list(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
_sync_list(all_list.get('air_tray_all_list'), '气吹托盘')
_sync_list(all_list.get('magnet_tray_all_list'), '磁吸托盘')
class SyncFixtureModel(models.Model):
_inherit = 'sf.fixture.model'
_description = 'Redis 优先同步夹具型号'
def sync_all_fixture_model(self):
rc = RedisClient()
key = 'mrs:fixture_model_all_list'
all_list = rc.get_json(key)
# ✅ Redis 没数据时,请求 MRS 接口刷新
if not all_list:
config = self.env['res.config.settings'].get_values()
headers = Common.get_headers(config['token'], config['sf_secret_key'])
refresh_url = config['mrs_url'] + '/api/refresh_redis/fixture_model'
try:
res = requests.post(refresh_url, headers=headers, json={}, timeout=10)
res.raise_for_status()
except Exception as e:
raise ValidationError(f"Redis 无数据MRS 刷新失败: {str(e)}")
# 再次尝试获取 Redis
all_list = rc.get_json(key)
if not all_list:
raise ValidationError("刷新后仍无 Redis 数据,无法同步夹具型号")
# ✅ 开始同步夹具型号
for item in all_list:
if not item or not item.get('code'):
continue
record = self.search([('code', '=', item['code'])], limit=1)
vals = {
'name': item['name'],
'code': item['code'],
'fixture_material_id': self.env['sf.fixture.material']
.search([('code', '=', item['fixture_material_code'])], limit=1).id,
'multi_mounting_type_id': self.env['sf.multi_mounting.type']
.search([('code', '=', item['multi_mounting_type_code'])], limit=1).id,
'brand_id': self.env['sf.machine.brand']
.search([('code', '=', item['brand_code'])], limit=1).id,
'model_file': base64.b64decode(item['model_file']) if item.get('model_file') else False,
'status': item['status'],
'active': item['active'],
}
if record:
record.write(vals)
else:
self.create(vals)
})

View File

@@ -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 "热处理后密度"