重新生成制造订单
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index 148967be..a3ac96ed 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -24,7 +24,12 @@ class ReworkWizard(models.TransientModel):
detailed_reason = fields.Text('详细原因')
routing_type = fields.Selection([
('装夹预调', '装夹预调'),
- ('CNC加工', 'CNC加工')], string="工序类型")
+ ('CNC加工', 'CNC加工'),
+ ('解除装夹', '解除装夹'),
+ ('切割', '切割'),
+ ('表面工艺', '表面工艺'),
+ ('线切割', '线切割'),
+ ('人工线下加工', '人工线下加工')], string="工序类型")
# 根据工单的加工面来显示
processing_panel_id = fields.Many2many('sf.processing.panel', string="加工面")
is_reprogramming = fields.Boolean(string='申请重新编程', default=False)
@@ -133,7 +138,10 @@ class ReworkWizard(models.TransientModel):
lambda item: (item.route_id.name in work.name and item.process_parameters_id
and item.process_parameters_id == work.surface_technics_parameters_id) or
(item.route_id.name == work.name and item.panel
- and item.panel == work.processing_panel))
+ and item.panel == work.processing_panel) or
+ (item.route_id == work.routing_workcenter_id
+ and not work.processing_panel
+ and not work.surface_technics_parameters_id))
if route:
work_list = self.env['mrp.workorder'].json_workorder_str(self.production_id, route[0])
work_list[2].update({'tag_type': '重新加工', 'sequence': 0})
@@ -273,7 +281,8 @@ class ReworkWizard(models.TransientModel):
{'programming_state': '编程中', 'work_state': '编程中', 'is_rework': True})
# =================================================
if self.production_id.state == 'progress':
- self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
+ if self.programming_state:
+ self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
if self.reprogramming_num >= 1 and self.programming_state == '已编程':
productions_not_delivered = self.env['mrp.production'].search(
[('programming_no', '=', self.production_id.programming_no),
@@ -284,7 +293,7 @@ class ReworkWizard(models.TransientModel):
'is_rework': False})
# ==================申请重新编程=======================
if self.is_reprogramming is True:
- self.production_id.update_programming_state()
+ self.production_id.update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
self.production_id.write(
{'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
# ================= 返工完成，制造订单状态置为加工中 ==============
@@ -299,9 +308,11 @@ class ReworkWizard(models.TransientModel):
if self.env.user.has_group('sf_base.group_sf_order_user'):
panel_ids = []
panel_arr = production_id.product_id.model_processing_panel
+ if panel_arr is False:
+ break
for p in production_id.detection_result_ids.filtered(
lambda ap1: ap1.handle_result == '待处理'):
- if p.processing_panel not in panel_arr:
+ if p.processing_panel is not False and p.processing_panel not in panel_arr:
panel_arr += ','.join(p.processing_panel)
for item in panel_arr.split(','):
panel = self.env['sf.processing.panel'].search(
diff --git a/sf_manufacturing/wizard/sf_programming_reason.py b/sf_manufacturing/wizard/sf_programming_reason.py
new file mode 100644
index 00000000..d4126937
--- /dev/null
+++ b/sf_manufacturing/wizard/sf_programming_reason.py
@@ -0,0 +1,55 @@
+from odoo import models, fields, api
+
+class sf_programming_reason(models.TransientModel):
+ _name = 'sf.programming.reason'
+ _description = '重新编程原因'
+
+ production_id = fields.Many2one('mrp.production')
+ reason = fields.Text('重新编程原因')
+ reprogramming_count = fields.Integer(string='重新编程次数')
+ programming_state = fields.Char(string='编程状态')
+
+ @api.model
+ def default_get(self, fields):
+ res = super(sf_programming_reason, self).default_get(fields)
+ if self._context.get('active_id'):
+ production = self.env['mrp.production'].browse(self._context.get('active_id'))
+ res.update({
+ 'reprogramming_count': production._cron_get_programming_state()['reprogramming_num'] if
+ production._cron_get_programming_state().get('reprogramming_num') else 0,
+ 'programming_state': production.programming_state, # 假设制造订单模型中有这个字段
+ })
+ return res
+
+ def action_confirm(self):
+ print('self.production_id.programming_state:', self.production_id.programming_state)
+ self.production_id.re_programming_update_programming_state()
+ self.production_id.write(
+ {'programming_state': '编程中', 'work_state': '编程中'})
+
+ cloud_programming = self.production_id._cron_get_programming_state()
+ self.production_id.programming_record_ids.create({
+ 'number': len(self.production_id.programming_record_ids) + 1,
+ 'production_id': self.production_id.id,
+ 'reason': self.reason,
+ 'programming_method': cloud_programming['programme_way'],
+ 'current_programming_count': cloud_programming['reprogramming_num'],
+ 'target_production_id': self.production_id.name,
+ 'apply_time': self._context.get('default_apply_time'),
+ 'send_time': False,
+ })
+
+ # 返回弹窗提示“已下达编程任务和消息，请等待编程单下发”
+ return {
+ 'type': 'ir.actions.act_window',
+ 'res_model': 'sf.programming.reason',
+ 'view_mode': 'form',
+ 'target': 'new',
+ 'context': {
+ 'default_production_id': self.production_id.id,
+ 'active_id': self.production_id.id,
+ },
+ 'view_id': self.env.ref('sf_manufacturing.sf_programming_reason_message_view').id,
+ }
+
+
diff --git a/sf_manufacturing/wizard/sf_programming_reason_views.xml b/sf_manufacturing/wizard/sf_programming_reason_views.xml
new file mode 100644
index 00000000..7af0af7f
--- /dev/null
+++ b/sf_manufacturing/wizard/sf_programming_reason_views.xml
@@ -0,0 +1,56 @@
+
+
+
+ sf.programming.reason.form.view
+ sf.programming.reason
+
+
+
+
+
+
+ sf.programming.reason.message.view
+ sf.programming.reason
+
+
+
+
+
+
+
+ 重新编程原因
+ ir.actions.act_window
+ sf.programming.reason
+ form
+
+ new
+
+
+
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 85b3d5fa..8c2c7be9 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -29,7 +29,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
if ret['manufacturing_type'] in ('scrap', 'invalid_tool_rework', 'rework'):
domain += [('state', 'not in', ['done', 'scrap', 'cancel'])]
else:
- domain += [('state', 'in', ['confirmed', 'pending_cam'])]
+ domain += [('state', 'in', ['confirmed', 'pending_cam', 'progress'])]
productions = request.env['mrp.production'].with_user(
request.env.ref("base.user_admin")).search(domain)
productions_technology_to_confirmed = request.env['mrp.production'].with_user(
@@ -39,6 +39,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
res = {'status': -2, 'message': '查询到待工艺确认的制造订单'}
return json.JSONEncoder().encode(res)
if productions:
+
# 拉取所有加工面的程序文件
for r in ret['processing_panel'].split(','):
program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
@@ -61,8 +62,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
# 查询状态为进行中且工序类型为CNC加工的工单
cnc_workorder_has = production.workorder_ids.filtered(
lambda ach: ach.routing_type == 'CNC加工' and ach.state not in ['progress', 'done',
- 'rework',
- 'cancel'] and ach.processing_panel == panel)
+ 'rework',
+ 'cancel'] and ach.processing_panel == panel)
if cnc_workorder_has:
if cnc_workorder_has.cnc_ids:
cnc_workorder_has.cmm_ids.sudo().unlink()
@@ -76,7 +77,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
# 查询状态为进行中且工序类型为CNC加工的工单
cnc_workorder = productions.workorder_ids.filtered(
lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done', 'rework'
- 'cancel'] and ac.processing_panel == panel)
+ 'cancel'] and ac.processing_panel == panel)
if cnc_workorder:
# program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
# panel)
@@ -91,24 +92,160 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
pre_workorder = productions.workorder_ids.filtered(
lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done', 'rework'
- 'cancel'] and ap.processing_panel == panel)
+ 'cancel'] and ap.processing_panel == panel)
if pre_workorder:
pre_workorder.write(
{'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
productions.write({'programming_state': '已编程', 'work_state': '已编程'})
logging.info('已更新制造订单编程状态:%s' % productions.ids)
+
+ # 对制造订单所有面的cnc工单的程序用刀进行校验
+ try:
+ logging.info(f'已更新制造订单：{productions}')
+ re_tool_chekout = False
+ re_tool_chekout = productions.production_cnc_tool_checkout()
+ if re_tool_chekout:
+ return json.JSONEncoder().encode({'status': -3, 'message': '对cnc工单的程序用刀进行校验失败'})
+ except Exception as e:
+ res = {'status': -3, 'message': '对cnc工单的程序用刀进行校验报错'}
+ logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')
+ return json.JSONEncoder().encode(res)
+
+ productions_reprogram = ''
+ if productions:
+ productions_reprogram = ','.join(productions.mapped('name'))
+
+ # 更新编程记录
+ correct_record_ids_obj = None
+ correct_production_id = None
+ # rework_record_ids_obj = None
+ # rework_production_id = None
+ # scrap_record_ids_obj = None
+ # scrap_production_id = None
+ for production in productions:
+ logging.info('production====:%s' % production.name)
+ record_ids_obj = production.programming_record_ids.filtered(
+ lambda r: r.current_programming_count == ret['reprogramming_num'])
+ logging.info('record_ids_obj====:%s' % record_ids_obj)
+ if record_ids_obj:
+ logging.info('record_ids_obj.reason====:%s' % record_ids_obj.reason)
+ record_ids_obj.write(
+ {'send_time': ret['send_time'], 'target_production_id': productions_reprogram})
+ logging.info('已更新编程记录:%s' % record_ids_obj)
+ correct_record_ids_obj = record_ids_obj
+ correct_production_id = production.id
+ if ret['reprogramming_num'] == 0:
+ logging.info('首次下发')
+ production.programming_record_ids.create({
+ 'number': 1,
+ 'production_id': production.id,
+ 'reason': '首次下发',
+ 'programming_method': ret['programme_way'],
+ 'current_programming_count': ret['reprogramming_num'],
+ 'target_production_id': productions_reprogram,
+ 'apply_time': False,
+ 'send_time': ret['send_time'],
+ })
+ logging.info('已创建首次下发的编程记录:%s' % production.name)
+ elif ret['reset_flag']:
+ logging.info('重置状态')
+ production.programming_record_ids.create({
+ 'number': len(production.programming_record_ids) + 1,
+ 'production_id': production.id,
+ 'reason': '重置状态',
+ 'programming_method': ret['programme_way'],
+ 'current_programming_count': ret['reprogramming_num'],
+ 'target_production_id': productions_reprogram,
+ 'apply_time': False,
+ 'send_time': ret['send_time'],
+ })
+ logging.info('已创建重置状态的编程记录:%s' % production.name)
+ elif ret['manufacturing_type'] == 'rework':
+ logging.info('返工')
+ rework_record_ids_obj = production.programming_record_ids.create({
+ 'number': len(production.programming_record_ids) + 1,
+ 'production_id': production.id,
+ 'reason': '返工',
+ 'programming_method': ret['programme_way'],
+ 'current_programming_count': ret['reprogramming_num'],
+ 'target_production_id': productions_reprogram,
+ 'apply_time': ret['trigger_time'],
+ 'send_time': ret['send_time'],
+ })
+ logging.info('已创建返工的编程记录:%s' % production.name)
+ logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
+ # rework_production_id = production.id
+ # logging.info('rework_production_id====:%s' % rework_production_id)
+ elif ret['manufacturing_type'] == 'scrap':
+ production.programming_record_ids.create({
+ 'number': len(production.programming_record_ids) + 1,
+ 'production_id': production.id,
+ 'reason': '报废',
+ 'programming_method': ret['programme_way'],
+ 'current_programming_count': ret['reprogramming_num'],
+ 'target_production_id': productions_reprogram,
+ 'apply_time': ret['trigger_time'],
+ 'send_time': ret['send_time'],
+ })
+ elif ret['manufacturing_type'] == 'invalid_tool_rework':
+ logging.info('无效功能刀具')
+ production.programming_record_ids.create({
+ 'number': len(production.programming_record_ids) + 1,
+ 'production_id': production.id,
+ 'reason': '无效功能刀具',
+ 'programming_method': ret['programme_way'],
+ 'current_programming_count': ret['reprogramming_num'],
+ 'target_production_id': productions_reprogram,
+ 'apply_time': ret['trigger_time'],
+ 'send_time': ret['send_time'],
+ })
+ logging.info('已创建无效功能刀具的编程记录:%s' % production.name)
+ else:
+ logging.info('无对应状态，不需更新编程记录')
+
+ for production in productions:
+ logging.info('production====:%s' % production.name)
+ if correct_record_ids_obj:
+ logging.info('correct_record_ids_obj====:%s' % correct_record_ids_obj)
+ if production.id == correct_production_id:
+ logging.info('跳过正确的制造订单')
+ continue
+ else:
+ logging.info('创建正确的制造订单的编程记录')
+ production.programming_record_ids.create({
+ 'number': len(production.programming_record_ids) + 1,
+ 'production_id': production.id,
+ 'reason': correct_record_ids_obj.reason,
+ 'programming_method': correct_record_ids_obj.programming_method,
+ 'current_programming_count': correct_record_ids_obj.current_programming_count,
+ 'target_production_id': correct_record_ids_obj.target_production_id,
+ 'apply_time': correct_record_ids_obj.apply_time,
+ 'send_time': correct_record_ids_obj.send_time,
+ })
+ logging.info('已创建正确的制造订单的编程记录:%s' % production.name)
+
+ # if rework_record_ids_obj:
+ # logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
+ # if production.id == rework_production_id:
+ # continue
+ # else:
+ # logging.info('创建返工的制造订单的编程记录')
+ # production.programming_record_ids.create({
+ # 'number': len(production.programming_record_ids) + 1,
+ # 'production_id': production.id,
+ # 'reason': rework_record_ids_obj.reason,
+ # 'programming_method': rework_record_ids_obj.programming_method,
+ # 'current_programming_count': rework_record_ids_obj.current_programming_count,
+ # 'target_production_id': rework_record_ids_obj.target_production_id,
+ # 'apply_time': rework_record_ids_obj.apply_time,
+ # 'send_time': rework_record_ids_obj.send_time,
+ # })
+ # logging.info('已创建返工的制造订单的编程记录:%s' % production.name)
+
res.update({
'production_ids': productions.ids
})
- # 对制造订单所以面的cnc工单的程序用刀进行校验
- try:
- logging.info(f'已更新制造订单：{productions}')
- productions.production_cnc_tool_checkout()
- except Exception as e:
- logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')
- return json.JSONEncoder().encode(res)
-
return json.JSONEncoder().encode(res)
else:
res = {'status': 0, 'message': '没有查询到该制造订单'}
diff --git a/sf_mrs_connect/data/ir_cron_data.xml b/sf_mrs_connect/data/ir_cron_data.xml
index d3b13eb8..7cc18c8e 100644
--- a/sf_mrs_connect/data/ir_cron_data.xml
+++ b/sf_mrs_connect/data/ir_cron_data.xml
@@ -3,9 +3,9 @@
制造-配置：每日定时同步cloud的静态资源库
-
+
code
- model._cron_static_resource_yesterday_func()
+ model.sf_all_sync()
1
days
-1
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 09bd790c..cf57b355 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -160,8 +160,11 @@
-
-
+
+
+
+
+
@@ -176,6 +179,7 @@
+
diff --git a/sf_plan/wizard/action_plan_some.py b/sf_plan/wizard/action_plan_some.py
index 86b3f1ac..f27f4dad 100644
--- a/sf_plan/wizard/action_plan_some.py
+++ b/sf_plan/wizard/action_plan_some.py
@@ -20,10 +20,15 @@ class Action_Plan_All_Wizard(models.TransientModel):
logging.info('计划开始时间: %s', planned_start_date)
return planned_start_date
+ def _get_production_line_id(self):
+ sf_production_line = self.env['sf.production.line'].sudo().search(
+ [('name', '=', '1#CNC自动生产线')], limit=1)
+ return sf_production_line.id
+
# 选择生产线
- production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True)
- date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False,
- default=_get_date_planned_start)
+ production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True,
+ default=_get_production_line_id)
+ date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False, required=True)
# 接收传递过来的计划ID
plan_ids = fields.Many2many('sf.production.plan', string=u'计划ID')
diff --git a/sf_quality/__manifest__.py b/sf_quality/__manifest__.py
index 582e306a..9c2c3138 100644
--- a/sf_quality/__manifest__.py
+++ b/sf_quality/__manifest__.py
@@ -17,7 +17,9 @@
'data': [
'security/ir.model.access.csv',
'views/view.xml',
- 'views/quality_cnc_test_view.xml'
+ 'views/quality_cnc_test_view.xml',
+ 'views/mrp_workorder.xml',
+ 'views/quality_check_view.xml'
],
'assets': {
diff --git a/sf_quality/models/__init__.py b/sf_quality/models/__init__.py
index 248f7fb2..60081c7b 100644
--- a/sf_quality/models/__init__.py
+++ b/sf_quality/models/__init__.py
@@ -4,3 +4,4 @@
from . import custom_quality
from . import quality
from . import quality_cnc_test
+from . import mrp_workorder
diff --git a/sf_quality/models/custom_quality.py b/sf_quality/models/custom_quality.py
index f80dd92e..8bf10c3e 100644
--- a/sf_quality/models/custom_quality.py
+++ b/sf_quality/models/custom_quality.py
@@ -11,3 +11,8 @@ class SfQualityPoint(models.Model):
"('product', 'consu')), '|', ('company_id', '=', False), ('company_id', '=', company_id)]", help=
"Quality Point will apply to every selected Products.")
+ is_inspect = fields.Boolean('需送检', default=False)
+ operation_id = fields.Many2one(
+ 'mrp.routing.workcenter', 'Step', check_company=True,
+ domain="[('is_outsource', '=', False),('company_id', 'in', (company_id, False))]")
+
diff --git a/sf_quality/models/mrp_workorder.py b/sf_quality/models/mrp_workorder.py
new file mode 100644
index 00000000..52a84f6f
--- /dev/null
+++ b/sf_quality/models/mrp_workorder.py
@@ -0,0 +1,28 @@
+from odoo import api, fields, models
+
+
+class ResMrpWorkOrder(models.Model):
+ _inherit = 'mrp.workorder'
+
+ check_ids_state = fields.Selection([('none', '待处理'), ('pass', '通过的'), ('fail', '失败的')], store=True,
+ compute='_compute_check_ids_state')
+
+ @api.depends('check_ids.quality_state')
+ def _compute_check_ids_state(self):
+ for mw in self:
+ if mw.check_ids:
+ if all(check_id.quality_state == 'pass' for check_id in mw.check_ids):
+ mw.check_ids_state = 'pass'
+ elif any(check_id.quality_state == 'fail' for check_id in mw.check_ids):
+ mw.check_ids_state = 'fail'
+ else:
+ mw.check_ids_state = 'none'
+
+ def action_open_quality_check_work_sf(self):
+ return {
+ 'res_model': 'quality.check',
+ 'type': 'ir.actions.act_window',
+ 'name': '质量检查',
+ 'domain': [('workorder_id', '=', self.id)],
+ 'view_mode': 'tree,form',
+ }
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index 6fc04154..201103f1 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -10,6 +10,86 @@ from odoo.addons.sf_base.commons.common import Common
class QualityCheck(models.Model):
_inherit = "quality.check"
+ quality_state = fields.Selection([
+ ('waiting', '等待'),
+ ('none', '待处理'),
+ ('pass', '通过的'),
+ ('fail', '失败的')], string='状态', tracking=True, store=True,
+ default='none', copy=False, compute='_compute_quality_state')
+
+ individuation_page_PTD = fields.Boolean('个性化记录(是否显示后置三元检测[PTD]页签)', related='workorder_id.individuation_page_PTD')
+ work_state = fields.Selection(related='workorder_id.state', string='工单状态')
+ processing_panel = fields.Char(related='workorder_id.processing_panel', string='加工面')
+
+ production_line_id = fields.Many2one(related='workorder_id.production_line_id',
+ string='生产线')
+ equipment_id = fields.Many2one(related='workorder_id.equipment_id', string='加工设备')
+ model_file = fields.Binary(related='workorder_id.glb_file', string='加工模型')
+
+ detection_report = fields.Binary(related='workorder_id.detection_report', readonly=True, string='检测报告')
+ test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果",
+ default='合格')
+ reason = fields.Selection(
+ [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
+ ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")
+ detailed_reason = fields.Text('详细原因')
+ machining_drawings = fields.Binary('2D加工图纸', related='workorder_id.machining_drawings')
+ quality_standard = fields.Binary('质检标准', related='workorder_id.quality_standard')
+
+ operation_id = fields.Many2one('mrp.routing.workcenter', '作业', store=True, compute='_compute_operation_id')
+ is_inspect = fields.Boolean('需送检', related='point_id.is_inspect')
+
+ @api.depends('point_id.operation_id')
+ def _compute_operation_id(self):
+ for qc in self:
+ if qc.point_id.operation_id:
+ qc.operation_id = qc.point_id.operation_id.id
+
+ @api.depends('point_id.is_inspect')
+ def _compute_quality_state(self):
+ for qc in self:
+ if qc.point_id.is_inspect and qc.quality_state == 'none' and qc.workorder_id.state != 'to be detected':
+ qc.quality_state = 'waiting'
+ elif not qc.point_id.is_inspect and qc.quality_state == 'waiting':
+ qc.quality_state = 'none'
+
+ @api.onchange('test_results')
+ def _onchange_test_results(self):
+ if self.test_results == '合格':
+ self.reason = False
+ self.detailed_reason = False
+
+ def do_pass(self):
+ self.ensure_one()
+ super().do_pass()
+ if self.workorder_id:
+ if self.workorder_id.state in ('pending', 'waiting'):
+ raise ValidationError('工单未就绪!')
+ # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
+ if self.test_results in ['返工', '报废']:
+ raise ValidationError('请重新选择【判定结果】-【检测结果】')
+ if self.workorder_id.state not in ['done']:
+ self.workorder_id.write({'test_results': '合格'})
+ # 2）将关联的工单状态更新为“已完成”
+ self.workorder_id.button_finish()
+
+ def do_fail(self):
+ self.ensure_one()
+ super().do_fail()
+ if self.workorder_id:
+ if self.workorder_id.state in ('pending', 'waiting'):
+ raise ValidationError('工单未就绪!')
+ # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
+ if not self.test_results:
+ raise ValidationError('请填写【判定结果】里的信息')
+ if self.test_results == '合格':
+ raise ValidationError('请重新选择【判定结果】-【检测结果】')
+ if self.workorder_id.state not in ['done']:
+ self.workorder_id.write(
+ {'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason})
+ # 2）将关联的工单状态更新为“已完成”
+ self.workorder_id.button_finish()
+
# ==========零件特采接口==========
def _register_quality_check(self):
config = self.env['res.config.settings'].get_values()
@@ -31,10 +111,3 @@ class QualityCheck(models.Model):
else:
raise ValidationError("零件特采发送失败")
- # def do_fail(self):
- # self.write({
- # 'quality_state': 'fail',
- # 'user_id': self.env.user.id,
- # 'control_date': datetime.now()})
- # if self.picking_id and 'WH/MO/' in self.picking_id.origin:
- # self._register_quality_check()
diff --git a/sf_quality/views/mrp_workorder.xml b/sf_quality/views/mrp_workorder.xml
new file mode 100644
index 00000000..7c22a465
--- /dev/null
+++ b/sf_quality/views/mrp_workorder.xml
@@ -0,0 +1,22 @@
+
+
+
+ mrp.workorder.view.form.inherit.quality
+ mrp.workorder
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
new file mode 100644
index 00000000..61309737
--- /dev/null
+++ b/sf_quality/views/quality_check_view.xml
@@ -0,0 +1,96 @@
+
+
+
+ sf.quality.check.view.form
+ quality.check
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合格
+
+
+ {'invisible': ['|',('quality_state', '!=', 'fail'),('work_state','in', ('done', 'rework'))]}
+ 合格
+
+
+ 不合格
+
+
+ {'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}
+ 不合格
+
+
+
+
+
+ sf.quality.check.view.tree
+ quality.check
+
+
+
+
+
+
+
+
+
+ sf.quality.check.view.search
+ quality.check
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_quality/views/view.xml b/sf_quality/views/view.xml
index 62a5b0e7..3f83acda 100644
--- a/sf_quality/views/view.xml
+++ b/sf_quality/views/view.xml
@@ -57,6 +57,10 @@
custom_required
1
+
+
+
+
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 1b282c8e..31681932 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -130,7 +130,10 @@ class ReSaleOrder(models.Model):
'order_id': self.id,
'product_id': product.id,
'name': '%s/%s/%s/%s/%s/%s' % (
- product.model_long, product.model_width, product.model_height, product.model_volume,
+ self.format_float(product.model_long),
+ self.format_float(product.model_width),
+ self.format_float(product.model_height),
+ self.format_float(product.model_volume),
machining_accuracy_name,
product.materials_id.name),
'price_unit': product.list_price,
@@ -143,6 +146,20 @@ class ReSaleOrder(models.Model):
}
return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
+ def format_float(self, value):
+ # 将浮点数转换为字符串
+ value_str = str(value)
+ # 检查小数点的位置
+ if '.' in value_str:
+ # 获取小数部分
+ decimal_part = value_str.split('.')[1]
+ # 判断小数位数是否超过2位
+ if len(decimal_part) > 2:
+ # 超过2位则保留2位小数
+ return "{:.2f}".format(value)
+ # 否则保持原来的位数
+ return float(value_str)
+
@api.constrains('order_line')
def check_order_line(self):
for item in self:
@@ -346,7 +363,7 @@ class RePurchaseOrder(models.Model):
server_product_process = []
purchase_order = pp._get_surface_technics_purchase_ids()
if purchase_order:
- purchase_order.write({'state': 'draft'})
+ # purchase_order.write({'state': 'draft'})
pp.purchase_id = [(6, 0, [purchase_order.id])]
else:
server_template = self.env['product.template'].search(
@@ -355,7 +372,8 @@ class RePurchaseOrder(models.Model):
server_product_process.append((0, 0, {
'product_id': server_template.product_variant_id.id,
'product_qty': 1,
- 'product_uom': server_template.uom_id.id
+ 'product_uom': server_template.uom_id.id,
+ 'related_product': production.product_id.id,
}))
# 获取服务商品最后一个供应商的采购员
purchase_user_id = server_template.seller_ids[-1].partner_id.purchase_user_id
@@ -370,15 +388,15 @@ class RePurchaseOrder(models.Model):
pp.purchase_id = [(6, 0, [purchase_order.id])]
# self.env.cr.commit()
- @api.onchange('order_line')
- def _onchange_order_line(self):
- for order in self:
- if order.order_line:
- line = order.order_line
- product = line.product_id
- product_id = product.ids
- if len(product_id) != len(line):
- raise ValidationError('【%s】已存在，请勿重复添加' % product[-1].name)
+ # @api.onchange('order_line')
+ # def _onchange_order_line(self):
+ # for order in self:
+ # if order.order_line:
+ # line = order.order_line
+ # product = line.product_id
+ # product_id = product.ids
+ # if len(product_id) != len(line):
+ # raise ValidationError('【%s】已存在，请勿重复添加' % product[-1].name)
def button_confirm(self):
result = super(RePurchaseOrder, self).button_confirm()
@@ -393,26 +411,9 @@ class RePurchaseOrder(models.Model):
if line.product_id.categ_type == '表面工艺':
if item.origin:
for production_name in item.origin.split(','):
- production = self.env['mrp.production'].search([('name', '=', production_name)])
+ production = self.env['mrp.production'].search([('name', '=', production_name.strip())])
for workorder in production.workorder_ids.filtered(
lambda wd: wd.routing_type == '表面工艺' and wd.state == 'waiting' and line.product_id.server_product_process_parameters_id == wd.surface_technics_parameters_id):
- work_ids = workorder.production_id.workorder_ids.filtered(
- lambda wk: wk.state not in ['done', 'rework', 'cancel'])
- min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
- artificial_offline = (
- workorder.production_id.production_type == '人工线下加工' and workorder.production_id.schedule_state != '已排')
- auto_production = (
- workorder.production_id.production_type == '自动化产线加工' and workorder.production_id.programming_state != '已编程')
- if workorder.sequence == min_sequence_wk.sequence:
- if artificial_offline or auto_production:
- raise UserError('等待组件')
- else:
- sorted_work_ids = work_ids.sorted(key=lambda w: w.sequence)
- previous_workorder = self.env['mrp.workorder'].search([('sequence', '<', workorder.sequence),
- ('production_id', '=', workorder.production_id.id),
- ('state', '=', 'done')], order='sequence desc', limit=1)
- if not previous_workorder:
- raise UserError('等待组件')
workorder.state = 'ready'
return result
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 9fcfbd9e..1c96bf59 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -285,7 +285,7 @@
create_date desc
- False
+ false
delivery_warning == 'warning'
delivery_warning == 'overdue'
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index af9d4931..12c7f8f3 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -143,6 +143,10 @@ class StockLot(models.Model):
record.tool_material_status = '报废'
else:
record.tool_material_status = '未入库'
+ elif record.product_id.categ_id.name in ['夹具']:
+ if record.quant_ids:
+ if record.quant_ids[-1].location_id.name in ['夹具房']:
+ record.tool_material_status = '可用'
@api.model
def name_search(self, name='', args=None, operator='ilike', limit=100):
diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py
index 655d759f..90382e11 100644
--- a/sf_tool_management/models/mrp_workorder.py
+++ b/sf_tool_management/models/mrp_workorder.py
@@ -1,6 +1,7 @@
import json
import requests
import logging
+from datetime import datetime
from odoo import fields, models, api
from odoo.exceptions import ValidationError
from odoo.addons.sf_base.commons.common import Common
@@ -196,12 +197,13 @@ class MrpProduction(models.Model):
})
# 自动调用重新获取编程的方法
logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()')
- self[0].update_programming_state()
+ self[0].update_programming_state(trigger_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
self[0].write({'is_rework': False})
# 修改制造订单 编程状态变为“编程中”
self.write({'programming_state': '编程中', 'work_state': '编程中'})
self[0].workorder_ids.filtered(
lambda a: a.name == '装夹预调' and a.state not in ['rework', 'done', 'cancel'])._compute_state()
+ return True
if missing_tool_1:
logging.info(f'线边、机内缺刀：{missing_tool_1}')
# 修改 修改cnc程序的‘刀具状态’ 为 ‘缺刀’
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 092e0113..8f986858 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -770,6 +770,7 @@
+
