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-11-18 11:40:24 +08:00
parent e8c006d495
commit a2855f1f08
4 changed files with 51 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1005,14 +1005,6 @@ class ResMrpWorkOrder(models.Model):
def _compute_state(self):
# super()._compute_state()
for workorder in self:
logging.info(workorder.name)
logging.info(workorder.state)
logging.info(workorder.sequence)
logging.info(workorder.id)
# logging.info(workorder.blocked_by_workorder_ids)
# logging.info(workorder.blocked_by_workorder_ids.name)
# logging.info(workorder.blocked_by_workorder_ids.sequence)
logging.info('----------------------')
if workorder.sequence != 1:
previous_workorder = self.env['mrp.workorder'].search(
[('production_id', '=', workorder.production_id.id),
@@ -1308,9 +1300,9 @@ class ResMrpWorkOrder(models.Model):
if record.routing_type == '装夹预调':
if not record.rfid_code and record.is_rework is False:
raise UserError("请扫RFID码进行绑定")
# if record.is_rework is False:
# if not record.material_center_point:
# raise UserError("坯料中心点为空，请检查")
if record.is_rework is False:
if not record.material_center_point:
raise UserError("坯料中心点为空，请检查")
# if record.X_deviation_angle <= 0:
# raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
record.process_state = '待加工'
@@ -1344,8 +1336,8 @@ class ResMrpWorkOrder(models.Model):
if record.routing_type == '表面工艺':
if record.picking_ids:
picks = record.picking_ids.filtered(lambda p: p.state not in ('done'))
# if picks:
# raise UserError('请先完成该工单的工艺外协再进行操作')
if picks:
raise UserError('请先完成该工单的工艺外协再进行操作')
tem_date_planned_finished = record.date_planned_finished
tem_date_finished = record.date_finished
logging.info('routing_type:%s' % record.routing_type)

9
sf_manufacturing/models/stock.py
View File

@@ -294,10 +294,10 @@ class StockRule(models.Model):
# 为同一个product_id创建一个生产订单名称列表
product_id_to_production_names[product_id] = [production.name for production in all_production]
for production_item in productions:
# production_programming = self.env['mrp.production'].search(
# [('product_id.id', '=', production_item.product_id.id),
# ('origin', '=', production_item.origin)],
# limit=1, order='id asc')
production_programming = self.env['mrp.production'].search(
[('product_id.id', '=', production_item.product_id.id),
('origin', '=', production_item.origin)],
limit=1, order='id asc')
if production_item.product_id.id in product_id_to_production_names:
# 同一个产品多个制造订单对应一个编程单和模型库
# 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
@@ -310,7 +310,6 @@ class StockRule(models.Model):
'programming_state': '编程中'})
if not technology_design_values:
if production_item.product_id.categ_id.type == '成品':
production_item.product_id.model_processing_panel = 'ZM,FM'
# 根据加工面板的面数及成品工序模板生成工序设计
i = 0
for k in (production_item.product_id.model_processing_panel.split(',')):