Compare commits

..

19 Commits

Author SHA1 Message Date
chenye
bba9e8e8a8 采购到货通知需求更改 2025-07-17 15:20:34 +08:00
胡尧
e4c3435840 Accept Merge Request #2292: (feature/增加模块完整性验证 -> develop)
Merge Request: 去掉多余的js

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2292?initial=true
2025-07-16 15:04:01 +08:00
胡尧
2a7048dafd 去掉多余的js 2025-07-16 15:03:23 +08:00
胡尧
2bb215f9df Accept Merge Request #2291: (feature/增加模块完整性验证 -> develop)
Merge Request: 去掉多余的js文件

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2291?initial=true
2025-07-16 14:33:35 +08:00
胡尧
a2be3a0dbf 去掉多余的js文件 2025-07-16 14:32:37 +08:00
李晓斌
1f4ceab377 Accept Merge Request #2290: (feature/7253 -> develop)
Merge Request: Bug_7262_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2290?initial=true
2025-07-16 14:10:37 +08:00
lixiaobin@jikimo.com
94d727e8e0 Bug_7262_lxb_commit 2025-07-16 14:06:58 +08:00
李晓斌
42d9f894dd Accept Merge Request #2289: (feature/7253 -> develop)
Merge Request: BUG_7276_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2289
2025-07-16 11:23:08 +08:00
lixiaobin@jikimo.com
9416d1c1a0 BUG_7276_lxb_commit 2025-07-16 11:20:26 +08:00
管欢
7dd44ca12c Accept Merge Request #2288: (feature/物料需求计划管理 -> develop)
Merge Request: 下达计划按钮重复点击生成重复数据

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2288
2025-07-16 09:41:06 +08:00
李晓斌
2738085a1e Accept Merge Request #2287: (feature/7253 -> develop)
Merge Request: Bug_7276_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2287?initial=true
2025-07-15 16:56:26 +08:00
lixiaobin@jikimo.com
61c1fdbd05 Bug_7276_lxb_commit 2025-07-15 16:53:52 +08:00
李晓斌
714c68c0c1 Accept Merge Request #2286: (feature/7253 -> develop)
Merge Request: BUG_7276_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2286
2025-07-15 14:35:11 +08:00
lixiaobin@jikimo.com
f3e7ba7f68 BUG_7276_lxb_commit 2025-07-15 14:17:38 +08:00
lixiaobin@jikimo.com
df589b43e7 BUG_7276_lxb_commit 2025-07-15 14:13:01 +08:00
lixiaobin@jikimo.com
8bdc65c626 BUG_7276_lxb_commit 2025-07-15 14:09:14 +08:00
李晓斌
7fca59322e Accept Merge Request #2285: (feature/7253 -> develop)
Merge Request: BUG_7276_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2285
2025-07-15 09:42:48 +08:00
lixiaobin@jikimo.com
42694c1ac6 BUG_7276_lxb_commit 2025-07-15 09:39:50 +08:00
管欢
e88fc012ec Accept Merge Request #2284: (feature/物料需求计划管理 -> develop)
Merge Request: 校验修改

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2284
2025-07-14 16:16:20 +08:00
32 changed files with 580 additions and 378 deletions

View File

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

View File

