jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/库存优化_1' into feature/库存优化_2

Browse Source
This commit is contained in:
yuxianghui
2025-02-17 15:18:49 +08:00
parent d25022204b 3d2e383330
commit 60f525e228
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_quality/models/quality.py
View File

@@ -84,6 +84,18 @@ class QualityCheck(models.Model):
raise ValidationError('请填写【判定结果】里的信息') raise ValidationError('请填写【判定结果】里的信息')
if self.test_results == '合格': if self.test_results == '合格':
raise ValidationError('请重新选择【判定结果】-【检测结果】') raise ValidationError('请重新选择【判定结果】-【检测结果】')
if self.workorder_id.routing_type != 'CNC加工' and self.workorder_id.individuation_page_PTD is False:
self.workorder_id.production_id.write({'detection_result_ids': [(0, 0, {
'rework_reason': self.workorder_id.reason,
'detailed_reason': self.workorder_id.detailed_reason,
'processing_panel': self.workorder_id.processing_panel,
'routing_type': self.workorder_id.routing_type,
'handle_result': '待处理' if (self.workorder_id.test_results in ['返工', '报废']
or self.workorder_id.is_rework is True) else '',
'test_results': self.workorder_id.test_results,
'test_report': self.workorder_id.detection_report})],
'is_scrap': True if self.workorder_id.test_results == '报废' else False
})
if self.workorder_id.state not in ['done']: if self.workorder_id.state not in ['done']:
self.workorder_id.write( self.workorder_id.write(
{'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason}) {'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason})

4
sf_stock/models/stock_picking.py
View File

@@ -18,7 +18,7 @@ class StockPicking(models.Model):
@api.depends('name') @api.depends('name')
def _compute_pro_purchase_count(self): def _compute_pro_purchase_count(self):
for sp in self: for sp in self:
if sp: if sp.name and sp.name != '/':
po_ids = self.env['purchase.order'].sudo().search([ po_ids = self.env['purchase.order'].sudo().search([
('origin', 'like', sp.name), ('purchase_type', '=', 'standard')]) ('origin', 'like', sp.name), ('purchase_type', '=', 'standard')])
if po_ids: if po_ids:
@@ -52,7 +52,7 @@ class StockPicking(models.Model):
@api.depends('name') @api.depends('name')
def _compute_pro_out_purchase_count(self): def _compute_pro_out_purchase_count(self):
for sp in self: for sp in self:
if sp: if sp.name and sp.name != '/':
po_ids = self.env['purchase.order'].sudo().search([ po_ids = self.env['purchase.order'].sudo().search([
('origin', 'like', sp.name), ('purchase_type', '=', 'outsourcing')]) ('origin', 'like', sp.name), ('purchase_type', '=', 'outsourcing')])
if po_ids: if po_ids: