提交 5487dfdb authored 作者: 贺阳's avatar 贺阳

action_type传的是tally,返回的就是理货人名称,否则就是尾程交货人名称

上级 d6fc61e2
......@@ -347,7 +347,8 @@ class CcBl(models.Model):
'bl_no': self.bl_no or '', # 提单号
'scan_big_package_qty': self.tally_big_package_qty + self.delivered_big_package_qty if type == 'tally' else self.delivered_big_package_qty,
# 已扫大包数量
'big_package_arr': [big_package_item.search_big_package_info(pda_lang=pda_lang) for big_package_item in
'big_package_arr': [big_package_item.search_big_package_info(pda_lang=pda_lang, type=type) for
big_package_item in
self.big_package_ids],
# 大包信息
'ship_package_arr': [ship_package_item.search_ship_package_info(pda_lang=pda_lang) for ship_package_item in
......@@ -388,7 +389,7 @@ class CcBigPackage(models.Model):
# 模型描述
_description = 'Big Package'
def search_big_package_info(self, pda_lang=False):
def search_big_package_info(self, pda_lang=False, type='tally'):
"""
查询大包信息
"""
......@@ -412,11 +413,13 @@ class CcBigPackage(models.Model):
vals = {
'tally_state_label': state_arr[self.tally_state] or '', # 理货状态显示名称
'tally_state': self.tally_state or '', # 理货状态系统KEY
'tally_user_id': self.tally_user_id.id or 0, # 理货人id
'tally_user_name': self.tally_user_id.name or '', # 理货人名称
'tally_time': self.tally_time or '',
'tally_user_id': self.tally_user_id.id if type == 'tally' else (self.delivery_user_id.id or 0),
# 理货人id/交货人id
'tally_user_name': self.tally_user_id.name if type == 'tally' else (self.delivery_user_id.name or ''),
# 理货人名称/交货人名称
'tally_time': self.tally_time if type == 'tally' else (self.delivery_time or ''),
# self.env['common.common'].sudo().get_format_time(str(self.tally_time)) if self.tally_time else '',
# 理货时间
# 理货时间/交货时间
'big_package_no': self.big_package_no or '', # 大包号
'next_service_provider_name': self.next_provider_name or '', # 下一个服务商名称
'next_service_provider_tape_color': (provider_obj.tape_color_value or '') if provider_obj else '',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论