@@ -1,62 +0,0 @@
/** @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"
});
}
}
});
}
})

View File

@@ -1,42 +0,0 @@
/** @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,
});

View File

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

View File

@@ -9,5 +9,3 @@ 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

@@ -222,10 +222,15 @@ class SfDemandPlan(models.Model):
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')
if not self.overdelivery_allowed and line_ids.filtered(lambda p: p.location_id.id == customer_location_id):
if float_compare(sum_product_uom_qty, self.product_uom_qty,
precision_rounding=self.product_id.uom_id.rounding) == 1:
raise ValidationError(f"已禁止向合作伙伴/客户超量发货,请更换“补货原因”或将“可超量发货”设置为“是”。")
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 {

View File

@@ -613,14 +613,14 @@ class SfProductionDemandPlan(models.Model):
filtered_plan = self.filtered(lambda mo: mo.status == '30')
if not filtered_plan:
raise UserError(_("没有需要下达的计划!"))
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')
if self.location_id.id == customer_location_id:
check_overdelivery_allowed = True
# 按产品分组并计算总数
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] = {
@@ -630,17 +630,22 @@ 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 float_compare(data['plan_uom_qty'], data['product_uom_qty'],
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 warning_messages and check_overdelivery_allowed:
raise ValidationError(f"已禁止向合作伙伴/客户超量发货,请更换“补货原因”或将“可超量发货”设置为“是”。")
if error_messages:
error_message = "\n".join(error_messages)
raise ValidationError(error_message)
elif warning_messages:
warning_message = "\n".join(warning_messages)
return {
@@ -655,6 +660,9 @@ class SfProductionDemandPlan(models.Model):
'default_demand_plan_line_id': self.ids,
'default_release_message': warning_message,
}}
else:
for demand_plan_line_id in filtered_plan:
demand_plan_line_id.action_confirm()
def button_release_plan(self):
self.ensure_one()
@@ -912,60 +920,4 @@ class SfProductionDemandPlan(models.Model):
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,
}}
pass

View File

@@ -1,37 +0,0 @@
# -*- 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

@@ -1,16 +0,0 @@
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,7 +13,4 @@ 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_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
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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
13
14
15
16

View File

@@ -25,6 +25,7 @@ export class CustomDemandPlanListRenderer extends ListRenderer {
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);

View File

@@ -92,10 +92,6 @@
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

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

View File

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

View File

@@ -1,74 +0,0 @@
# -*- 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

@@ -1,58 +0,0 @@
<?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.Model):
class SfDemandPlanPrintWizard(models.TransientModel):
_name = 'sf.demand.plan.print.wizard'
_description = u'打印向导'
@@ -37,7 +37,7 @@ class SfDemandPlanPrintWizard(models.Model):
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(
[('model_id', '=', record.model_id)])

View File

@@ -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_sale_multiple_supply_methods', 'product', 'jikimo_tree_header_buttons_always_visible'],
'data': [
'data/cron_data.xml',
'data/stock_data.xml',

View File

@@ -0,0 +1,2 @@
from . import models
from . import wizard

View File

@@ -0,0 +1,33 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
{
'name': '机企猫智能工厂 采购到货通知',
'version': '1.1',
'summary': '智能工厂计划管理',
'sequence': 1,
'description': """
在本模块,支持采购到货通知
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
'depends': ['jikimo_purchase_request', 'quality_control', 'sf_manufacturing'],
'data': [
'views/product_category.xml',
'views/purchase_view.xml',
'wizard/purchase_confirm_wizard_view.xml',
'security/ir.model.access.csv',
],
'demo': [
],
'assets': {
'web.assets_qweb': [
],
'web.assets_backend': [
]
},
'license': 'LGPL-3',
'installable': True,
'application': False,
'auto_install': False,
}

View File

@@ -0,0 +1,5 @@
from . import product_category
from . import purchase_order
from . import storage_list
from . import quality_check

View File

@@ -0,0 +1,7 @@
from odoo import models, fields
class SfProductCategory(models.Model):
_inherit = 'product.category'
arrival_inform = fields.Boolean('到货通知', default=False)

View File

@@ -0,0 +1,108 @@
from odoo import models, fields, api, _
from odoo.exceptions import UserError
class SfPurchaseOrder(models.Model):
_inherit = 'purchase.order'
# 收料入库明细
storage_list_ids = fields.One2many('storage.list', 'purchase_order_id', string='收料入库明细')
# 计算字段:总收料数量
total_received_quantity = fields.Float(string='到货数量',compute='_compute_total_received_quantity',store=True)
purchase_order_line_id = fields.Many2one('purchase.order.line', string='采购订单行')
@api.depends('order_line.arrival_quantity','order_line.product_qty')
def _compute_total_received_quantity(self):
for order in self:
total_arrival_quantity = sum(line.arrival_quantity for line in order.order_line)
total_product_qty=sum(line.product_qty for line in order.order_line)
order.total_received_quantity = f'{total_arrival_quantity}/{total_product_qty}'
def open_arrival_inform(self):
self.ensure_one()
# 方式一:把数据写入普通模型(如果要持久化关联关系等场景)
# 先清空旧数据(如果需要),避免重复
self.env["storage.list"].search([
("purchase_order_id", "=", self.id)
]).unlink()
pickings = self.env['stock.picking'].search([
('origin', '=', self.name),
# ('picking_type_code', '=', 'incoming'),
('state', '!=', 'cancel')
])
relate_vals_list = []
for picking in pickings:
for move_line in picking.move_ids_without_package:
relate_vals = {
"purchase_order_id": self.id,
"product_id": move_line.product_id.id,
"picking_id": picking.id,
"ordered_quantity": move_line.product_uom_qty,
# "current_arrival_quantity": move_line.product_uom_qty, # 默认到货数量等于需求数量
"product_code": move_line.product_id.default_code,
"product_remark": move_line.name,
"part_number": move_line.part_number,
"state": picking.state,
}
relate_vals_list.append(relate_vals)
if relate_vals_list:
self.env["storage.list"].create(relate_vals_list)
action = {
'name': _("选择到货通知"),
'type':'ir.actions.act_window',
'view_mode':'form',
'views': [(self.env.ref('sf_purchase_arrival_inform.storage_list_wrapper_form').id, 'form')],
'res_model':'purchase.order',
'target':'new',
'res_id': self.id,
'context': {
'dialog_size': 'large',
},
}
return action
def confirm_arrival_inform(self):
"""确认到货通知"""
# 直接调用storage_list的批量确认方法
if self.storage_list_ids:
self.storage_list_ids.button_confirm()
# 关闭弹窗
return {'type': 'ir.actions.act_window_close'}
#询价单确认时加二次确认逻辑
def button_confirm(self):
"""采购订单确认,弹出确认向导"""
# 无订单行时直接确认
if not self.order_line:
return super().button_confirm()
# 直接创建向导记录并打开
wizard = self.env['purchase.confirm.wizard'].create({
'purchase_order_id': self.id
})
return {
'name': _('询价单订单确认'),
'type': 'ir.actions.act_window',
'res_model': 'purchase.confirm.wizard',
'res_id': wizard.id,
'view_mode': 'form',
'target': 'new',
}
def _execute_original_confirm(self):
"""执行原始的确认逻辑"""
res = super().button_confirm()
return res
class SfPurchaseOrderLine(models.Model):
_inherit = 'purchase.order.line'
# 到货数量(实际存储字段)
arrival_quantity = fields.Float(string='到货数量', default=0.0, help='累计到货数量')

View File

@@ -0,0 +1,61 @@
from odoo import models, fields, api
import logging
_logger = logging.getLogger(__name__)
class QualityPoint(models.Model):
_inherit = 'quality.point'
quality_status = fields.Selection([
('waiting', '等待'),
('none', '待处理')
], string='默认质检状态',
help='收料入库时质量检查单的默认状态。如果设置了此值,系统会在创建质检单时自动使用该状态。')
class QualityCheck(models.Model):
_inherit = 'quality.check'
@api.model_create_multi
def create(self, vals_list):
"""
重写create方法根据quality.point配置动态设置quality_state
当picking_type为收料入库时从质量控制点配置中获取默认状态
"""
# 先调用父类方法创建记录
records = super().create(vals_list)
# 对创建的记录进行状态调整
for record in records:
try:
# 只处理收料入库的质检单且未手动设置状态的记录
if (record.picking_id and
record.picking_id.picking_type_id.code == 'incoming' and
record.quality_state in ['none', 'waiting']): # 只调整默认状态
# 查找匹配的质量控制点配置
quality_point = record.point_id
if not quality_point and record.product_id:
# 如果没有直接关联的质量点,则根据产品和作业类型查找
domain = self.env['quality.point']._get_domain(
record.product_id,
record.picking_id.picking_type_id,
measure_on='product'
)
quality_point = self.env['quality.point'].search(domain, limit=1)
# 如果找到配置且有默认状态值,则更新记录状态
if quality_point and quality_point.quality_status:
original_state = record.quality_state
record.quality_state = quality_point.quality_status
_logger.info(
f"质量检查单状态已更新: {record.name}, "
f"产品: {record.product_id.name}, "
f"收料单: {record.picking_id.name}, "
f"状态: {original_state} -> {quality_point.quality_status}"
)
except Exception as e:
_logger.warning(f"更新质量检查单状态时发生错误: {record.name}, 错误: {str(e)}")
return records

View File

@@ -0,0 +1,140 @@
from odoo import models, fields, api
from odoo.exceptions import ValidationError
class StorageList(models.Model):
_name = 'storage.list'
_description = '收料入库明细'
_order = 'create_date desc'
# 基础关联字段
purchase_order_id = fields.Many2one('purchase.order', string='采购订单', required=True)
picking_id = fields.Many2one('stock.picking', string='收料入库单', readonly=True)
product_id = fields.Many2one('product.product', string='产品', required=True)
# 产品信息基于product_id的related字段
product_code = fields.Char(related='product_id.default_code', string='产品料号', store=True)
product_remark = fields.Text(string='产品说明')
part_number = fields.Char(string='零件图号')
# 数量字段
ordered_quantity = fields.Float(string='需求数量', required=True)
# 到货数量,默认=需求数量
current_arrival_quantity = fields.Float(string='到货数量', required=True)
@api.model
def create(self, vals):
# 如果没有设置current_arrival_quantity则默认等于ordered_quantity
if 'current_arrival_quantity' not in vals and 'ordered_quantity' in vals:
vals['current_arrival_quantity'] = vals['ordered_quantity']
return super().create(vals)
@api.constrains('current_arrival_quantity')
def _check_current_arrival_quantity(self):
for line in self:
if line.current_arrival_quantity <= 0:
raise ValidationError('到货数量必须大于0')
if line.current_arrival_quantity > line.ordered_quantity:
raise ValidationError('当前到货数量不能超过需求数量')
def button_confirm(self):
"""更新采购订单行的收料数量"""
for record in self:
# 查找对应的采购订单行
order_line = self.env['purchase.order.line'].search([
('order_id', '=', record.purchase_order_id.id),
('product_id', '=', record.product_id.id)
], limit=1)
if order_line:
# 累加当前记录的到货数量到采购订单行
order_line.arrival_quantity += record.current_arrival_quantity
# 更新质量检查单状态为待处理
if self:
self._update_quality_check_status(self[0].purchase_order_id)
def _update_quality_check_status(self, purchase_order):
"""更新质量检查单状态为待处理
Args:
purchase_order: 采购订单记录
Returns:
int: 更新的质量检查单数量
"""
try:
# 获取当前到货通知涉及的收料入库单
storage_records = self.env['storage.list'].search([
('purchase_order_id', '=', purchase_order.id)
])
if not storage_records:
return 0
# 收集所有相关的picking_id和product_id过滤空值
picking_ids = [pid for pid in storage_records.mapped('picking_id.id') if pid]
product_ids = [pid for pid in storage_records.mapped('product_id.id') if pid]
if not picking_ids or not product_ids:
return 0
# 构建质量检查单搜索域,包含等待和待处理状态
base_domain = [
('quality_state', 'in', ['waiting', 'none']),
('product_id', 'in', product_ids),
]
# 方法1通过picking_id精确匹配质量检查单
quality_checks_by_picking = self.env['quality.check'].search(
base_domain + [('picking_id', 'in', picking_ids)]
)
# 方法2通过move_id匹配更精确因为一个picking可能有多个move
stock_moves = self.env['stock.move'].search([
('picking_id', 'in', picking_ids),
('product_id', 'in', product_ids),
])
quality_checks_by_move = self.env['quality.check']
if stock_moves:
quality_checks_by_move = self.env['quality.check'].search(
base_domain + [('move_id', 'in', stock_moves.ids)]
)
# 方法3通过move_line_id匹配最精确
move_lines = self.env['stock.move.line'].search([
('picking_id', 'in', picking_ids),
('product_id', 'in', product_ids),
])
quality_checks_by_move_line = self.env['quality.check']
if move_lines:
quality_checks_by_move_line = self.env['quality.check'].search(
base_domain + [('move_line_id', 'in', move_lines.ids)]
)
# 合并所有匹配的质量检查单(去重)
all_quality_checks = quality_checks_by_picking | quality_checks_by_move | quality_checks_by_move_line
if not all_quality_checks:
return 0
# 批量更新状态为待处理
all_quality_checks.write({'quality_state': 'none'})
# 记录日志
product_names = storage_records.mapped('product_id.name')
purchase_order.message_post(
body=f"到货通知确认:已更新 {len(all_quality_checks)} 个质量检查单状态为待处理<br/>"
f"涉及产品:{', '.join(product_names)}<br/>"
f"涉及收料入库单:{', '.join([p.name or '' for p in storage_records.mapped('picking_id')])}"
)
return len(all_quality_checks)
except Exception as e:
# 记录错误日志,但不阻断流程
purchase_order.message_post(
body=f"更新质量检查单状态时发生错误:{str(e)}"
)
return 0

View File

@@ -0,0 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_storage_list,storage.list,model_storage_list,purchase.group_purchase_user,1,1,1,1
access_purchase_confirm_wizard,purchase.confirm.wizard,model_purchase_confirm_wizard,purchase.group_purchase_user,1,1,1,1
access_purchase_confirm_wizard_line,purchase.confirm.wizard.line,model_purchase_confirm_wizard_line,purchase.group_purchase_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_storage_list storage.list model_storage_list purchase.group_purchase_user 1 1 1 1
3 access_purchase_confirm_wizard purchase.confirm.wizard model_purchase_confirm_wizard purchase.group_purchase_user 1 1 1 1
4 access_purchase_confirm_wizard_line purchase.confirm.wizard.line model_purchase_confirm_wizard_line purchase.group_purchase_user 1 1 1 1

View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<!-- 继承产品分类视图 -->
<record id="product_category_form_view_inherit" model="ir.ui.view">
<field name="name">product.category.form.inherit</field>
<field name="model">product.category</field>
<field name="inherit_id" ref="stock.product_category_form_view_inherit" />
<field name="arch" type="xml">
<xpath expr="//field[@name='removal_strategy_id']" position="after">
<field name="arrival_inform"/>
</xpath>
</field>
</record>
<record id="quality_view_form" model="ir.ui.view">
<field name="name">arrival.inform.quality.point.view.form</field>
<field name="model">quality.point</field>
<field name="inherit_id" ref="mrp_workorder.quality_point_view_form_inherit_mrp"/>
<field name="mode">primary</field>
<field name="arch" type="xml">
<field name="picking_type_ids" position="after">
<field name="quality_status"/>
</field>
</field>
</record>
</data>
</odoo>

View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<!-- 继承采购订单视图 -->
<record id="purchase_order_view_tree_inherit" model="ir.ui.view">
<field name="name">purchase.order.tree.inherit</field>
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_planned']" position="after">
<field name="total_received_quantity"/>
</xpath>
<xpath expr="//tree" position="inside">
<button name="open_arrival_inform" string="到货通知" type="object" class="btn-primary"/>
</xpath>
</field>
</record>
<record id="purchase_order_form" model="ir.ui.view">
<field name="name">purchase.order.form</field>
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_form" />
<field name="arch" type="xml">
<xpath expr="//field[@name='order_line']/tree" position="inside">
<field name="arrival_quantity"/>
</xpath>
</field>
</record>
<!-- 到货通知form视图 -->
<record id="storage_list_wrapper_form" model="ir.ui.view">
<field name="name">storage.list.wrapper.form</field>
<field name="model">purchase.order</field>
<field name="arch" type="xml">
<form string="选择到货通知" create="false" duplicate="false">
<group>
<field name="name" readonly="1"/>
</group>
<field name="storage_list_ids">
<tree string="收料入库明细" editable="bottom" create="false" delete="true" export="false">
<field name="product_code"/>
<field name="product_id" readonly="1"/>
<field name="product_remark" widget="section_and_note_text" readonly="1"/>
<field name="part_number" readonly="1"/>
<field name="ordered_quantity" readonly="1"/>
<field name="current_arrival_quantity" attrs="{'invisible': [('ordered_quantity', '=', '0')]}"/>
</tree>
</field>
<footer>
<button name="confirm_arrival_inform" string="确认" type="object" class="btn-primary" data-hotkey="q"/>
<button string="取消" class="btn-secondary" special="cancel" data-hotkey="z"/>
</footer>
</form>
</field>
</record>
</data>
</odoo>

View File

@@ -0,0 +1,2 @@
from . import purchase_confirm_wizard

View File

@@ -0,0 +1,64 @@
from odoo import models, fields, api, _
class PurchaseConfirmWizard(models.TransientModel):
_name = 'purchase.confirm.wizard'
_description = '采购订单确认向导'
purchase_order_id = fields.Many2one('purchase.order', string='采购订单', required=True)
line_ids = fields.One2many('purchase.confirm.wizard.line', 'wizard_id', string='产品明细')
@api.model_create_multi
def create(self, vals_list):
"""创建向导时自动生成产品明细"""
records = super().create(vals_list)
for record in records:
if record.purchase_order_id:
# 自动创建产品明细行
line_data = []
for line in record.purchase_order_id.order_line:
line_data.append({
'wizard_id': record.id,
'product_id': line.product_id.id,
'product_name': line.product_id.name,
'product_qty': line.product_qty,
'product_uom': line.product_uom.name,
'uom_rounding': line.product_uom.rounding,
})
if line_data:
self.env['purchase.confirm.wizard.line'].create(line_data)
return records
def action_confirm(self):
"""确认采购订单"""
if self.purchase_order_id:
# 调用原始的确认方法
self.purchase_order_id._execute_original_confirm()
# 返回关闭向导并刷新采购订单页面
return {
'type': 'ir.actions.act_window_close',
'infos': {
'title': _('成功'),
'message': _('采购订单已确认成功!'),
}
}
def action_cancel(self):
"""取消操作"""
return {'type': 'ir.actions.act_window_close'}
class PurchaseConfirmWizardLine(models.TransientModel):
_name = 'purchase.confirm.wizard.line'
_description = '采购订单确认向导明细'
wizard_id = fields.Many2one('purchase.confirm.wizard', string='向导', ondelete='cascade')
product_id = fields.Many2one('product.product', string='产品')
product_name = fields.Char(string='产品名称')
product_qty = fields.Float(string='数量')
product_uom = fields.Char(string='单位')
uom_rounding = fields.Float(string='舍入精度')

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- 采购订单确认向导视图 -->
<record id="purchase_confirm_wizard_form" model="ir.ui.view">
<field name="name">purchase.confirm.wizard.form</field>
<field name="model">purchase.confirm.wizard</field>
<field name="arch" type="xml">
<form string="采购订单确认">
<div class="alert alert-warning" role="alert">
<strong>确认提示:</strong>以下产品数量将按单位舍入精度向上取整处理,请核实后确认是否继续。
</div>
<group>
<field name="purchase_order_id" readonly="1"/>
</group>
<separator string="产品明细信息"/>
<field name="line_ids" readonly="1" nolabel="1" widget="one2many_list">
<tree decoration-info="True" create="false" edit="false">
<field name="product_name" string="产品名称" width="40%"/>
<field name="product_qty" string="订购数量" width="20%"/>
<field name="product_uom" string="计量单位" width="20%"/>
<field name="uom_rounding" string="舍入精度" widget="float" digits="[16,6]" width="20%"/>
</tree>
</field>
<footer>
<button name="action_confirm" string="确认订单" type="object" class="btn-primary"/>
<button name="action_cancel" string="取消" type="object" class="btn-secondary"/>
</footer>
</form>
</field>
</record>
</odoo>

View File

@@ -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('embryo_redundancy_id') else False,
'is_incoming_material': True if item.get('incoming_size') 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('客供料', compute='_compute_is_incoming_material', store=True)
is_incoming_material = fields.Boolean('客供料', store=True)
embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
manual_quotation = fields.Boolean('人工编程', default=False)
model_url = fields.Char('模型文件地址')