Compare commits
42 Commits
feature/搜索
...
feature/me
| Author | SHA1 | Date | |
|---|---|---|---|
|
61baa49d85 | ||
|
|
063c7a94c5 | ||
|
|
b783af6ef3 | ||
|
|
22cbe1bd9d | ||
|
|
cc196e25da | ||
|
|
961754428b | ||
|
|
7e47a85167 | ||
|
|
2644df4fd5 | ||
|
|
e14aa35d90 | ||
|
|
9392819375 | ||
|
|
ea3d9e5375 | ||
|
|
7db0a44420 | ||
|
|
238840b647 | ||
|
|
51e25d8847 | ||
|
|
c6f06a4c32 | ||
|
|
5b61a801c5 | ||
|
|
2893524902 | ||
|
|
ed55e36f45 | ||
|
|
c811f26104 | ||
|
|
3763b60758 | ||
|
|
976907bd92 | ||
|
|
50c3b31ece | ||
|
|
8afc8bb3a6 | ||
|
|
a0427d424f | ||
|
|
3148ce5a15 | ||
|
|
8e726e1bf6 | ||
|
|
4c0f9cfb39 | ||
|
|
86d3bd38c5 | ||
|
|
a8e4c7d9a0 | ||
|
|
7501832637 | ||
|
|
ce0ead4da6 | ||
|
|
343e2f9f24 | ||
|
|
6d3793ee30 | ||
|
|
43f7e97c28 | ||
|
|
9e6f3fa864 | ||
|
|
ed50d7c9a7 | ||
|
|
89e23050e6 | ||
|
|
b7f912453f | ||
|
|
1040844b0a | ||
|
|
36a13c04de | ||
|
|
f4318bd997 | ||
|
|
d47a30977c |
@@ -8,19 +8,17 @@
|
||||
'category': 'purchase',
|
||||
'depends': ['sf_manufacturing', 'purchase_request'],
|
||||
'data': [
|
||||
'security/ir.model.access.csv',
|
||||
'views/sale_order_view.xml',
|
||||
'views/mrp_production.xml',
|
||||
'views/purchase_request_view.xml',
|
||||
'wizard/purchase_request_line_make_purchase_order_view.xml',
|
||||
'views/purchase_request_line_view.xml',
|
||||
'wizard/purchase_request_wizard_views.xml',
|
||||
],
|
||||
'assets': {
|
||||
'web.assets_backend': [
|
||||
'jikimo_purchase_request/static/src/**/*'
|
||||
],
|
||||
},
|
||||
'web.assets_backend': [
|
||||
'jikimo_purchase_request/static/src/**/*'
|
||||
],
|
||||
},
|
||||
'application': True,
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
|
||||
@@ -410,7 +410,7 @@ msgstr "显示名称"
|
||||
#: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
|
||||
#: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_search
|
||||
msgid "Done"
|
||||
msgstr "关闭"
|
||||
msgstr "完成"
|
||||
|
||||
#. module: purchase_request
|
||||
#: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__move_dest_ids
|
||||
@@ -1043,7 +1043,7 @@ msgstr "询价单"
|
||||
#. module: purchase_request
|
||||
#: model:ir.model.fields,field_description:purchase_request.field_purchase_request_line__purchased_qty
|
||||
msgid "RFQ/PO Qty"
|
||||
msgstr "已订购数"
|
||||
msgstr ""
|
||||
|
||||
#. module: purchase_request
|
||||
#. odoo-python
|
||||
|
||||
@@ -5,4 +5,3 @@ from . import sale_order
|
||||
from . import mrp_production
|
||||
from . import purchase_order
|
||||
from . import stock_rule
|
||||
from . import stock_picking
|
||||
|
||||
@@ -19,8 +19,9 @@ class MrpProduction(models.Model):
|
||||
# item.pr_mp_count = len(pr_ids)
|
||||
# 由于采购申请合并了所有销售订单行的采购，所以不区分产品
|
||||
first_mp = self.env['mrp.production'].search(
|
||||
[('origin', '=', item.origin)], limit=1, order='id asc')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
|
||||
[('origin', '=', item.origin)], limit=1, order='id asc')
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', first_mp.name), ('is_subcontract', '!=', 'True')])
|
||||
item.pr_mp_count = len(pr_ids)
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name), ('is_subcontract', '!=', 'True')])
|
||||
|
||||
@@ -29,18 +30,10 @@ class MrpProduction(models.Model):
|
||||
采购请求
|
||||
"""
|
||||
self.ensure_one()
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name),('is_subcontract', '!=', True)])
|
||||
# if self.product_id.product_tmpl_id.single_manufacturing == True and not self.is_remanufacture:
|
||||
# first_order = self.env['mrp.production'].search(
|
||||
# [('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_order.name)])
|
||||
# else:
|
||||
# pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)])
|
||||
# 由于采购申请合并了所有销售订单行的采购，所以不区分产品
|
||||
first_mp = self.env['mrp.production'].search(
|
||||
[('origin', '=', self.origin)], limit=1, order='id asc')
|
||||
pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', first_mp.name)])
|
||||
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', first_mp.name), ('is_subcontract', '!=', 'True')])
|
||||
|
||||
action = {
|
||||
'res_model': 'purchase.request',
|
||||
@@ -54,7 +47,7 @@ class MrpProduction(models.Model):
|
||||
else:
|
||||
action.update({
|
||||
'name': _("从 %s生成采购请求单", self.name),
|
||||
'domain': [('id', 'in', pr_ids)],
|
||||
'domain': [('id', 'in', pr_ids.ids)],
|
||||
'view_mode': 'tree,form',
|
||||
})
|
||||
return action
|
||||
|
||||
@@ -13,7 +13,11 @@ class ProductTemplate(models.Model):
|
||||
template_id.purchase_request = product_id.purchase_request
|
||||
return template_id
|
||||
|
||||
|
||||
class ProdcutProduct(models.Model):
|
||||
_inherit = 'product.product'
|
||||
|
||||
def copy_template(self, product_template_id):
|
||||
""" 复制成品模板时，复制采购申请 """
|
||||
super(ProductTemplate, self).copy_template(product_template_id)
|
||||
super(ProdcutProduct, self).copy_template(product_template_id)
|
||||
self.purchase_request = product_template_id.purchase_request
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
import re
|
||||
import ast
|
||||
from odoo import models, fields, api, _
|
||||
from itertools import groupby
|
||||
from odoo.tools import float_compare
|
||||
from odoo import models, fields, api
|
||||
|
||||
|
||||
class PurchaseRequest(models.Model):
|
||||
_inherit = 'purchase.request'
|
||||
_description = '采购申请'
|
||||
|
||||
# 为state添加取消状态
|
||||
# 为state添加取消状态
|
||||
state = fields.Selection(
|
||||
selection_add=[('cancel', '已取消')],
|
||||
ondelete={'cancel': 'set default'} # 添加 ondelete 策略
|
||||
@@ -31,57 +29,6 @@ class PurchaseRequest(models.Model):
|
||||
action['context'] = origin_context
|
||||
return action
|
||||
|
||||
def button_done(self):
|
||||
product_qty_map = {key: sum(line.product_qty for line in group) for key, group in
|
||||
groupby(self.line_ids, key=lambda x: x.product_id.id)}
|
||||
lines = self.mapped("line_ids.purchase_lines.order_id")
|
||||
# 采购单产品和数量
|
||||
product_summary = {}
|
||||
product_rounding = {}
|
||||
if lines:
|
||||
for line in lines:
|
||||
for line_item in line.order_line:
|
||||
if line_item.state == 'purchase':
|
||||
product_id = line_item.product_id.id
|
||||
qty = line_item.product_qty
|
||||
product_rounding[product_id] = line_item.product_id.uom_id.rounding
|
||||
if product_id in product_summary:
|
||||
product_summary[product_id] += qty
|
||||
else:
|
||||
product_summary[product_id] = qty
|
||||
|
||||
# 校验产品数量
|
||||
discrepancies = []
|
||||
for product_id, qty in product_qty_map.items():
|
||||
if product_id in product_summary:
|
||||
if float_compare(product_summary[product_id], qty, precision_rounding=product_rounding[product_id]) < 0:
|
||||
discrepancies.append((product_id, qty, product_summary[product_id]))
|
||||
else:
|
||||
discrepancies.append((product_id, qty, 0))
|
||||
|
||||
if discrepancies:
|
||||
# 弹出提示框
|
||||
message = "产品与采购数量不一致:\n"
|
||||
for product_id, required_qty, order_qty in discrepancies:
|
||||
product_name = self.env['product.product'].browse(product_id).display_name # 获取产品名称
|
||||
message += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单确认的数量 {order_qty}。\n"
|
||||
# 添加确认框
|
||||
message += "确认关闭？"
|
||||
return {
|
||||
'name': _('采购申请'),
|
||||
'type': 'ir.actions.act_window',
|
||||
'views': [(self.env.ref(
|
||||
'jikimo_purchase_request.purchase_request_wizard_wizard_form_view').id,
|
||||
'form')],
|
||||
'res_model': 'purchase.request.wizard',
|
||||
'target': 'new',
|
||||
'context': {
|
||||
'default_purchase_request_id': self.id,
|
||||
'default_message': message,
|
||||
}}
|
||||
return super(PurchaseRequest, self).button_done()
|
||||
|
||||
|
||||
class PurchaseRequestLine(models.Model):
|
||||
_inherit = 'purchase.request.line'
|
||||
_description = '采购申请明细'
|
||||
@@ -100,8 +47,7 @@ class PurchaseRequestLine(models.Model):
|
||||
('outsourcing', "委外加工"),
|
||||
], string='供货方式', compute='_compute_supply_method', store=True)
|
||||
|
||||
purchase_request_count = fields.Integer(string='采购申请数量', compute='_compute_purchase_request_count',
|
||||
readonly=True)
|
||||
purchase_request_count = fields.Integer(string='采购申请数量', compute='_compute_purchase_request_count', readonly=True)
|
||||
purchase_count = fields.Integer(string="采购订单数量", compute="_compute_purchase_count", readonly=True)
|
||||
|
||||
@api.depends("purchase_lines")
|
||||
@@ -146,7 +92,7 @@ class PurchaseRequestLine(models.Model):
|
||||
continue
|
||||
if record.product_id.categ_id.name == '坯料':
|
||||
product_name = ''
|
||||
match = re.search(r'(S\d{5}-\d+)', record.product_id.name)
|
||||
match = re.search(r'(S\d{5}-\d)', record.product_id.name)
|
||||
# 如果匹配成功，提取结果
|
||||
if match:
|
||||
product_name = match.group(0)
|
||||
@@ -170,7 +116,7 @@ class PurchaseRequestLine(models.Model):
|
||||
for pr in self:
|
||||
qty_to_buy = sum(pr.mapped("product_qty"))
|
||||
if pr.purchase_count > 0:
|
||||
qty_to_buy -= sum(pr.mapped("purchase_lines").filtered(lambda po: po.state != 'cancel').mapped(
|
||||
qty_to_buy -= sum(pr.mapped("purchase_lines").filtered(lambda po: po.state != 'cancel').mapped(
|
||||
"product_qty"))
|
||||
pr.qty_to_buy = qty_to_buy > 0.0
|
||||
pr.pending_qty_to_receive = qty_to_buy
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
from odoo import fields, api, models, _
|
||||
|
||||
|
||||
class StockPicking(models.Model):
|
||||
_inherit = "stock.picking"
|
||||
|
||||
purchase_request_count = fields.Integer('采购订单数量', compute='_compute_purchase_request')
|
||||
|
||||
@api.depends('name')
|
||||
def _compute_purchase_request(self):
|
||||
for record in self:
|
||||
purchase_request_ids = self.env['purchase.request'].search([('origin', '=', record.name)])
|
||||
record.purchase_request_count = len(purchase_request_ids)
|
||||
|
||||
def action_view_purchase_request(self):
|
||||
self.ensure_one()
|
||||
|
||||
purchase_request_ids = self.env['purchase.request'].search([('origin', '=', self.name)])
|
||||
|
||||
action = {
|
||||
'res_model': 'purchase.request',
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
if len(purchase_request_ids) == 1:
|
||||
action.update({
|
||||
'view_mode': 'form',
|
||||
'res_id': purchase_request_ids[0].id,
|
||||
})
|
||||
else:
|
||||
action.update({
|
||||
'name': _("从 %s生成采购请求单", self.name),
|
||||
'domain': [('id', 'in', purchase_request_ids.ids)],
|
||||
'view_mode': 'tree,form',
|
||||
})
|
||||
return action
|
||||
@@ -48,8 +48,8 @@ class StockRule(models.Model):
|
||||
# 如果补货组相同，并且产品相同，则合并
|
||||
procurements_dict = defaultdict()
|
||||
for procurement, rule in procurements:
|
||||
if (procurement.product_id.id, procurement.values['group_id'], rule.id) not in procurements_dict:
|
||||
procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)] = {
|
||||
if (procurement.product_id, procurement.values['group_id'], rule) not in procurements_dict:
|
||||
procurements_dict[(procurement.product_id, procurement.values['group_id'], rule)] = {
|
||||
'product_id': procurement.product_id,
|
||||
'product_qty': procurement.product_qty,
|
||||
'product_uom': procurement.product_uom,
|
||||
@@ -61,8 +61,7 @@ class StockRule(models.Model):
|
||||
'rule': rule
|
||||
}
|
||||
else:
|
||||
procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['product_qty'] += procurement.product_qty
|
||||
procurements_dict[(procurement.product_id.id, procurement.values['group_id'], rule.id)]['values']['move_dest_ids'] |= procurement.values['move_dest_ids']
|
||||
procurements_dict[(procurement.product_id, procurement.values['group_id'], rule)]['product_qty'] += procurement.product_qty
|
||||
new_procurements = []
|
||||
for k, p in procurements_dict.items():
|
||||
new_procurements.append((
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_purchase_request_wizard_group_user,purchase.request.wizard,model_purchase_request_wizard,base.group_user,1,1,1,1
|
||||
|
@@ -15,15 +15,6 @@
|
||||
<field name="part_number"/>
|
||||
<field name="part_name"/>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='button_done']" position="attributes">
|
||||
<attribute name="class"/>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='button_in_progress']" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='button_in_progress']/following-sibling::button[1]" position="attributes">
|
||||
<attribute name="class">oe_highlight</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
<record id="stock_pikcing_inherited_form_jikimo_purchase_request" model="ir.ui.view">
|
||||
<field name="name">stock.pikcing.inherited.form.jikimo.purchase.request</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='button_box']/button" position="before">
|
||||
<button class="oe_stat_button" name="action_view_purchase_request" type="object" icon="fa-credit-card"
|
||||
attrs="{'invisible': [('purchase_request_count', '=', 0)]}">
|
||||
<div class="o_field_widget o_stat_info">
|
||||
<span class="o_stat_value">
|
||||
<field name="purchase_request_count"/>
|
||||
</span>
|
||||
<span class="o_stat_text">采购申请</span>
|
||||
</div>
|
||||
</button>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -1,4 +1,3 @@
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
|
||||
|
||||
from . import purchase_request_line_make_purchase_order
|
||||
from . import purchase_request_wizard
|
||||
|
||||
@@ -119,11 +119,3 @@ class PurchaseRequestLineMakePurchaseOrderItem(models.TransientModel):
|
||||
_inherit = "purchase.request.line.make.purchase.order.item"
|
||||
|
||||
supply_method = fields.Selection(related='line_id.supply_method', string='供货方式')
|
||||
|
||||
wiz_id = fields.Many2one(
|
||||
comodel_name="purchase.request.line.make.purchase.order",
|
||||
string="Wizard",
|
||||
required=False,
|
||||
ondelete="cascade",
|
||||
readonly=True,
|
||||
)
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
from odoo import models, fields, api
|
||||
|
||||
|
||||
class PurchaseRequestWizard(models.TransientModel):
|
||||
_name = 'purchase.request.wizard'
|
||||
_description = '采购申请向导'
|
||||
|
||||
purchase_request_id = fields.Many2one('purchase.request', string='采购申请')
|
||||
message = fields.Char(string='提示', readonly=True)
|
||||
|
||||
def confirm(self):
|
||||
return self.purchase_request_id.write({"state": "done"})
|
||||
@@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<record model="ir.ui.view" id="purchase_request_wizard_wizard_form_view">
|
||||
<field name="name">purchase.request.wizard.form.view</field>
|
||||
<field name="model">purchase.request.wizard</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<sheet>
|
||||
<div>
|
||||
<div style="white-space: pre-wrap;">
|
||||
<field name="message"/>
|
||||
</div>
|
||||
</div>
|
||||
<footer>
|
||||
<button string="确认" name="confirm" type="object" class="oe_highlight"/>
|
||||
<button string="取消" class="btn btn-secondary" special="cancel"/>
|
||||
</footer>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -6,6 +6,10 @@ class ProductTemplate(models.Model):
|
||||
is_manual_processing = fields.Boolean(string='人工线下加工')
|
||||
is_customer_provided = fields.Boolean(string='客供料')
|
||||
|
||||
|
||||
class ProductProduct(models.Model):
|
||||
_inherit = 'product.product'
|
||||
|
||||
def copy_template(self, product_template_id):
|
||||
if not isinstance(product_template_id, ProductTemplate):
|
||||
raise ValueError('%s必须是ProductTemplate类型' % product_template_id)
|
||||
|
||||
@@ -133,7 +133,6 @@ class QualityCheck(models.Model):
|
||||
part_name = fields.Char('零件名称', related='product_id.part_name', readonly=False, store=True)
|
||||
part_number = fields.Char('零件图号', related='product_id.part_number', readonly=False, store=True)
|
||||
material_name = fields.Char('材料名称', compute='_compute_material_name')
|
||||
model_id = fields.Char('模型ID', related='product_id.model_id')
|
||||
|
||||
# # 总数量，值为调拨单_产品明细_数量
|
||||
# total_qty = fields.Float('总数量', compute='_compute_total_qty', readonly=True)
|
||||
@@ -142,7 +141,7 @@ class QualityCheck(models.Model):
|
||||
# # 出厂检验报告编号
|
||||
# report_number = fields.Char('出厂检验报告编号', compute='_compute_report_number', readonly=True)
|
||||
# 总数量，值为调拨单_产品明细_数量
|
||||
total_qty = fields.Char('总数量', compute='_compute_total_qty', store=True)
|
||||
total_qty = fields.Char('总数量', compute='_compute_total_qty')
|
||||
|
||||
column_nums = fields.Integer('测量值列数', default=1)
|
||||
|
||||
@@ -154,9 +153,9 @@ class QualityCheck(models.Model):
|
||||
for move in record.picking_id.move_ids_without_package:
|
||||
if move.product_id == record.product_id:
|
||||
total_qty = int(move.product_uom_qty)
|
||||
record.total_qty = total_qty if total_qty > 0 else 0
|
||||
record.total_qty = total_qty if total_qty > 0 else ''
|
||||
else:
|
||||
record.total_qty = 0
|
||||
record.total_qty = ''
|
||||
|
||||
# 检验数
|
||||
check_qty = fields.Integer('检验数', default=lambda self: self._get_default_check_qty())
|
||||
@@ -736,9 +735,8 @@ class QualityCheck(models.Model):
|
||||
def _compute_qty_to_test(self):
|
||||
for qc in self:
|
||||
if qc.is_lot_tested_fractionally:
|
||||
rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
|
||||
qc.qty_to_test = float_round(qc.qty_line * qc.testing_percentage_within_lot / 100,
|
||||
precision_rounding=rounding, rounding_method="UP")
|
||||
precision_rounding=self.product_id.uom_id.rounding, rounding_method="UP")
|
||||
else:
|
||||
qc.qty_to_test = qc.qty_line
|
||||
|
||||
|
||||
@@ -493,9 +493,6 @@
|
||||
<field name="picking_id"/>
|
||||
<field name="lot_id"/>
|
||||
<field name="team_id"/>
|
||||
<field name="part_number"/>
|
||||
<field name="part_name"/>
|
||||
<field name="model_id"/>
|
||||
<filter string="In Progress" name="progress" domain="[('quality_state', '=', 'none')]"/>
|
||||
<filter string="Passed" name="passed" domain="[('quality_state', '=', 'pass')]"/>
|
||||
<filter string="Failed" name="failed" domain="[('quality_state', '=', 'fail')]"/>
|
||||
|
||||
@@ -23,8 +23,8 @@ class QualityCheckWizard(models.TransientModel):
|
||||
lot_name = fields.Char(related='current_check_id.lot_name')
|
||||
lot_line_id = fields.Many2one(related='current_check_id.lot_line_id')
|
||||
qty_line = fields.Float(related='current_check_id.qty_line')
|
||||
qty_to_test = fields.Float(related='current_check_id.qty_to_test', string='待检')
|
||||
qty_tested = fields.Float(related='current_check_id.qty_tested', string='已检', readonly=False)
|
||||
qty_to_test = fields.Float(related='current_check_id.qty_to_test')
|
||||
qty_tested = fields.Float(related='current_check_id.qty_tested', readonly=False)
|
||||
measure = fields.Float(related='current_check_id.measure', readonly=False)
|
||||
measure_on = fields.Selection(related='current_check_id.measure_on')
|
||||
quality_state = fields.Selection(related='current_check_id.quality_state')
|
||||
|
||||
@@ -195,18 +195,10 @@ class PrintingUtils(models.AbstractModel):
|
||||
text_y = margin + 20 # 文字位置靠近底部
|
||||
c.drawString(text_x, text_y, text)
|
||||
|
||||
# 设置字体
|
||||
if font_found:
|
||||
c.setFont('SimSun', 12) # 增大字体大小到14pt
|
||||
else:
|
||||
# 如果没有找到中文字体，使用默认字体
|
||||
c.setFont('Helvetica', 120)
|
||||
logging.warning("未找到中文字体，将使用默认字体")
|
||||
|
||||
if buttom_text:
|
||||
# 在下方中间添加文字
|
||||
text = buttom_text
|
||||
text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 12) # 准确计算文字宽度
|
||||
text = button_text
|
||||
text_width = c.stringWidth(text, "SimSun" if font_found else "Helvetica", 10) # 准确计算文字宽度
|
||||
text_x = (page_width - text_width) / 2 # 文字居中对齐
|
||||
text_y = margin + 20 # 文字位置靠近底部
|
||||
c.drawString(text_x, text_y, text)
|
||||
|
||||
@@ -17,7 +17,7 @@ class ResProductCategory(models.Model):
|
||||
class ResProductProduct(models.Model):
|
||||
_inherit = 'product.product'
|
||||
|
||||
# single_manufacturing = fields.Boolean(string="单个制造")
|
||||
single_manufacturing = fields.Boolean(string="单个制造")
|
||||
is_bfm = fields.Boolean('业务平台是否自动创建', default=False)
|
||||
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
# import logging
|
||||
# from odoo import fields, models, api
|
||||
# from odoo.exceptions import UserError
|
||||
# from odoo.tools import str2bool
|
||||
import logging
|
||||
from odoo import fields, models, api
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools import str2bool
|
||||
|
||||
|
||||
# class ResMrpRoutingWorkcenter(models.Model):
|
||||
# _inherit = 'mrp.routing.workcenter'
|
||||
# def init(self):
|
||||
# super(ResMrpRoutingWorkcenter, self).init()
|
||||
# # 在模块初始化时触发计算字段的更新
|
||||
# records = self.search([])
|
||||
# if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_workcenter',default='False')):
|
||||
# return
|
||||
# records.optional_process_parameters_date()
|
||||
# self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_workcenter', True)
|
||||
class ResMrpRoutingWorkcenter(models.Model):
|
||||
_inherit = 'mrp.routing.workcenter'
|
||||
def init(self):
|
||||
super(ResMrpRoutingWorkcenter, self).init()
|
||||
# 在模块初始化时触发计算字段的更新
|
||||
records = self.search([])
|
||||
if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_workcenter',default='False')):
|
||||
return
|
||||
records.optional_process_parameters_date()
|
||||
self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_workcenter', True)
|
||||
@@ -1,85 +1,87 @@
|
||||
# # -*- coding: utf-8 -*-
|
||||
# import logging
|
||||
# from odoo import fields, models, api
|
||||
# from odoo.exceptions import UserError
|
||||
# from odoo.tools import str2bool
|
||||
# -*- coding: utf-8 -*-
|
||||
import logging
|
||||
from odoo import fields, models, api
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools import str2bool
|
||||
|
||||
|
||||
# class SfProductionProcessParameter(models.Model):
|
||||
# _inherit = 'sf.production.process.parameter'
|
||||
class SfProductionProcessParameter(models.Model):
|
||||
_inherit = 'sf.production.process.parameter'
|
||||
|
||||
|
||||
# @api.model
|
||||
# def create(self, vals):
|
||||
# # if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
|
||||
# # vals['code'] = '101'+self.routing_id.code +self.env['ir.sequence'].next_by_code('sf.production.process.parameter')
|
||||
# if vals.get('routing_id'):
|
||||
# # vals['gain_way'] = '外协'
|
||||
# routing_id = self.env['mrp.routing.workcenter'].browse(vals.get('routing_id'))
|
||||
# if routing_id.surface_technics_id and not vals.get('process_id'):
|
||||
# vals['process_id'] = routing_id.surface_technics_id.id
|
||||
# if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
|
||||
# vals['code'] = '101' + routing_id.code + self.env['ir.sequence'].next_by_code(
|
||||
# 'sf.production.process.parameter')
|
||||
# obj = super(SfProductionProcessParameter, self).create(vals)
|
||||
# return obj
|
||||
# def create_service_product(self):
|
||||
# service_categ = self.env.ref(
|
||||
# 'sf_dlm.product_category_surface_technics_sf').sudo()
|
||||
@api.model
|
||||
def create(self, vals):
|
||||
# if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
|
||||
# vals['code'] = '101'+self.routing_id.code +self.env['ir.sequence'].next_by_code('sf.production.process.parameter')
|
||||
if vals.get('routing_id'):
|
||||
# vals['gain_way'] = '外协'
|
||||
routing_id = self.env['mrp.routing.workcenter'].browse(vals.get('routing_id'))
|
||||
if routing_id.surface_technics_id and not vals.get('process_id'):
|
||||
vals['process_id'] = routing_id.surface_technics_id.id
|
||||
if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
|
||||
vals['code'] = '101' + routing_id.code + self.env['ir.sequence'].next_by_code(
|
||||
'sf.production.process.parameter')
|
||||
obj = super(SfProductionProcessParameter, self).create(vals)
|
||||
return obj
|
||||
def create_service_product(self):
|
||||
if not self.active:
|
||||
return
|
||||
service_categ = self.env.ref(
|
||||
'sf_dlm.product_category_surface_technics_sf').sudo()
|
||||
|
||||
# product_name = f"{self.process_id.name}_{self.name}"
|
||||
# product_id = self.env['product.template'].search(
|
||||
# [("name", '=', product_name)])
|
||||
# if product_id:
|
||||
# product_id.server_product_process_parameters_id = self.id
|
||||
# else:
|
||||
# res_partner = self.env['res.partner'].search([('name','=','湖南傲派自动化设备有限公司')])
|
||||
# self.env['product.template'].create({
|
||||
# 'detailed_type': 'service',
|
||||
# 'name': product_name,
|
||||
# 'invoice_policy': 'delivery',
|
||||
# 'categ_id': service_categ.id,
|
||||
# 'description': f"基于{self.name}创建的服务产品",
|
||||
# 'sale_ok': True, # 可销售
|
||||
# 'purchase_ok': True, # 可采购
|
||||
# 'server_product_process_parameters_id': self.id,
|
||||
# 'seller_ids': [(0, 0, {
|
||||
# # 'delay': 1,
|
||||
# 'partner_id': res_partner.id,
|
||||
# 'price': 1, })],
|
||||
# })
|
||||
product_name = f"{self.process_id.name}_{self.name}"
|
||||
product_id = self.env['product.template'].search(
|
||||
[("name", '=', product_name)])
|
||||
if product_id:
|
||||
product_id.server_product_process_parameters_id = self.id
|
||||
else:
|
||||
res_partner = self.env['res.partner'].search([('name','=','湖南傲派自动化设备有限公司')])
|
||||
self.env['product.template'].create({
|
||||
'detailed_type': 'service',
|
||||
'name': product_name,
|
||||
'invoice_policy': 'delivery',
|
||||
'categ_id': service_categ.id,
|
||||
'description': f"基于{self.name}创建的服务产品",
|
||||
'sale_ok': True, # 可销售
|
||||
'purchase_ok': True, # 可采购
|
||||
'server_product_process_parameters_id': self.id,
|
||||
'seller_ids': [(0, 0, {
|
||||
# 'delay': 1,
|
||||
'partner_id': res_partner.id,
|
||||
'price': 1, })],
|
||||
})
|
||||
|
||||
# def create_work_center(self):
|
||||
# production_process_parameter = self
|
||||
# if not production_process_parameter.process_id:
|
||||
# return
|
||||
# if not production_process_parameter.routing_id:
|
||||
# workcenter_id = self.env['mrp.routing.workcenter'].search(
|
||||
# [("surface_technics_id", '=', production_process_parameter.process_id.id)])
|
||||
# if not workcenter_id:
|
||||
# outsourcing_work_center = self.env['mrp.workcenter'].search(
|
||||
# [("name", '=', '外协工作中心')])
|
||||
# routing_id = self.env['mrp.routing.workcenter'].create({
|
||||
# 'workcenter_ids': [(6, 0, outsourcing_work_center.ids)],
|
||||
# 'routing_tag': 'special',
|
||||
# 'routing_type': '表面工艺',
|
||||
# 'is_outsource': True,
|
||||
# 'surface_technics_id': production_process_parameter.process_id.id,
|
||||
# 'name': production_process_parameter.process_id.name,
|
||||
# })
|
||||
# production_process_parameter.routing_id = routing_id.id
|
||||
# else:
|
||||
# production_process_parameter.routing_id = workcenter_id.id
|
||||
def create_work_center(self):
|
||||
production_process_parameter = self
|
||||
if not production_process_parameter.process_id:
|
||||
return
|
||||
if not production_process_parameter.routing_id:
|
||||
workcenter_id = self.env['mrp.routing.workcenter'].search(
|
||||
[("surface_technics_id", '=', production_process_parameter.process_id.id)])
|
||||
if not workcenter_id:
|
||||
outsourcing_work_center = self.env['mrp.workcenter'].search(
|
||||
[("name", '=', '外协工作中心')])
|
||||
routing_id = self.env['mrp.routing.workcenter'].create({
|
||||
'workcenter_ids': [(6, 0, outsourcing_work_center.ids)],
|
||||
'routing_tag': 'special',
|
||||
'routing_type': '表面工艺',
|
||||
'is_outsource': True,
|
||||
'surface_technics_id': production_process_parameter.process_id.id,
|
||||
'name': production_process_parameter.process_id.name,
|
||||
})
|
||||
production_process_parameter.routing_id = routing_id.id
|
||||
else:
|
||||
production_process_parameter.routing_id = workcenter_id.id
|
||||
|
||||
# def init(self):
|
||||
# super(SfProductionProcessParameter, self).init()
|
||||
# # 在模块初始化时触发计算字段的更新
|
||||
# records = self.search([])
|
||||
# if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_process',
|
||||
# default='False')):
|
||||
# return
|
||||
# for record in records:
|
||||
# if not record.outsourced_service_products:
|
||||
# record.create_service_product()
|
||||
# record.create_work_center()
|
||||
# self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_process', True)
|
||||
def init(self):
|
||||
super(SfProductionProcessParameter, self).init()
|
||||
# 在模块初始化时触发计算字段的更新
|
||||
records = self.search([])
|
||||
if str2bool(self.env['ir.config_parameter'].get_param('sf.production.process.parameter.is_init_process',
|
||||
default='False')):
|
||||
return
|
||||
for record in records:
|
||||
if not record.outsourced_service_products:
|
||||
record.create_service_product()
|
||||
record.create_work_center()
|
||||
self.env['ir.config_parameter'].set_param('sf.production.process.parameter.is_init_process', True)
|
||||
|
||||
@@ -41,7 +41,9 @@
|
||||
attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
|
||||
<field name="server_product_process_parameters_id" string="工艺参数"
|
||||
options="{'no_create': True}"
|
||||
attrs="{'invisible': ['|',('detailed_type', '!=', 'service'),('detailed_type', '=', False)]}"/>
|
||||
attrs="{'invisible': ['|',('detailed_type', '!=', 'service'),('detailed_type', '=', False)]}"
|
||||
domain="[('active', '=', 'True'),('outsourced_service_products', '!=', 'True')]"
|
||||
/>
|
||||
<field name="cutting_tool_material_id" class="custom_required"
|
||||
options="{'no_create': True}"
|
||||
attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
'views/mrp_workorder_batch_replan.xml',
|
||||
'views/purchase_order_view.xml',
|
||||
'views/product_template_views.xml',
|
||||
# 'views/stock_warehouse_orderpoint.xml',
|
||||
'views/stock_warehouse_orderpoint.xml',
|
||||
],
|
||||
'assets': {
|
||||
|
||||
|
||||
@@ -18,4 +18,4 @@ from . import quick_easy_order
|
||||
from . import purchase_order
|
||||
from . import quality_check
|
||||
from . import purchase_request_line
|
||||
# from . import stock_warehouse_orderpoint
|
||||
from . import stock_warehouse_orderpoint
|
||||
@@ -900,41 +900,43 @@ class MrpProduction(models.Model):
|
||||
for workorder in production.workorder_ids:
|
||||
workorder.duration_expected = workorder._get_duration_expected()
|
||||
|
||||
# def _create_subcontract_purchase_request(self, purchase_request_line):
|
||||
# sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
|
||||
# grouped_purchase_request_line = {
|
||||
# k: list(g)
|
||||
# for k, g in groupby(sorted_list, key=itemgetter('name'))
|
||||
# }
|
||||
# for name, request_line in grouped_purchase_request_line.items():
|
||||
# request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
|
||||
# grouped_purchase_request_line_sorted_list = {
|
||||
# k: list(g)
|
||||
# for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
|
||||
# }
|
||||
# purchase_request_model = self.env["purchase.request"]
|
||||
# origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
|
||||
# pr = purchase_request_model.create({
|
||||
# "origin": origin,
|
||||
# "company_id": self.company_id.id,
|
||||
# "picking_type_id": self.env.ref('stock.picking_type_in').id,
|
||||
# "group_id": request_line[0].get('group_id'),
|
||||
# "requested_by": self.env.context.get("uid", self.env.uid),
|
||||
# "assigned_to": False,
|
||||
# "bom_id": self[0].bom_id.id,
|
||||
# "is_subcontract":True,
|
||||
# })
|
||||
# self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
|
||||
# 'sf_stock.stock_route_process_outsourcing').id)]
|
||||
# for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
|
||||
# cur_request_line = request_line_list[0]
|
||||
# # cur_request_line['product_qty'] = cur_request_line['product_qty']
|
||||
# cur_request_line['request_id'] = pr.id
|
||||
# cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
|
||||
# cur_request_line.pop('group_id', None)
|
||||
# cur_request_line.pop('production_name', None)
|
||||
# self.env["purchase.request.line"].create(cur_request_line)
|
||||
# pr.button_approved()
|
||||
def _create_subcontract_purchase_request(self, purchase_request_line):
|
||||
sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
|
||||
grouped_purchase_request_line = {
|
||||
k: list(g)
|
||||
for k, g in groupby(sorted_list, key=itemgetter('name'))
|
||||
}
|
||||
for name, request_line in grouped_purchase_request_line.items():
|
||||
request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
|
||||
grouped_purchase_request_line_sorted_list = {
|
||||
k: list(g)
|
||||
for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
|
||||
}
|
||||
purchase_request_model = self.env["purchase.request"]
|
||||
origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
|
||||
pr = purchase_request_model.create({
|
||||
"origin": origin,
|
||||
"company_id": self.company_id.id,
|
||||
"picking_type_id": self.env.ref('stock.picking_type_in').id,
|
||||
"group_id": request_line[0].get('group_id'),
|
||||
"requested_by": self.env.context.get("uid", self.env.uid),
|
||||
"assigned_to": False,
|
||||
"bom_id": self[0].bom_id.id,
|
||||
"is_subcontract":True,
|
||||
})
|
||||
self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
|
||||
'sf_stock.stock_route_process_outsourcing').id)]
|
||||
for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
|
||||
cur_request_line = request_line_list[0]
|
||||
if cur_request_line['product_qty'] == 1:
|
||||
cur_request_line['product_qty'] = len(request_line_list)
|
||||
# cur_request_line['product_qty'] = cur_request_line['product_qty']
|
||||
cur_request_line['request_id'] = pr.id
|
||||
cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
|
||||
cur_request_line.pop('group_id', None)
|
||||
cur_request_line.pop('production_name', None)
|
||||
self.env["purchase.request.line"].create(cur_request_line)
|
||||
pr.button_approved()
|
||||
|
||||
# 外协出入库单处理
|
||||
def get_subcontract_pick_purchase(self):
|
||||
@@ -962,14 +964,14 @@ class MrpProduction(models.Model):
|
||||
if not sorted_workorders:
|
||||
return
|
||||
for workorders in reversed(sorted_workorders):
|
||||
self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
|
||||
self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
|
||||
# purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
|
||||
# workorders, production)
|
||||
# all_workorders += workorders
|
||||
# self._create_subcontract_purchase_request(purchase_request_line)
|
||||
# for workorder in all_workorders:
|
||||
# workorder._compute_pr_mp_count()
|
||||
# self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
|
||||
# self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
|
||||
purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
|
||||
workorders, production)
|
||||
all_workorders += workorders
|
||||
self._create_subcontract_purchase_request(purchase_request_line)
|
||||
for workorder in all_workorders:
|
||||
workorder._compute_pr_mp_count()
|
||||
# 工单排序
|
||||
def _reset_work_order_sequence1(self, k):
|
||||
for rec in self:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import logging
|
||||
from odoo import fields, models, api
|
||||
from odoo.exceptions import UserError
|
||||
# from odoo.tools import str2bool
|
||||
from odoo.tools import str2bool
|
||||
|
||||
|
||||
class ResMrpRoutingWorkcenter(models.Model):
|
||||
@@ -25,20 +25,20 @@ class ResMrpRoutingWorkcenter(models.Model):
|
||||
workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
|
||||
bom_id = fields.Many2one('mrp.bom', required=False)
|
||||
surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
|
||||
# optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
|
||||
optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
|
||||
reserved_duration = fields.Float('预留时长', default=30, tracking=True)
|
||||
is_outsource = fields.Boolean('外协', default=False)
|
||||
individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录')
|
||||
|
||||
# @api.onchange('surface_technics_id')
|
||||
# def optional_process_parameters_date(self):
|
||||
# for record in self:
|
||||
# if not record.surface_technics_id:
|
||||
# continue
|
||||
# parameter_ids = self.env['sf.production.process.parameter'].search([
|
||||
# ('process_id', '=', record.surface_technics_id.id),
|
||||
# ])
|
||||
# record.optional_process_parameters = parameter_ids.ids
|
||||
@api.onchange('surface_technics_id')
|
||||
def optional_process_parameters_date(self):
|
||||
for record in self:
|
||||
if not record.surface_technics_id:
|
||||
continue
|
||||
parameter_ids = self.env['sf.production.process.parameter'].search([
|
||||
('process_id', '=', record.surface_technics_id.id),
|
||||
])
|
||||
record.optional_process_parameters = parameter_ids.ids
|
||||
|
||||
# @api.model
|
||||
# def _auto_init(self):
|
||||
|
||||
@@ -21,16 +21,16 @@ class ResWorkcenter(models.Model):
|
||||
related='equipment_id.production_line_id', store=True)
|
||||
is_process_outsourcing = fields.Boolean('工艺外协')
|
||||
users_ids = fields.Many2many("res.users", 'users_workcenter', tracking=True)
|
||||
# @api.constrains('name')
|
||||
# def _check_unique_name_code(self):
|
||||
# for record in self:
|
||||
# # 检查是否已经存在相同的 name 和 code 组合
|
||||
# existing = self.search([
|
||||
# ('name', '=', record.name),
|
||||
# ('id', '!=', record.id) # 排除当前记录
|
||||
# ])
|
||||
# if existing:
|
||||
# raise ValueError('记录已存在')
|
||||
@api.constrains('name')
|
||||
def _check_unique_name_code(self):
|
||||
for record in self:
|
||||
# 检查是否已经存在相同的 name 和 code 组合
|
||||
existing = self.search([
|
||||
('name', '=', record.name),
|
||||
('id', '!=', record.id) # 排除当前记录
|
||||
])
|
||||
if existing:
|
||||
raise ValueError('记录已存在')
|
||||
def write(self, vals):
|
||||
if 'users_ids' in vals:
|
||||
old_users = self.users_ids
|
||||
|
||||
@@ -70,21 +70,21 @@ class ResMrpWorkOrder(models.Model):
|
||||
delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
|
||||
tracking=True)
|
||||
back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
|
||||
# pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
|
||||
pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
|
||||
|
||||
# @api.depends('state')
|
||||
# def _compute_pr_mp_count(self):
|
||||
# for item in self:
|
||||
# if not item.is_subcontract:
|
||||
# item.pr_mp_count = 0
|
||||
# continue
|
||||
# pr_ids = self.env['purchase.request'].sudo().search(
|
||||
# [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
# ('state', '!=', 'rejected')])
|
||||
# if pr_ids:
|
||||
# item.pr_mp_count = len(pr_ids)
|
||||
# else:
|
||||
# item.pr_mp_count = 0
|
||||
@api.depends('state')
|
||||
def _compute_pr_mp_count(self):
|
||||
for item in self:
|
||||
if not item.is_subcontract:
|
||||
item.pr_mp_count = 0
|
||||
continue
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
('state', '!=', 'rejected')])
|
||||
if pr_ids:
|
||||
item.pr_mp_count = len(pr_ids)
|
||||
else:
|
||||
item.pr_mp_count = 0
|
||||
|
||||
@api.depends('state')
|
||||
def _compute_back_button_display(self):
|
||||
@@ -130,14 +130,8 @@ class ResMrpWorkOrder(models.Model):
|
||||
record.back_button_display = False
|
||||
else:
|
||||
next_workorder = sorted_workorders[position + 1]
|
||||
# 持续获取下一个工单，直到找到一个不是返工的工单
|
||||
while next_workorder and next_workorder.state == 'rework':
|
||||
position += 1
|
||||
if position + 1 < len(sorted_workorders):
|
||||
next_workorder = sorted_workorders[position + 1]
|
||||
else:
|
||||
next_workorder = None
|
||||
if next_workorder and (next_workorder.state == 'ready' or (
|
||||
next_state = next_workorder.state
|
||||
if (next_state == 'ready' or (
|
||||
next_workorder.state == 'waiting' and next_workorder.is_subcontract)) and cur_workorder.state == 'done':
|
||||
record.back_button_display = True
|
||||
else:
|
||||
@@ -227,30 +221,22 @@ class ResMrpWorkOrder(models.Model):
|
||||
# finish_move.move_dest_ids.move_line_ids.reserved_uom_qty = 0
|
||||
else:
|
||||
next_workorder = sorted_workorders[position + 1]
|
||||
# 持续获取下一个工单，直到找到一个不是返工的工单
|
||||
while next_workorder and next_workorder.state == 'rework':
|
||||
position += 1
|
||||
if position + 1 < len(sorted_workorders):
|
||||
next_workorder = sorted_workorders[position + 1]
|
||||
next_state = next_workorder.state
|
||||
if next_state not in ['pending', 'waiting', 'ready']:
|
||||
raise UserError('下工序已经开始，无法回退')
|
||||
if next_workorder.is_subcontract:
|
||||
next_workorder.picking_ids.write({'state': 'waiting'})
|
||||
next_workorder.state = 'pending'
|
||||
self.time_ids.date_end = None
|
||||
cur_workorder.state = 'progress'
|
||||
cur_workorder.production_id.state = 'progress'
|
||||
quality_check = self.env['quality.check'].search(
|
||||
[('workorder_id', '=', self.id)])
|
||||
for check_order in quality_check:
|
||||
if check_order.point_id.is_inspect:
|
||||
check_order.quality_state = 'waiting'
|
||||
else:
|
||||
next_workorder = None
|
||||
if next_workorder:
|
||||
next_state = next_workorder.state
|
||||
if next_state not in ['pending', 'waiting', 'ready']:
|
||||
raise UserError('下工序已经开始，无法回退')
|
||||
if next_workorder.is_subcontract:
|
||||
next_workorder.picking_ids.write({'state': 'waiting'})
|
||||
next_workorder.state = 'pending'
|
||||
self.time_ids.date_end = None
|
||||
cur_workorder.state = 'progress'
|
||||
cur_workorder.production_id.state = 'progress'
|
||||
quality_check = self.env['quality.check'].search(
|
||||
[('workorder_id', '=', self.id)])
|
||||
for check_order in quality_check:
|
||||
if check_order.point_id.is_inspect:
|
||||
check_order.quality_state = 'waiting'
|
||||
else:
|
||||
check_order.quality_state = 'none'
|
||||
check_order.quality_state = 'none'
|
||||
|
||||
def _compute_working_users(self):
|
||||
super()._compute_working_users()
|
||||
@@ -454,51 +440,41 @@ class ResMrpWorkOrder(models.Model):
|
||||
action['context'] = dict(self._context, default_origin=self.name)
|
||||
return action
|
||||
|
||||
@api.depends('state', 'production_id.name')
|
||||
def _compute_surface_technics_purchase_ids(self):
|
||||
for order in self:
|
||||
if order.routing_type == '表面工艺' and order.state not in ['cancel']:
|
||||
domain = [('purchase_type', '=', 'consignment'),
|
||||
('origin', 'like', '%' + self.production_id.name + '%'),
|
||||
('state', '!=', 'cancel')]
|
||||
# domain = [('purchase_type', '=', 'consignment'),
|
||||
# ('origin', 'like', '%' + self.production_id.name + '%'),
|
||||
# ('state', '!=', 'cancel')]
|
||||
purchase = self.env['purchase.order'].search(domain)
|
||||
order.surface_technics_purchase_count = 0
|
||||
if not purchase:
|
||||
order.surface_technics_purchase_count = 0
|
||||
for po in purchase:
|
||||
if any(
|
||||
line.product_id and line.product_id.server_product_process_parameters_id == order.surface_technics_parameters_id
|
||||
for line in po.order_line):
|
||||
order.surface_technics_purchase_count = 1
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
('state', '!=', 'rejected')])
|
||||
if pr_ids.purchase_count:
|
||||
order.surface_technics_purchase_count = pr_ids.purchase_count
|
||||
else:
|
||||
order.surface_technics_purchase_count = 0
|
||||
|
||||
# def action_view_pr_mrp_workorder(self):
|
||||
# """
|
||||
# 采购请求
|
||||
# """
|
||||
# self.ensure_one()
|
||||
# pr_ids = self.env['purchase.request'].sudo().search(
|
||||
# [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
# ('state', '!=', 'rejected')])
|
||||
# action = {
|
||||
# 'res_model': 'purchase.request',
|
||||
# 'type': 'ir.actions.act_window',
|
||||
# }
|
||||
# if len(pr_ids) == 1:
|
||||
# action.update({
|
||||
# 'view_mode': 'form',
|
||||
# 'res_id': pr_ids[0].id,
|
||||
# })
|
||||
# else:
|
||||
# action.update({
|
||||
# 'name': _("从 %s生成采购请求单", self.name),
|
||||
# 'domain': [('id', 'in', pr_ids)],
|
||||
# 'view_mode': 'tree,form',
|
||||
# })
|
||||
# return action
|
||||
def action_view_pr_mrp_workorder(self):
|
||||
"""
|
||||
采购请求
|
||||
"""
|
||||
self.ensure_one()
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
('state', '!=', 'rejected')])
|
||||
action = {
|
||||
'res_model': 'purchase.request',
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
if len(pr_ids) == 1:
|
||||
action.update({
|
||||
'view_mode': 'form',
|
||||
'res_id': pr_ids[0].id,
|
||||
})
|
||||
else:
|
||||
action.update({
|
||||
'name': _("从 %s生成采购请求单", self.name),
|
||||
'domain': [('id', 'in', pr_ids)],
|
||||
'view_mode': 'tree,form',
|
||||
})
|
||||
return action
|
||||
|
||||
def action_view_surface_technics_purchase(self):
|
||||
self.ensure_one()
|
||||
@@ -516,16 +492,19 @@ class ResMrpWorkOrder(models.Model):
|
||||
# if technology_design.is_auto is False:
|
||||
# domain = [('origin', '=', self.production_id.name)]
|
||||
# else:
|
||||
purchase_orders_id = self._get_surface_technics_purchase_ids()
|
||||
result = {
|
||||
"type": "ir.actions.act_window",
|
||||
"res_model": "purchase.order",
|
||||
"res_id": purchase_orders_id.id,
|
||||
# "domain": [['id', 'in', self.purchase_id]],
|
||||
"name": _("Purchase Orders"),
|
||||
'view_mode': 'form',
|
||||
}
|
||||
return result
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
('state', '!=', 'rejected')])
|
||||
# purchase_orders_id = self._get_surface_technics_purchase_ids()
|
||||
# result = {
|
||||
# "type": "ir.actions.act_window",
|
||||
# "res_model": "purchase.order",
|
||||
# "res_id": purchase_orders_id.id,
|
||||
# # "domain": [['id', 'in', self.purchase_id]],
|
||||
# "name": _("Purchase Orders"),
|
||||
# 'view_mode': 'form',
|
||||
# }
|
||||
return pr_ids.action_view_purchase_order()
|
||||
|
||||
def _get_surface_technics_purchase_ids(self):
|
||||
domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment'),
|
||||
@@ -1259,12 +1238,12 @@ class ResMrpWorkOrder(models.Model):
|
||||
}]
|
||||
return workorders_values_str
|
||||
|
||||
# def check_lot_exists(self, picking_id, lot_id):
|
||||
# return bool(
|
||||
# picking_id.move_ids.move_line_ids.filtered(
|
||||
# lambda line: line.lot_id.id == lot_id
|
||||
# )
|
||||
# )
|
||||
def check_lot_exists(self, picking_id, lot_id):
|
||||
return bool(
|
||||
picking_id.move_ids.move_line_ids.filtered(
|
||||
lambda line: line.lot_id.id == lot_id
|
||||
)
|
||||
)
|
||||
|
||||
def _process_compute_state(self):
|
||||
sorted_workorders = sorted(self, key=lambda x: x.sequence)
|
||||
@@ -1297,20 +1276,27 @@ class ResMrpWorkOrder(models.Model):
|
||||
# for move_line in move.move_line_ids
|
||||
# )
|
||||
if (workorder.production_id.production_type == '人工线下加工'
|
||||
and workorder.production_id.schedule_state == '已排'):
|
||||
and workorder.production_id.programming_state == '已编程'):
|
||||
# and workorder.production_id.programming_state == '已编程'
|
||||
if workorder.is_subcontract is True:
|
||||
if workorder.production_id.state == 'rework':
|
||||
workorder.state = 'waiting'
|
||||
continue
|
||||
purchase_orders_id = self._get_surface_technics_purchase_ids()
|
||||
if purchase_orders_id.state == 'purchase':
|
||||
purchase_count = 0
|
||||
for purchase_order in purchase_orders_id:
|
||||
for purchase_order_line in purchase_order.order_line:
|
||||
if purchase_order_line.product_id.server_product_process_parameters_id.id == workorder.surface_technics_parameters_id.id:
|
||||
purchase_count = purchase_order_line.product_qty
|
||||
if purchase_orders_id.state == 'purchase' and purchase_count>=workorder.production_id.product_qty:
|
||||
workorder.state = 'ready'
|
||||
# picking_id = workorder.production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
move_out = workorder.move_subcontract_workorder_ids[1]
|
||||
picking_id = workorder.production_id.picking_ids.filtered(
|
||||
lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
# move_out = workorder.move_subcontract_workorder_ids[1]
|
||||
for mo in move_out:
|
||||
if workorder.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
|
||||
continue
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
if not mo.move_line_ids:
|
||||
@@ -1326,6 +1312,7 @@ class ResMrpWorkOrder(models.Model):
|
||||
else:
|
||||
workorder.state = 'ready'
|
||||
continue
|
||||
continue
|
||||
# ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
|
||||
if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
|
||||
or workorder.production_id.schedule_state != '已排'
|
||||
@@ -1341,19 +1328,18 @@ class ResMrpWorkOrder(models.Model):
|
||||
if workorder.is_subcontract is False:
|
||||
workorder.state = 'ready'
|
||||
else:
|
||||
if len(workorder.production_id.picking_ids.filtered(
|
||||
lambda w: w.state not in ['done',
|
||||
'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
|
||||
if workorder.production_id.programming_state == '已编程':
|
||||
purchase_orders_id = self._get_surface_technics_purchase_ids()
|
||||
if purchase_orders_id:
|
||||
if purchase_orders_id.state == 'purchase':
|
||||
workorder.state = 'ready'
|
||||
move_out = workorder.move_subcontract_workorder_ids[1]
|
||||
# picking_id = workorder.production_id.picking_ids.filtered(
|
||||
# lambda
|
||||
# wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
picking_id = workorder.production_id.picking_ids.filtered(
|
||||
lambda
|
||||
wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
for mo in move_out:
|
||||
if workorder.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
|
||||
continue
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
if not mo.move_line_ids:
|
||||
@@ -1402,7 +1388,16 @@ class ResMrpWorkOrder(models.Model):
|
||||
boolean = True
|
||||
if not boolean:
|
||||
raise UserError('制造订单【%s】缺少组件的序列号信息！' % self.production_id.name)
|
||||
self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
|
||||
self.pro_code = False # 默认值
|
||||
if (
|
||||
self.production_id
|
||||
and self.production_id.move_raw_ids
|
||||
and len(self.production_id.move_raw_ids) > 0
|
||||
and self.production_id.move_raw_ids[0].move_line_ids
|
||||
and len(self.production_id.move_raw_ids[0].move_line_ids) > 0
|
||||
and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id
|
||||
):
|
||||
self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
|
||||
# cnc校验
|
||||
if self.production_id.production_type == '自动化产线加工':
|
||||
cnc_workorder = self.search(
|
||||
@@ -1426,10 +1421,9 @@ class ResMrpWorkOrder(models.Model):
|
||||
# 表面工艺外协出库单
|
||||
if self.routing_type == '表面工艺':
|
||||
if self.is_subcontract is True:
|
||||
move_out = self.move_subcontract_workorder_ids[1]
|
||||
# picking_id = self.production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
picking_id = self.production_id.picking_ids.filtered(
|
||||
lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
# move_out = self.move_subcontract_workorder_ids[1]
|
||||
# move_out = self.env['stock.move'].search(
|
||||
# [('location_id', '=', self.env['stock.location'].search(
|
||||
@@ -1438,6 +1432,8 @@ class ResMrpWorkOrder(models.Model):
|
||||
# [('barcode', 'ilike', 'VL-SPOC')]).id),
|
||||
# ('origin', '=', self.production_id.name), ('state', 'not in', ['cancel', 'done'])])
|
||||
for mo in move_out:
|
||||
if self.production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
|
||||
continue
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
if not mo.move_line_ids:
|
||||
@@ -1570,7 +1566,8 @@ class ResMrpWorkOrder(models.Model):
|
||||
lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
if self == subcontract_workorders[-1]:
|
||||
# 给下一个库存移动就绪
|
||||
self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
|
||||
if self.move_subcontract_workorder_ids:
|
||||
self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
|
||||
# self.production_id.button_mark_done()
|
||||
tem_date_planned_finished = record.date_planned_finished
|
||||
tem_date_finished = record.date_finished
|
||||
|
||||
@@ -59,83 +59,85 @@ class PurchaseOrder(models.Model):
|
||||
production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
|
||||
purchase.production_count = len(production_id)
|
||||
|
||||
# def process_replenish(self,production,total_qty):
|
||||
# record = self
|
||||
# bom_line_id = production.bom_id.bom_line_ids
|
||||
# replenish = self.env['stock.warehouse.orderpoint'].search([
|
||||
# ('product_id', '=', bom_line_id.product_id.id),
|
||||
# (
|
||||
# 'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
|
||||
# # ('state', 'in', ['draft', 'confirmed'])
|
||||
# ], limit=1)
|
||||
# if not replenish:
|
||||
# replenish_model = self.env['stock.warehouse.orderpoint']
|
||||
# replenish = replenish_model.create({
|
||||
# 'product_id': bom_line_id.product_id.id,
|
||||
# 'location_id': self.env.ref(
|
||||
# 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
# 'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
# 'group_id': record.group_id.id,
|
||||
# 'qty_to_order': total_qty,
|
||||
# 'origin': record.name,
|
||||
# })
|
||||
# else:
|
||||
# replenish.write({
|
||||
# 'product_id': bom_line_id.product_id.id,
|
||||
# 'location_id': self.env.ref(
|
||||
# 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
# 'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
# 'group_id': record.group_id.id,
|
||||
# 'qty_to_order': total_qty + replenish.qty_to_order,
|
||||
# 'origin': record.name + ',' + replenish.origin,
|
||||
# })
|
||||
# replenish.action_replenish()
|
||||
def process_replenish(self,production,total_qty):
|
||||
record = self
|
||||
bom_line_id = production.bom_id.bom_line_ids
|
||||
replenish = self.env['stock.warehouse.orderpoint'].search([
|
||||
('product_id', '=', bom_line_id.product_id.id),
|
||||
(
|
||||
'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
|
||||
# ('state', 'in', ['draft', 'confirmed'])
|
||||
], limit=1)
|
||||
if not replenish:
|
||||
replenish_model = self.env['stock.warehouse.orderpoint']
|
||||
replenish = replenish_model.create({
|
||||
'product_id': bom_line_id.product_id.id,
|
||||
'location_id': self.env.ref(
|
||||
'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
'group_id': record.group_id.id,
|
||||
'qty_to_order': total_qty,
|
||||
'origin': record.name,
|
||||
})
|
||||
else:
|
||||
replenish.write({
|
||||
'product_id': bom_line_id.product_id.id,
|
||||
'location_id': self.env.ref(
|
||||
'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
'group_id': record.group_id.id,
|
||||
'qty_to_order': total_qty + replenish.qty_to_order,
|
||||
'origin': record.name + ',' + replenish.origin,
|
||||
})
|
||||
replenish.action_replenish()
|
||||
|
||||
# def outsourcing_service_replenishment(self):
|
||||
# record = self
|
||||
# if record.purchase_type != 'consignment':
|
||||
# return
|
||||
# grouped_lines = {}
|
||||
# for line in record.order_line:
|
||||
# if line.related_product.id not in grouped_lines:
|
||||
# grouped_lines[line.related_product.id] = []
|
||||
# grouped_lines[line.related_product.id].append(line)
|
||||
# for product_id,lines in grouped_lines.items():
|
||||
# production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
# if not production:
|
||||
# continue
|
||||
# total_qty = sum(line.product_qty for line in lines)
|
||||
# record.process_replenish(production,total_qty)
|
||||
# for product_id,lines in grouped_lines.items():
|
||||
# productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
# if not productions:
|
||||
# continue
|
||||
# # production.bom_id.bom_line_ids.product_id
|
||||
# location_id = self.env['stock.location'].search([('name', '=', '制造前')])
|
||||
# quants = self.env['stock.quant'].search([
|
||||
# ('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
|
||||
# ('location_id', '=', location_id.id)
|
||||
# ])
|
||||
# total_qty = sum(quants.mapped('quantity')) # 计算该位置的总库存量
|
||||
# is_available = total_qty > 0
|
||||
# if not is_available:
|
||||
# raise UserError('请先完成坯料入库')
|
||||
# for production_id in productions:
|
||||
# work_ids = production_id.workorder_ids.filtered(
|
||||
# lambda wk: wk.state not in ['done', 'rework', 'cancel'])
|
||||
# if not work_ids:
|
||||
# continue
|
||||
# min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
|
||||
# if min_sequence_wk.is_subcontract:
|
||||
# picking_id = production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
# for mo in move_out:
|
||||
# if mo.state != 'done':
|
||||
# mo.write({'state': 'assigned', 'production_id': False})
|
||||
# if not mo.move_line_ids:
|
||||
# self.env['stock.move.line'].create(
|
||||
# mo.get_move_line(production_id, min_sequence_wk))
|
||||
def outsourcing_service_replenishment(self):
|
||||
record = self
|
||||
if record.purchase_type != 'consignment':
|
||||
return
|
||||
grouped_lines = {}
|
||||
for line in record.order_line:
|
||||
if line.related_product.id not in grouped_lines:
|
||||
grouped_lines[line.related_product.id] = []
|
||||
grouped_lines[line.related_product.id].append(line)
|
||||
for product_id,lines in grouped_lines.items():
|
||||
production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
if not production:
|
||||
continue
|
||||
total_qty = sum(line.product_qty for line in lines)
|
||||
record.process_replenish(production,total_qty)
|
||||
for product_id,lines in grouped_lines.items():
|
||||
productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
if not productions:
|
||||
continue
|
||||
# production.bom_id.bom_line_ids.product_id
|
||||
location_id = self.env['stock.location'].search([('name', '=', '制造前')])
|
||||
quants = self.env['stock.quant'].search([
|
||||
('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
|
||||
('location_id', '=', location_id.id)
|
||||
])
|
||||
total_qty = sum(quants.mapped('quantity')) # 计算该位置的总库存量
|
||||
is_available = total_qty > 0
|
||||
if not is_available:
|
||||
raise UserError('请先完成坯料入库')
|
||||
for production_id in productions:
|
||||
work_ids = production_id.workorder_ids.filtered(
|
||||
lambda wk: wk.state not in ['done', 'rework', 'cancel'])
|
||||
if not work_ids:
|
||||
continue
|
||||
min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
|
||||
if min_sequence_wk.is_subcontract and min_sequence_wk.state == 'ready':
|
||||
picking_id = production_id.picking_ids.filtered(
|
||||
lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
for mo in move_out:
|
||||
if production_id.bom_id.bom_line_ids.product_id.id != mo.product_id.id:
|
||||
continue
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
if not mo.move_line_ids:
|
||||
self.env['stock.move.line'].create(
|
||||
mo.get_move_line(production_id, min_sequence_wk))
|
||||
# product = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
# match = re.search(r'(S\d{5}-\d)',product.name)
|
||||
# pass
|
||||
@@ -146,12 +148,14 @@ class PurchaseOrder(models.Model):
|
||||
raise UserError('请对【产品】中的【数量】进行输入')
|
||||
if line.price_unit <= 0:
|
||||
raise UserError('请对【产品】中的【单价】进行输入')
|
||||
# record.outsourcing_service_replenishment()
|
||||
record.outsourcing_service_replenishment()
|
||||
|
||||
res = super(PurchaseOrder, self).button_confirm()
|
||||
|
||||
for line in self.order_line:
|
||||
# 将产品不追踪序列号的行项目设置qty_done
|
||||
if not line.move_ids:
|
||||
continue
|
||||
if line.move_ids and line.move_ids[0].product_id.tracking == 'none':
|
||||
line.move_ids[0].quantity_done = line.move_ids[0].product_qty
|
||||
return res
|
||||
@@ -224,6 +228,24 @@ class PurchaseOrderLine(models.Model):
|
||||
)
|
||||
record.part_number = filtered_order_line.product_id.part_number
|
||||
record.part_name = filtered_order_line.product_id.part_name
|
||||
elif record.order_id.purchase_type == 'consignment':
|
||||
product_name = ''
|
||||
match = re.search(r'(S\d{5}-\d)', record.related_product.name)
|
||||
# 如果匹配成功，提取结果
|
||||
if match:
|
||||
product_name = match.group(0)
|
||||
sale_order_name = ''
|
||||
match_sale = re.search(r'S(\d+)', record.related_product.name)
|
||||
if match_sale:
|
||||
sale_order_name = match_sale.group(0)
|
||||
sale_order = self.env['sale.order'].sudo().search(
|
||||
[('name', '=', sale_order_name)])
|
||||
if sale_order:
|
||||
filtered_order_line = sale_order.order_line.filtered(
|
||||
lambda order_line: re.search(f'{product_name}$', order_line.product_id.name)
|
||||
)
|
||||
record.part_number = filtered_order_line.product_id.part_number
|
||||
record.part_name = filtered_order_line.product_id.part_name
|
||||
else:
|
||||
record.part_number = record.product_id.part_number
|
||||
record.part_name = record.product_id.part_name
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# import base64
|
||||
# import datetime
|
||||
# import logging
|
||||
# import json
|
||||
# import os
|
||||
# import re
|
||||
# import traceback
|
||||
# from operator import itemgetter
|
||||
import base64
|
||||
import datetime
|
||||
import logging
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import traceback
|
||||
from operator import itemgetter
|
||||
|
||||
# import requests
|
||||
# from itertools import groupby
|
||||
# from collections import defaultdict, namedtuple
|
||||
import requests
|
||||
from itertools import groupby
|
||||
from collections import defaultdict, namedtuple
|
||||
|
||||
# from odoo import api, fields, models, SUPERUSER_ID, _
|
||||
# from odoo.exceptions import UserError, ValidationError
|
||||
# from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
|
||||
from odoo import api, fields, models, SUPERUSER_ID, _
|
||||
from odoo.exceptions import UserError, ValidationError
|
||||
from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
|
||||
|
||||
|
||||
# class PurchaseRequestLine(models.Model):
|
||||
# _inherit = 'purchase.request'
|
||||
# is_subcontract = fields.Boolean(string='是否外协',default=False)
|
||||
# class PurchaseRequestLine(models.Model):
|
||||
# _inherit = 'purchase.request.line'
|
||||
# is_subcontract = fields.Boolean(string='是否外协')
|
||||
class PurchaseRequestLine(models.Model):
|
||||
_inherit = 'purchase.request'
|
||||
is_subcontract = fields.Boolean(string='是否外协',default=False)
|
||||
class PurchaseRequestLine(models.Model):
|
||||
_inherit = 'purchase.request.line'
|
||||
is_subcontract = fields.Boolean(string='是否外协')
|
||||
|
||||
|
||||
# class PurchaseRequest(models.Model):
|
||||
# _inherit = 'purchase.request'
|
||||
# bom_id = fields.Many2one('mrp.bom')
|
||||
class PurchaseRequest(models.Model):
|
||||
_inherit = 'purchase.request'
|
||||
bom_id = fields.Many2one('mrp.bom')
|
||||
|
||||
@@ -56,7 +56,7 @@ class SaleOrder(models.Model):
|
||||
'jikimo_sale_multiple_supply_methods.product_template_manual_processing').sudo()
|
||||
|
||||
# 复制成品模板上的属性
|
||||
line.product_id.product_tmpl_id.copy_template(product_template_id)
|
||||
line.product_id.copy_template(product_template_id)
|
||||
# 将模板上的single_manufacturing属性复制到成品上
|
||||
# line.product_id.single_manufacturing = product_template_id.single_manufacturing
|
||||
# line.product_id.tracking = product_template_id.tracking
|
||||
@@ -76,7 +76,7 @@ class SaleOrder(models.Model):
|
||||
'embryo_redundancy_id': line.embryo_redundancy_id,
|
||||
}
|
||||
product_name = ''
|
||||
match = re.search(r'(S\d{5}-\d+)', product.name)
|
||||
match = re.search(r'(S\d{5}-\d*)', product.name)
|
||||
# 如果匹配成功，提取结果
|
||||
if match:
|
||||
product_name = match.group(0)
|
||||
|
||||
@@ -7,74 +7,73 @@ from odoo.exceptions import UserError, ValidationError
|
||||
|
||||
class SfProductionProcessParameter(models.Model):
|
||||
_inherit = 'sf.production.process.parameter'
|
||||
# service_products = fields.Many2one(
|
||||
# 'product.template',
|
||||
# string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
|
||||
# store=True
|
||||
# )
|
||||
# outsourced_service_products = fields.One2many(
|
||||
# 'product.template', # 另一个模型的名称
|
||||
# 'server_product_process_parameters_id', # 对应的 Many2one 字段名称
|
||||
# string='外协服务产品'
|
||||
# )
|
||||
# is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
|
||||
# is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
|
||||
# routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
|
||||
service_products = fields.Many2one(
|
||||
'product.template',
|
||||
string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
|
||||
store=True
|
||||
)
|
||||
outsourced_service_products = fields.One2many(
|
||||
'product.template', # 另一个模型的名称
|
||||
'server_product_process_parameters_id', # 对应的 Many2one 字段名称
|
||||
string='外协服务产品'
|
||||
)
|
||||
is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
|
||||
is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
|
||||
routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
|
||||
def _inverse_service_products(self):
|
||||
for record in self:
|
||||
if record.service_products:
|
||||
# 确保关联关系正确
|
||||
record.outsourced_service_products = record.service_products.ids if record.service_products else False
|
||||
else:
|
||||
record.outsourced_service_products = False
|
||||
@api.depends('outsourced_service_products')
|
||||
def _compute_service_products(self):
|
||||
for record in self:
|
||||
# 假设取第一条作为主明细
|
||||
record.service_products = record.outsourced_service_products[0].id if record.outsourced_service_products else False
|
||||
|
||||
# @api.depends('outsourced_service_products')
|
||||
# def _compute_service_products(self):
|
||||
# for record in self:
|
||||
# # 假设取第一条作为主明细
|
||||
# record.service_products = record.outsourced_service_products.ids if record.outsourced_service_products else False
|
||||
def name_get(self):
|
||||
result = []
|
||||
for record in self:
|
||||
name = f"{record.process_id.name} - {record.name}" # 自定义显示格式
|
||||
result.append((record.id, name))
|
||||
return result
|
||||
@api.constrains('outsourced_service_products')
|
||||
def _validate_partner_limit(self):
|
||||
for record in self:
|
||||
if len(record.outsourced_service_products) > 1:
|
||||
raise ValidationError("工艺参数不能与多个产品关联")
|
||||
|
||||
# def _inverse_service_products(self):
|
||||
# for record in self:
|
||||
# if record.service_products:
|
||||
# # 确保关联关系正确
|
||||
# record.outsourced_service_products = record.service_products.ids if record.service_products else False
|
||||
# else:
|
||||
# record.outsourced_service_products = False
|
||||
# def name_get(self):
|
||||
# result = []
|
||||
# for record in self:
|
||||
# name = f"{record.process_id.name} - {record.name}" # 自定义显示格式
|
||||
# result.append((record.id, name))
|
||||
# return result
|
||||
# @api.constrains('outsourced_service_products')
|
||||
# def _validate_partner_limit(self):
|
||||
# for record in self:
|
||||
# if len(record.outsourced_service_products) > 1:
|
||||
# raise ValidationError("工艺参数不能与多个产品关联")
|
||||
@api.onchange('outsourced_service_products')
|
||||
def _onchange_validate_partner_limit(self):
|
||||
for record in self:
|
||||
if len(record.outsourced_service_products) > 1:
|
||||
raise ValidationError("工艺参数不能与多个产品关联")
|
||||
@api.depends('outsourced_service_products')
|
||||
def _compute_is_product_button(self):
|
||||
for record in self:
|
||||
if record.outsourced_service_products:
|
||||
record.is_product_button = True
|
||||
else:
|
||||
record.is_product_button = False
|
||||
|
||||
# @api.onchange('outsourced_service_products')
|
||||
# def _onchange_validate_partner_limit(self):
|
||||
# for record in self:
|
||||
# if len(record.outsourced_service_products) > 1:
|
||||
# raise ValidationError("工艺参数不能与多个产品关联")
|
||||
# @api.depends('outsourced_service_products')
|
||||
# def _compute_is_product_button(self):
|
||||
# for record in self:
|
||||
# if record.outsourced_service_products:
|
||||
# record.is_product_button = True
|
||||
# else:
|
||||
# record.is_product_button = False
|
||||
|
||||
# def has_wksp_prefix(self):
|
||||
# """
|
||||
# 判断字符串是否以WKSP开头（不区分大小写）
|
||||
# :param text: 要检查的字符串
|
||||
# :return: True/False
|
||||
# """
|
||||
# return self.code.upper().startswith('101'+self.routing_id.code)
|
||||
# @api.depends('outsourced_service_products','code')
|
||||
# def _compute_is_delete_button(self):
|
||||
# for record in self:
|
||||
# if record.outsourced_service_products and record.has_wksp_prefix():
|
||||
# record.is_delete_button = False
|
||||
# elif record.outsourced_service_products:
|
||||
# record.is_delete_button = True
|
||||
# else:
|
||||
# record.is_delete_button = True
|
||||
def has_wksp_prefix(self):
|
||||
"""
|
||||
判断字符串是否以WKSP开头（不区分大小写）
|
||||
:param text: 要检查的字符串
|
||||
:return: True/False
|
||||
"""
|
||||
return self.code.upper().startswith('101'+self.routing_id.code)
|
||||
@api.depends('outsourced_service_products','code')
|
||||
def _compute_is_delete_button(self):
|
||||
for record in self:
|
||||
if record.outsourced_service_products and record.has_wksp_prefix():
|
||||
record.is_delete_button = False
|
||||
elif record.outsourced_service_products:
|
||||
record.is_delete_button = True
|
||||
else:
|
||||
record.is_delete_button = True
|
||||
@api.model
|
||||
def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
|
||||
if self._context.get('route_id'):
|
||||
@@ -90,19 +89,19 @@ class SfProductionProcessParameter(models.Model):
|
||||
return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
|
||||
return super()._name_search(name, args, operator, limit, name_get_uid)
|
||||
|
||||
# def action_create_service_product(self):
|
||||
# if self.id: # 如果是已存在的记录
|
||||
# self.write({}) # 空写入会触发保存
|
||||
# else: # 如果是新记录
|
||||
# self = self.create(self._convert_to_write(self.read()[0]))
|
||||
# return {
|
||||
# 'type': 'ir.actions.act_window',
|
||||
# 'name': '向导名称',
|
||||
# 'res_model': 'product.creation.wizard',
|
||||
# 'view_mode': 'form',
|
||||
# 'target': 'new',
|
||||
# 'context': {'default_process_parameter_id': self.id}, # 传递当前记录ID
|
||||
# }
|
||||
def action_create_service_product(self):
|
||||
if self.id: # 如果是已存在的记录
|
||||
self.write({}) # 空写入会触发保存
|
||||
else: # 如果是新记录
|
||||
self = self.create(self._convert_to_write(self.read()[0]))
|
||||
return {
|
||||
'type': 'ir.actions.act_window',
|
||||
'name': '向导名称',
|
||||
'res_model': 'product.creation.wizard',
|
||||
'view_mode': 'form',
|
||||
'target': 'new',
|
||||
'context': {'default_process_parameter_id': self.id}, # 传递当前记录ID
|
||||
}
|
||||
#
|
||||
# return {
|
||||
# 'name': '创建服务产品',
|
||||
@@ -116,6 +115,6 @@ class SfProductionProcessParameter(models.Model):
|
||||
# },
|
||||
# }
|
||||
|
||||
# def action_hide_service_products(self):
|
||||
# # self.outsourced_service_products.active = False
|
||||
# self.active = False
|
||||
def action_hide_service_products(self):
|
||||
# self.outsourced_service_products.active = False
|
||||
self.active = False
|
||||
|
||||
@@ -564,13 +564,6 @@ class StockPicking(models.Model):
|
||||
|
||||
part_numbers = fields.Char(string="零件图号", compute='_compute_part_info', store=True, index=True)
|
||||
part_names = fields.Char(string="零件名称", compute='_compute_part_info', store=True, index=True)
|
||||
model_id = fields.Char('模型ID', compute='_compute_model_id', store=True, index=True)
|
||||
|
||||
@api.depends('move_ids_without_package.model_id')
|
||||
def _compute_model_id(self):
|
||||
for picking in self:
|
||||
model_id = picking.move_ids_without_package.mapped('model_id')
|
||||
picking.model_id = ','.join(filter(None, model_id))
|
||||
|
||||
@api.depends('move_ids_without_package.part_number', 'move_ids_without_package.part_name')
|
||||
def _compute_part_info(self):
|
||||
@@ -638,84 +631,62 @@ class StockPicking(models.Model):
|
||||
move.action_clear_lines_show_details()
|
||||
move.action_show_details()
|
||||
res = super().button_validate()
|
||||
# lot_ids = None
|
||||
# product_ids = self.move_ids.mapped('product_id')
|
||||
# if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
|
||||
# lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
|
||||
# production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
|
||||
# if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
|
||||
# # 如果是最后一张外协入库单，则设置库存位置的预留数量
|
||||
# for production_id in production_ids:
|
||||
# if lot_ids:
|
||||
# lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# # picking_ids = production_id.picking_ids.filtered(
|
||||
# # lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
# if lot_id in lot_ids:
|
||||
# workorder_id = production_id.workorder_ids.filtered(
|
||||
# lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_finish()
|
||||
# else:
|
||||
# workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_finish()
|
||||
# # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# # picking_ids = workorder.production_id.picking_ids.filtered(
|
||||
# # lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
|
||||
# # if move_in:
|
||||
# # workorder = move_in.subcontract_workorder_id
|
||||
# # workorders = workorder.production_id.workorder_ids
|
||||
# # subcontract_workorders = workorders.filtered(
|
||||
# # lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
# # # if workorder == subcontract_workorders[-1]:
|
||||
# # # self.env['stock.quant']._update_reserved_quantity(
|
||||
# # # move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||
# # # lot_id=move_in.move_line_ids.lot_id,
|
||||
# # # package_id=False, owner_id=False, strict=False
|
||||
# # # )
|
||||
# # workorder.button_finish()
|
||||
# if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
|
||||
# for production_id in production_ids:
|
||||
# if lot_ids:
|
||||
# lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# # picking_ids = production_id.picking_ids.filtered(
|
||||
# # lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
# if lot_id in lot_ids:
|
||||
# workorder_id = production_id.workorder_ids.filtered(
|
||||
# lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_finish()
|
||||
# else:
|
||||
# workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_start()
|
||||
picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
|
||||
if res is True and self.picking_type_id.id == picking_type_in:
|
||||
lot_ids = None
|
||||
product_ids = self.move_ids.mapped('product_id')
|
||||
if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
|
||||
lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
|
||||
production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
|
||||
if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
|
||||
# 如果是最后一张外协入库单，则设置库存位置的预留数量
|
||||
move_in = self.move_ids
|
||||
if move_in:
|
||||
workorder = move_in.subcontract_workorder_id
|
||||
workorders = workorder.production_id.workorder_ids
|
||||
subcontract_workorders = workorders.filtered(
|
||||
lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
# if workorder == subcontract_workorders[-1]:
|
||||
# self.env['stock.quant']._update_reserved_quantity(
|
||||
# move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||
# lot_id=move_in.move_line_ids.lot_id,
|
||||
# package_id=False, owner_id=False, strict=False
|
||||
# )
|
||||
workorder.button_finish()
|
||||
picking_type_out = self.env.ref('sf_manufacturing.outcontract_picking_out').id
|
||||
if res and self.picking_type_id.id == picking_type_out:
|
||||
move_out = self.move_ids
|
||||
if move_out:
|
||||
workorder = move_out.subcontract_workorder_id
|
||||
workorder.button_start()
|
||||
for production_id in production_ids:
|
||||
if lot_ids:
|
||||
lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# picking_ids = production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
if lot_id in lot_ids:
|
||||
workorder_id = production_id.workorder_ids.filtered(
|
||||
lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_finish()
|
||||
else:
|
||||
workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_finish()
|
||||
# lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# picking_ids = workorder.production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
|
||||
# if move_in:
|
||||
# workorder = move_in.subcontract_workorder_id
|
||||
# workorders = workorder.production_id.workorder_ids
|
||||
# subcontract_workorders = workorders.filtered(
|
||||
# lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
# # if workorder == subcontract_workorders[-1]:
|
||||
# # self.env['stock.quant']._update_reserved_quantity(
|
||||
# # move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||
# # lot_id=move_in.move_line_ids.lot_id,
|
||||
# # package_id=False, owner_id=False, strict=False
|
||||
# # )
|
||||
# workorder.button_finish()
|
||||
if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
|
||||
for production_id in production_ids:
|
||||
if lot_ids:
|
||||
lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# picking_ids = production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
if lot_id in lot_ids:
|
||||
workorder_id = production_id.workorder_ids.filtered(
|
||||
lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_finish()
|
||||
else:
|
||||
workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_start()
|
||||
if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
|
||||
sale_id = self.env['sale.order'].sudo().search(
|
||||
[('name', '=', self.origin)])
|
||||
@@ -846,7 +817,6 @@ class ReStockMove(models.Model):
|
||||
materiel_height = fields.Float(string='物料高度', digits=(16, 4))
|
||||
part_number = fields.Char(string='零件图号', compute='_compute_part_info', store=True)
|
||||
part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
|
||||
model_id = fields.Char('模型ID', related='product_id.model_id')
|
||||
|
||||
@api.depends('product_id')
|
||||
def _compute_part_info(self):
|
||||
@@ -960,6 +930,8 @@ class ReStockMove(models.Model):
|
||||
}
|
||||
|
||||
def get_move_line(self, production_id, sorted_workorders):
|
||||
# if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
|
||||
qty = production_id.product_qty
|
||||
return {
|
||||
'move_id': self.id,
|
||||
'product_id': self.product_id.id,
|
||||
@@ -967,7 +939,7 @@ class ReStockMove(models.Model):
|
||||
'location_id': self.picking_id.location_id.id,
|
||||
'location_dest_id': self.picking_id.location_dest_id.id,
|
||||
'picking_id': self.picking_id.id,
|
||||
'reserved_uom_qty': self.product_uom_qty,
|
||||
'reserved_uom_qty': qty,
|
||||
'lot_id': production_id.move_line_raw_ids.lot_id.id,
|
||||
'company_id': self.env.company.id,
|
||||
# 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
|
||||
|
||||
@@ -383,7 +383,7 @@
|
||||
<field name="process_parameters_id"
|
||||
attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
|
||||
string="参数" context="{'route_id':route_id,'production_id': production_id}"
|
||||
options="{'no_create': True}"/>
|
||||
options="{'no_create': True}" domain="[('routing_id', '=', 'route_id')]"/>
|
||||
<field name="panel" readonly="1"/>
|
||||
<field name="routing_tag" readonly="1" widget="badge"
|
||||
decoration-success="routing_tag == 'standard'"
|
||||
@@ -602,7 +602,6 @@
|
||||
<field name="part_number"/>
|
||||
<field name="sale_order_id"/>
|
||||
<field name="deadline_of_delivery" icon="fa-calendar" enable_counters="1" filter_domain="[('deadline_of_delivery', 'ilike', self)]"/>
|
||||
<field name="model_id"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='product_variant_attributes']" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<field name="is_repeat"/>
|
||||
<field name="reserved_duration"/>
|
||||
</field>
|
||||
<!-- <xpath expr="//notebook/page[1]" position="before">
|
||||
<xpath expr="//notebook/page[1]" position="before">
|
||||
<page string="可选工艺参数">
|
||||
<field name="optional_process_parameters">
|
||||
<tree editable="bottom">
|
||||
@@ -30,9 +30,9 @@
|
||||
<field name="is_delete_button" invisible="1"/>
|
||||
<field name="code" attrs="{'readonly': True}"/>
|
||||
<field name="name" required="1"/>
|
||||
<field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/> -->
|
||||
<field name="service_products" domain="[('detailed_type', '=', 'service'),('server_product_process_parameters_id', '=', False)]"/>
|
||||
<!-- 按钮列 -->
|
||||
<!-- <button name="action_create_service_product" string="创建服务产品" type="object"
|
||||
<button name="action_create_service_product" string="创建服务产品" type="object"
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('is_product_button', '=', True)]}" context="{'default_process_parameter_id':id}"/>
|
||||
<button name="action_hide_service_products" string="删除" type="object"
|
||||
@@ -41,7 +41,7 @@
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
</xpath> -->
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
statusbar_visible="pending,waiting,ready,progress,to be detected,done,rework"/>
|
||||
</xpath>
|
||||
<xpath expr="//div[@name='button_box']" position="inside">
|
||||
<!-- <button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"
|
||||
<button type="object" name="action_view_pr_mrp_workorder" class="oe_stat_button"
|
||||
icon="fa-credit-card"
|
||||
groups="base.group_user,sf_base.group_sf_order_user"
|
||||
attrs="{'invisible': [('pr_mp_count', '=', 0)]}">
|
||||
@@ -154,7 +154,7 @@
|
||||
</span>
|
||||
<span class="o_stat_text">采购申请</span>
|
||||
</div>
|
||||
</button> -->
|
||||
</button>
|
||||
<button type="object" name="action_view_surface_technics_purchase" class="oe_stat_button"
|
||||
icon="fa-credit-card"
|
||||
groups="base.group_user,sf_base.group_sf_order_user"
|
||||
@@ -677,9 +677,8 @@
|
||||
<field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="product_id" position="after">
|
||||
<field name="part_number" string="零件图号"/>
|
||||
<field name="part_name" string="零件名称"/>
|
||||
<field name="model_id" string="模型ID"/>
|
||||
<field name="part_number" string="成品零件图号"/>
|
||||
<field name="model_id" string="模型id"/>
|
||||
</field>
|
||||
<xpath expr="//filter[@name='progress']" position="after">
|
||||
<filter string="待检测" name="state" domain="[('state','=','to be detected')]"/>
|
||||
|
||||
@@ -12,18 +12,5 @@
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="product_template_search_inherit_sf_manufacturing" model="ir.ui.view">
|
||||
<field name="name">product.template.search</field>
|
||||
<field name="model">product.template</field>
|
||||
<field name="inherit_id" ref="product.product_template_search_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='categ_id']" position="after">
|
||||
<field name="part_number" string="零件图号"/>
|
||||
<field name="part_name" string="零件名称"/>
|
||||
<field name="model_id" string="模型ID"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</odoo>
|
||||
@@ -73,7 +73,6 @@
|
||||
<xpath expr="//field[@name='picking_type_id']" position="after">
|
||||
<field name="part_numbers" string="零件图号" filter_domain="[('part_numbers', 'ilike', self)]"/>
|
||||
<field name="part_names" string="零件名称" filter_domain="[('part_names', 'ilike', self)]"/>
|
||||
<field name="model_id" string="模型ID" filter_domain="[('model_id', 'ilike', self)]"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -77,11 +77,11 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
|
||||
if workorders[
|
||||
0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
|
||||
workorders[0].state = 'waiting'
|
||||
# pr_ids = self.env['purchase.request'].sudo().search(
|
||||
# [('origin', 'like', item.name), ('is_subcontract', '=', 'True'), ('state', '!=', 'rejected')])
|
||||
# if not pr_ids:
|
||||
# continue
|
||||
# if not all(pr.state == 'draft' for pr in pr_ids):
|
||||
# # 如果发现有记录的 state 不是 'draft'，抛出异常
|
||||
# raise UserError("有采购申请的状态不是 '草稿'")
|
||||
# pr_ids.state = 'rejected'
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', item.name), ('is_subcontract', '=', 'True'), ('state', '!=', 'rejected')])
|
||||
if not pr_ids:
|
||||
continue
|
||||
if not all(pr.state == 'draft' for pr in pr_ids):
|
||||
# 如果发现有记录的 state 不是 'draft'，抛出异常
|
||||
raise UserError("有采购申请的状态不是 '草稿'")
|
||||
pr_ids.state = 'rejected'
|
||||
@@ -268,8 +268,6 @@ class ReworkWizard(models.TransientModel):
|
||||
'cmm_ids': new_cnc_workorder.cmm_ids.sudo()._json_cmm_program(
|
||||
cnc_work.processing_panel, ret),
|
||||
'cnc_worksheet': old_cnc_rework.cnc_worksheet})
|
||||
# 复制装夹图纸
|
||||
new_cnc_workorder.processing_drawing = old_cnc_rework.processing_drawing
|
||||
# ========== 处理装夹预调 【装夹图纸】 数据 ================
|
||||
for new_pre_work in new_pre_workorder_ids:
|
||||
pre_rework = max(self.production_id.workorder_ids.filtered(
|
||||
|
||||
@@ -3,6 +3,9 @@ import logging
|
||||
import os
|
||||
import json
|
||||
import base64
|
||||
import traceback
|
||||
|
||||
|
||||
from odoo import http, fields, models
|
||||
from odoo.http import request
|
||||
from odoo.addons.sf_base.controllers.controllers import MultiInheritController
|
||||
@@ -24,7 +27,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
res = {'status': 1, 'message': '成功'}
|
||||
datas = request.httprequest.data
|
||||
model_id = None
|
||||
part_number = None
|
||||
ret = json.loads(datas)
|
||||
ret = json.loads(ret['result'])
|
||||
logging.info('下发编程单:%s' % ret)
|
||||
@@ -60,6 +62,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
|
||||
return json.JSONEncoder().encode(res)
|
||||
for production in productions:
|
||||
model_id = production.product_id.model_id # 一个编程单的制造订单对应同一个模型
|
||||
production.write({'programming_state': '已编程', 'work_state': '已编程', 'is_rework': False})
|
||||
for panel in ret['processing_panel'].split(','):
|
||||
# 查询状态为进行中且工序类型为CNC加工的工单
|
||||
@@ -76,10 +79,6 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
cnc_workorder_has.write(
|
||||
{'cnc_ids': cnc_workorder_has.cnc_ids.sudo()._json_cnc_processing(panel, ret),
|
||||
'cmm_ids': cnc_workorder_has.cmm_ids.sudo()._json_cmm_program(panel, ret)})
|
||||
|
||||
# 一个编程单的制造订单对应同一个模型
|
||||
model_id = productions[0].product_id.model_id
|
||||
part_number = productions[0].product_id.part_number
|
||||
for panel in ret['processing_panel'].split(','):
|
||||
# 查询状态为进行中且工序类型为CNC加工的工单
|
||||
cnc_workorder = productions.workorder_ids.filtered(
|
||||
@@ -99,12 +98,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
logging.info('panel_file_path:%s' % panel_file_path)
|
||||
|
||||
# 向编程单中添加二维码
|
||||
request.env['printing.utils'].add_qr_code_to_pdf(
|
||||
panel_file_path,
|
||||
model_id,
|
||||
"模型ID：%s" % model_id,
|
||||
"零件图号：%s" % part_number if part_number else None
|
||||
)
|
||||
request.env['printing.utils'].add_qr_code_to_pdf(panel_file_path, model_id, "模型ID：%s" % model_id)
|
||||
cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
|
||||
pre_workorder = productions.workorder_ids.filtered(
|
||||
lambda ap: ap.routing_type in ['装夹预调', '人工线下加工'] and ap.state not in ['done', 'rework'
|
||||
@@ -282,7 +276,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
except Exception as e:
|
||||
res = {'status': -1, 'message': '系统解析失败'}
|
||||
request.cr.rollback()
|
||||
logging.info('get_cnc_processing_create error:%s' % e)
|
||||
traceback_error = traceback.format_exc()
|
||||
logging.error("get_cnc_processing_create error:%s" % traceback_error)
|
||||
return json.JSONEncoder().encode(res)
|
||||
|
||||
|
||||
|
||||
@@ -1149,7 +1149,7 @@ class sfProductionProcessParameter(models.Model):
|
||||
'processing_mm': item['processing_mm'],
|
||||
'gain_way':'外协',
|
||||
})
|
||||
# production_process_parameter.create_service_product()
|
||||
production_process_parameter.create_service_product()
|
||||
else:
|
||||
production_process_parameter.gain_way = '外协'
|
||||
production_process_parameter.name = item['name']
|
||||
@@ -1161,9 +1161,9 @@ class sfProductionProcessParameter(models.Model):
|
||||
[('materials_no', 'in', item['materials_model_ids_codes'])])
|
||||
production_process_parameter.active = item['active']
|
||||
production_process_parameter.processing_mm = item['processing_mm']
|
||||
# if not production_process_parameter.outsourced_service_products:
|
||||
# production_process_parameter.create_service_product()
|
||||
# production_process_parameter.create_work_center()
|
||||
if not production_process_parameter.outsourced_service_products:
|
||||
production_process_parameter.create_service_product()
|
||||
production_process_parameter.create_work_center()
|
||||
else:
|
||||
raise ValidationError("表面工艺可选参数认证未通过")
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ class sf_production_plan(models.Model):
|
||||
# _order = 'state desc, write_date desc'
|
||||
part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
|
||||
part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
|
||||
model_id = fields.Char('模型ID', related='product_id.model_id')
|
||||
state = fields.Selection([
|
||||
('draft', '待排程'),
|
||||
('done', '已排程'),
|
||||
|
||||
@@ -170,7 +170,6 @@
|
||||
<field name="part_number"/>
|
||||
<field name="order_deadline" filter_domain="[('order_deadline', 'ilike', self)]"/>
|
||||
<field name="production_line_id"/>
|
||||
<field name="model_id"/>
|
||||
<filter string="待排程" name="draft" domain="[('state','=','draft')]"/>
|
||||
<filter string="已排程" name="done" domain="[('state','=','done')]"/>
|
||||
<filter string="加工中" name="processing" domain="[('state','=','processing')]"/>
|
||||
|
||||
@@ -5,7 +5,6 @@ from odoo import fields, models, api
|
||||
from odoo.exceptions import ValidationError
|
||||
from datetime import datetime
|
||||
from odoo.addons.sf_base.commons.common import Common
|
||||
from odoo.tools import float_round
|
||||
|
||||
|
||||
class QualityCheck(models.Model):
|
||||
@@ -141,71 +140,3 @@ class QualityCheck(models.Model):
|
||||
return "零件特采发送成功"
|
||||
else:
|
||||
raise ValidationError("零件特采发送失败")
|
||||
|
||||
|
||||
|
||||
@api.model_create_multi
|
||||
def create(self, vals_list):
|
||||
for val in vals_list:
|
||||
if 'point_id' in val and 'measure_on' not in val:
|
||||
# 如果没有控制方式字段，则从检查点读取质量方式
|
||||
point_id = self.env['quality.point'].browse(val['point_id'])
|
||||
val.update({'measure_on': point_id.measure_on})
|
||||
return super(QualityCheck, self).create(vals_list)
|
||||
|
||||
|
||||
@api.depends('total_qty','testing_percentage_within_lot', 'is_lot_tested_fractionally')
|
||||
def _compute_workorder_qty_to_test(self):
|
||||
for qc in self:
|
||||
if qc.is_lot_tested_fractionally:
|
||||
rounding = qc.product_id.uom_id.rounding if qc.product_id.uom_id else 0.01
|
||||
qc.workorder_qty_to_test = float_round(float(qc.total_qty) * qc.testing_percentage_within_lot / 100,
|
||||
precision_rounding=rounding, rounding_method="UP")
|
||||
else:
|
||||
qc.workorder_qty_to_test = qc.total_qty
|
||||
|
||||
@api.depends('picking_id', 'workorder_id')
|
||||
def _compute_total_qty(self):
|
||||
super(QualityCheck, self)._compute_total_qty()
|
||||
for qc in self:
|
||||
if not qc.picking_id and qc.workorder_id:
|
||||
qc.total_qty = qc.workorder_id.production_id.product_qty
|
||||
|
||||
@api.depends('workorder_qty_to_test')
|
||||
def _compute_workorder_qty_tested(self):
|
||||
for qc in self:
|
||||
qc.workorder_qty_tested = qc.workorder_qty_to_test
|
||||
|
||||
|
||||
workorder_qty_to_test = fields.Float('应检', compute='_compute_workorder_qty_to_test', store=True)
|
||||
workorder_qty_tested = fields.Float('已检', compute='_compute_workorder_qty_tested', store=True)
|
||||
workorder_qty_test_failed = fields.Float('不合格数')
|
||||
|
||||
|
||||
@api.onchange('total_qty', 'workorder_qty_test_failed', 'workorder_qty_to_test', 'workorder_qty_tested')
|
||||
def _onchage_qty(self):
|
||||
for record in self:
|
||||
if record.total_qty and record.workorder_qty_to_test and record.workorder_qty_to_test > float(record.total_qty):
|
||||
record.workorder_qty_to_test = float(record.total_qty)
|
||||
return {
|
||||
'warning': {
|
||||
'title': '警告',
|
||||
'message': '待检数量不能超过总数量'
|
||||
}
|
||||
}
|
||||
if record.workorder_qty_to_test and record.workorder_qty_tested and record.workorder_qty_tested > record.workorder_qty_to_test:
|
||||
record.workorder_qty_tested = record.workorder_qty_to_test
|
||||
return {
|
||||
'warning': {
|
||||
'title': '警告',
|
||||
'message': '已检数量不能超过待检数量'
|
||||
}
|
||||
}
|
||||
if record.workorder_qty_tested and record.workorder_qty_test_failed and record.workorder_qty_test_failed > record.workorder_qty_tested:
|
||||
record.workorder_qty_test_failed = record.workorder_qty_tested
|
||||
return {
|
||||
'warning': {
|
||||
'title': '警告',
|
||||
'message': '不合格数量不能超过已检数量'
|
||||
}
|
||||
}
|
||||
@@ -88,42 +88,6 @@
|
||||
<button name="do_cancel_publish" string="取消发布" type="object" class="btn-primary" confirm="确定取消发布吗？" attrs="{'invisible': ['|',('is_out_check', '=', False), ('publish_status', '!=', 'published')]}"/>
|
||||
<button name="do_re_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='total_qty']" position="attributes">
|
||||
<attribute name="attrs">{
|
||||
'invisible': ['&', '|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False), '|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
|
||||
'readonly': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)],
|
||||
'on_change': ['|', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False)]
|
||||
}</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='total_qty']" position="after">
|
||||
<label for="workorder_qty_to_test"
|
||||
attrs="{'invisible': ['|', '&', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
|
||||
<div class="o_row"
|
||||
attrs="{'invisible': ['|', '&', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
|
||||
<field name="workorder_qty_to_test" attrs="{'readonly': 0, 'on_chnage': 1}"/>
|
||||
<field name="uom_id"/>
|
||||
</div>
|
||||
<label for="workorder_qty_tested"
|
||||
attrs="{'invisible': ['|', '&', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
|
||||
<div class="o_row"
|
||||
attrs="{'invisible': ['|', '&', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
|
||||
<field name="workorder_qty_tested" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
|
||||
<field name="uom_id"/>
|
||||
</div>
|
||||
<label for="workorder_qty_test_failed"
|
||||
attrs="{'invisible': ['|', '&', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}"/>
|
||||
<div class="o_row"
|
||||
attrs="{'invisible': ['|', '&', ('measure_on', '!=', 'move_line'), ('workorder_id', '=', False), ('is_lot_tested_fractionally', '=', False)]}">
|
||||
<field name="workorder_qty_test_failed" attrs="{'readonly': [('quality_state', '!=', 'none')], 'on_chnage': 1}"/>
|
||||
<field name="uom_id"/>
|
||||
</div>
|
||||
</xpath>
|
||||
<xpath expr="//label[@for='qty_tested']" position="attributes">
|
||||
<attribute name="attrs">{'invisible': ['|', '|', ('measure_on', '!=', 'move_line'), ('is_lot_tested_fractionally', '=', False), '&', ('measure_on', '=', 'move_line'), ('workorder_id', '!=', False)]}</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//div[@class='o_row'][.//field[@name='qty_tested']]" position="attributes">
|
||||
<attribute name="attrs">{'invisible': ['|', '|', ('measure_on', '!=', 'move_line'), ('is_lot_tested_fractionally', '=', False), '&', ('measure_on', '=', 'move_line'), ('workorder_id', '!=', False)]}</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -346,10 +346,10 @@ class RePurchaseOrder(models.Model):
|
||||
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'
|
||||
# request_lines = self.order_line.mapped('purchase_request_lines')
|
||||
# # 检查是否存在 is_subcontract 为 True 的行
|
||||
# if any(line.is_subcontract for line in request_lines):
|
||||
# purchase.purchase_type = 'consignment'
|
||||
request_lines = self.order_line.mapped('purchase_request_lines')
|
||||
# 检查是否存在 is_subcontract 为 True 的行
|
||||
if any(line.is_subcontract for line in request_lines):
|
||||
purchase.purchase_type = 'consignment'
|
||||
|
||||
|
||||
delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
|
||||
@@ -384,28 +384,28 @@ class RePurchaseOrder(models.Model):
|
||||
if not line.taxes_id:
|
||||
raise UserError('请对【产品】中的【税】进行选择')
|
||||
|
||||
# def get_purchase_request(self, consecutive_process_parameters, production):
|
||||
# result = []
|
||||
# for pp in consecutive_process_parameters:
|
||||
# server_template = self.env['product.template'].search(
|
||||
# [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
|
||||
# ('detailed_type', '=', 'service')])
|
||||
# # route_ids
|
||||
# result.append({
|
||||
# "product_id": server_template.product_variant_id.id,
|
||||
# 'related_product': production.product_id.id,
|
||||
# "name": production.procurement_group_id.name,
|
||||
# "date_required": fields.Datetime.now(),
|
||||
# "product_uom_id":server_template.uom_id.id,
|
||||
# "product_qty": production.product_qty,
|
||||
# "request_id": False,
|
||||
# "move_dest_ids": False,
|
||||
# "orderpoint_id": False,
|
||||
# 'is_subcontract':True,
|
||||
# 'group_id':production.procurement_group_id.id,
|
||||
# 'production_name':pp.production_id.name,
|
||||
# })
|
||||
# return result
|
||||
def get_purchase_request(self, consecutive_process_parameters, production):
|
||||
result = []
|
||||
for pp in consecutive_process_parameters:
|
||||
server_template = self.env['product.template'].search(
|
||||
[('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
|
||||
('detailed_type', '=', 'service')])
|
||||
# route_ids
|
||||
result.append({
|
||||
"product_id": server_template.product_variant_id.id,
|
||||
'related_product': production.product_id.id,
|
||||
"name": production.procurement_group_id.name,
|
||||
"date_required": fields.Datetime.now(),
|
||||
"product_uom_id":server_template.uom_id.id,
|
||||
"product_qty": production.product_qty,
|
||||
"request_id": False,
|
||||
"move_dest_ids": False,
|
||||
"orderpoint_id": False,
|
||||
'is_subcontract':True,
|
||||
'group_id':production.procurement_group_id.id,
|
||||
'production_name':pp.production_id.name,
|
||||
})
|
||||
return result
|
||||
|
||||
def get_purchase_order(self, consecutive_process_parameters, production, product_id_to_production_names):
|
||||
for pp in consecutive_process_parameters:
|
||||
|
||||
Reference in New Issue
Block a user