Accept Merge Request #1959: (feature/tool_standard_library_process -> develop)
Merge Request: 调拨单零件图号零件名称计算逻辑 错误处理 Created By: @廖丹龙 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @廖丹龙 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1959
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
import base64
|
import base64
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
|
import traceback
|
||||||
|
|
||||||
import qrcode
|
import qrcode
|
||||||
from itertools import groupby
|
from itertools import groupby
|
||||||
@@ -292,7 +293,8 @@ class StockRule(models.Model):
|
|||||||
if production_item.product_id.id in product_id_to_production_names:
|
if production_item.product_id.id in product_id_to_production_names:
|
||||||
# 同一个产品多个制造订单对应一个编程单和模型库
|
# 同一个产品多个制造订单对应一个编程单和模型库
|
||||||
# 只调用一次fetchCNC,并将所有生产订单的名称作为字符串传递
|
# 只调用一次fetchCNC,并将所有生产订单的名称作为字符串传递
|
||||||
if not production_item.programming_no and production_item.production_type in ['自动化产线加工', '人工线下加工']:
|
if not production_item.programming_no and production_item.production_type in ['自动化产线加工',
|
||||||
|
'人工线下加工']:
|
||||||
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]))
|
||||||
@@ -624,7 +626,8 @@ class StockPicking(models.Model):
|
|||||||
if move_in:
|
if move_in:
|
||||||
workorder = move_in.subcontract_workorder_id
|
workorder = move_in.subcontract_workorder_id
|
||||||
workorders = workorder.production_id.workorder_ids
|
workorders = workorder.production_id.workorder_ids
|
||||||
subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True and wo.state!='cancel').sorted('sequence')
|
subcontract_workorders = workorders.filtered(
|
||||||
|
lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||||
# if workorder == subcontract_workorders[-1]:
|
# if workorder == subcontract_workorders[-1]:
|
||||||
# self.env['stock.quant']._update_reserved_quantity(
|
# self.env['stock.quant']._update_reserved_quantity(
|
||||||
# move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
# move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||||
@@ -750,6 +753,7 @@ class ReStockMove(models.Model):
|
|||||||
|
|
||||||
@api.depends('product_id')
|
@api.depends('product_id')
|
||||||
def _compute_part_info(self):
|
def _compute_part_info(self):
|
||||||
|
try:
|
||||||
for move in self:
|
for move in self:
|
||||||
if move.product_id.categ_id.type == '成品':
|
if move.product_id.categ_id.type == '成品':
|
||||||
move.part_number = move.product_id.part_number
|
move.part_number = move.product_id.part_number
|
||||||
@@ -781,6 +785,7 @@ class ReStockMove(models.Model):
|
|||||||
if not production_id:
|
if not production_id:
|
||||||
if not move.origin:
|
if not move.origin:
|
||||||
continue
|
continue
|
||||||
|
logging.info('制造订单的调拨单', move.origin)
|
||||||
production_id = self.env['mrp.production'].sudo().search(
|
production_id = self.env['mrp.production'].sudo().search(
|
||||||
[('name', '=', move.origin)], limit=1)
|
[('name', '=', move.origin)], limit=1)
|
||||||
if not production_id:
|
if not production_id:
|
||||||
@@ -807,6 +812,10 @@ class ReStockMove(models.Model):
|
|||||||
if filtered_order_line:
|
if filtered_order_line:
|
||||||
move.part_number = filtered_order_line.part_number
|
move.part_number = filtered_order_line.part_number
|
||||||
move.part_name = filtered_order_line.part_name
|
move.part_name = filtered_order_line.part_name
|
||||||
|
except Exception as e:
|
||||||
|
traceback_error = traceback.format_exc()
|
||||||
|
logging.error("零件图号 零件名称获取失败:%s" % traceback_error)
|
||||||
|
|
||||||
def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
|
def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
|
||||||
route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
|
route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
|
||||||
stock_rule = self.env['stock.rule'].sudo().search(
|
stock_rule = self.env['stock.rule'].sudo().search(
|
||||||
@@ -1064,7 +1073,8 @@ class ReStockMove(models.Model):
|
|||||||
[('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
|
[('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
|
||||||
res['origin'] = ','.join(productions.mapped('name'))
|
res['origin'] = ','.join(productions.mapped('name'))
|
||||||
if self.picking_type_id.name == '客供料入库':
|
if self.picking_type_id.name == '客供料入库':
|
||||||
self.picking_id.sudo().write({'origin': res['origin'] if res.get('origin') else self[0].picking_id.origin})
|
self.picking_id.sudo().write(
|
||||||
|
{'origin': res['origin'] if res.get('origin') else self[0].picking_id.origin})
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def _get_new_picking_values(self):
|
def _get_new_picking_values(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user