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

修复报废

Browse Source
This commit is contained in:
jinling.yang
2024-08-23 16:13:03 +08:00
parent 6825364a2b
commit 7fee98cdee
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/product_template.py
View File

@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model): class ResProductMo(models.Model):

25
sf_manufacturing/models/stock.py
View File

@@ -151,6 +151,8 @@ class StockRule(models.Model):
list2.append(item) list2.append(item)
for procurement, rule in list2: for procurement, rule in list2:
logging.info(rule)
logging.info(rule.procure_method)
procure_method = rule.procure_method procure_method = rule.procure_method
if rule.procure_method == 'mts_else_mto': if rule.procure_method == 'mts_else_mto':
qty_needed = procurement.product_uom._compute_quantity(procurement.product_qty, qty_needed = procurement.product_uom._compute_quantity(procurement.product_qty,
@@ -169,7 +171,6 @@ class StockRule(models.Model):
else: else:
forecasted_qties_by_loc[rule.location_src_id][procurement.product_id.id] -= qty_needed forecasted_qties_by_loc[rule.location_src_id][procurement.product_id.id] -= qty_needed
procure_method = 'make_to_stock' procure_method = 'make_to_stock'
move_values = rule._get_stock_move_values(*procurement) move_values = rule._get_stock_move_values(*procurement)
move_values['procure_method'] = procure_method move_values['procure_method'] = procure_method
moves_values_by_company[procurement.company_id.id].append(move_values) moves_values_by_company[procurement.company_id.id].append(move_values)
@@ -350,17 +351,17 @@ class StockRule(models.Model):
product_id_to_production_names) product_id_to_production_names)
# # 同一个产品多个制造订单对应一个编程单和模型库 # # 同一个产品多个制造订单对应一个编程单和模型库
# # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递 # # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
if not production_item.programming_no: # if not production_item.programming_no:
production_programming = self.env['mrp.production'].search( # production_programming = self.env['mrp.production'].search(
[('product_id.id', '=', production_item.product_id.id), # [('product_id.id', '=', production_item.product_id.id),
('origin', '=', production_item.origin)], # ('origin', '=', production_item.origin)],
limit=1, order='id asc') # limit=1, order='id asc')
if not production_programming.programming_no: # if not production_programming.programming_no:
production_item.fetchCNC( # production_item.fetchCNC(
', '.join(product_id_to_production_names[production_item.product_id.id])) # ', '.join(product_id_to_production_names[production_item.product_id.id]))
else: # else:
production_item.write({'programming_no': production_programming.programming_no, # production_item.write({'programming_no': production_programming.programming_no,
'programming_state': '编程中'}) # 'programming_state': '编程中'})
return True return True

4
sf_sale/models/quick_easy_order.py
View File

@@ -8,8 +8,8 @@ from datetime import datetime
import requests import requests
from odoo import http from odoo import http
from odoo.http import request from odoo.http import request
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
from odoo import models, fields, api from odoo import models, fields, api
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError from odoo.exceptions import ValidationError, UserError

4
sf_sale/models/quick_easy_order_old.py
View File

@@ -6,8 +6,8 @@ import os
from datetime import datetime from datetime import datetime
from stl import mesh from stl import mesh
# from OCC.Core.GProp import GProp_GProps # from OCC.Core.GProp import GProp_GProps
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
from odoo import models, fields, api from odoo import models, fields, api
from odoo.modules import get_resource_path from odoo.modules import get_resource_path