Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
H
hh_ccs
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
贺阳
hh_ccs
Commits
3438083d
提交
3438083d
authored
9月 06, 2024
作者:
贺阳
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
提单的清关文件 上传改为同步,不默认时间
上级
da12e248
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
30 行增加
和
23 行删除
+30
-23
zh_CN.po
ccs_base/i18n/zh_CN.po
+8
-8
cc_bill_loading.py
ccs_base/models/cc_bill_loading.py
+13
-4
cc_clearance_file_view.xml
ccs_base/views/cc_clearance_file_view.xml
+9
-9
order_controller.py
ccs_connect_tiktok/controllers/order_controller.py
+0
-2
没有找到文件。
ccs_base/i18n/zh_CN.po
浏览文件 @
3438083d
...
@@ -693,7 +693,7 @@ msgstr "申报类型"
...
@@ -693,7 +693,7 @@ msgstr "申报类型"
#: model:ir.model.fields,field_description:ccs_base.field_cc_node__desc
#: model:ir.model.fields,field_description:ccs_base.field_cc_node__desc
#: model:ir.model.fields,field_description:ccs_base.field_cc_node_exception_reason__desc
#: model:ir.model.fields,field_description:ccs_base.field_cc_node_exception_reason__desc
msgid "Description"
msgid "Description"
msgstr "
节点
描述"
msgstr "描述"
#. module: ccs_base
#. module: ccs_base
#: model:ir.model.fields,field_description:ccs_base.field_batch_input_ship_package_status_wizard__display_name
#: model:ir.model.fields,field_description:ccs_base.field_batch_input_ship_package_status_wizard__display_name
...
@@ -1079,8 +1079,8 @@ msgstr "是卡车转运"
...
@@ -1079,8 +1079,8 @@ msgstr "是卡车转运"
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.tree_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.tree_cc_clearance_file_view
msgid "Is
Upload
"
msgid "Is
Sync
"
msgstr "是否已
上传
"
msgstr "是否已
同步
"
#. module: ccs_base
#. module: ccs_base
#: model:ir.model.fields,field_description:ccs_base.field_cc_package_good__item_id
#: model:ir.model.fields,field_description:ccs_base.field_cc_package_good__item_id
...
@@ -1234,7 +1234,7 @@ msgstr "否"
...
@@ -1234,7 +1234,7 @@ msgstr "否"
#: model:ir.model.fields,field_description:ccs_base.field_cc_node__name
#: model:ir.model.fields,field_description:ccs_base.field_cc_node__name
#: model:ir.model.fields,field_description:ccs_base.field_cc_node_exception_reason__name
#: model:ir.model.fields,field_description:ccs_base.field_cc_node_exception_reason__name
msgid "Name"
msgid "Name"
msgstr "
节点
名称"
msgstr "名称"
#. module: ccs_base
#. module: ccs_base
#: model:ir.model.fields,field_description:ccs_base.field_cc_package_good__item_name_cn
#: model:ir.model.fields,field_description:ccs_base.field_cc_package_good__item_name_cn
...
@@ -2208,13 +2208,13 @@ msgstr "更新小包状态"
...
@@ -2208,13 +2208,13 @@ msgstr "更新小包状态"
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.search_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.tree_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.tree_cc_clearance_file_view
msgid "
Upload
Time"
msgid "
Sync
Time"
msgstr "
上传
时间"
msgstr "
同步
时间"
#. module: ccs_base
#. module: ccs_base
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_clearance_file_view
#: model_terms:ir.ui.view,arch_db:ccs_base.form_cc_clearance_file_view
msgid "U
ploaded
"
msgid "U
nsync
"
msgstr "
已上传
"
msgstr "
未同步
"
#. module: ccs_base
#. module: ccs_base
#: model:ir.model.fields,field_description:ccs_base.field_cc_ship_package__user_track_note
#: model:ir.model.fields,field_description:ccs_base.field_cc_ship_package__user_track_note
...
...
ccs_base/models/cc_bill_loading.py
浏览文件 @
3438083d
...
@@ -417,6 +417,15 @@ class CcClearanceFile(models.Model):
...
@@ -417,6 +417,15 @@ class CcClearanceFile(models.Model):
_rec_name
=
'file_name'
_rec_name
=
'file_name'
_order
=
'upload_time desc'
_order
=
'upload_time desc'
# @api.onchange('file')
# def change_file(self):
# """
# 上传时间为
# """
# for item in self:
# if item.file:
# item.upload_time = fields.Datetime.now()
# 定义模型字段
# 定义模型字段
# 所属提单
# 所属提单
bl_id
=
fields
.
Many2one
(
'cc.bl'
,
string
=
'Bill of Loading'
)
bl_id
=
fields
.
Many2one
(
'cc.bl'
,
string
=
'Bill of Loading'
)
...
@@ -425,10 +434,10 @@ class CcClearanceFile(models.Model):
...
@@ -425,10 +434,10 @@ class CcClearanceFile(models.Model):
# 文件名
# 文件名
file_name
=
fields
.
Char
(
string
=
'File Name'
)
file_name
=
fields
.
Char
(
string
=
'File Name'
)
# 是否
上传
# 是否
同步
is_upload
=
fields
.
Boolean
(
string
=
'Is
Upload
'
,
default
=
False
)
is_upload
=
fields
.
Boolean
(
string
=
'Is
Sync
'
,
default
=
False
)
#
上传
时间
#
同步
时间
upload_time
=
fields
.
Datetime
(
string
=
'
Upload Time'
,
default
=
fields
.
Datetime
.
now
)
upload_time
=
fields
.
Datetime
(
string
=
'
Sync Time'
)
def
create_clearance_file_func
(
self
,
file_name_arr
,
bl_id
=
False
,
**
kwargs
):
def
create_clearance_file_func
(
self
,
file_name_arr
,
bl_id
=
False
,
**
kwargs
):
"""
"""
...
...
ccs_base/views/cc_clearance_file_view.xml
浏览文件 @
3438083d
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
<field
name=
"bl_id"
string=
"Bill of Loading"
invisible=
"1"
/>
<field
name=
"bl_id"
string=
"Bill of Loading"
invisible=
"1"
/>
<field
name=
"file_name"
string=
"File Name"
required=
"1"
/>
<field
name=
"file_name"
string=
"File Name"
required=
"1"
/>
<field
name=
"file"
string=
"PDF File"
required=
"1"
/>
<field
name=
"file"
string=
"PDF File"
required=
"1"
/>
<field
name=
"is_upload"
string=
"Is Upload"
readonly=
"1"
/>
<field
name=
"is_upload"
readonly=
"1"
/>
<field
name=
"upload_time"
string=
"Upload Time"
/>
<field
name=
"upload_time"
/>
<button
name=
"action_sync"
string=
"SyncTo.."
type=
"object"
icon=
"fa-upload"
/>
<button
name=
"action_sync"
string=
"SyncTo.."
type=
"object"
icon=
"fa-upload"
/>
</tree>
</tree>
</field>
</field>
...
@@ -27,14 +27,14 @@
...
@@ -27,14 +27,14 @@
<header>
<header>
</header>
</header>
<sheet>
<sheet>
<widget
name=
"web_ribbon"
title=
"U
ploaded
"
attrs=
"{'invisible': [('is_upload', '=', False)]}"
/>
<widget
name=
"web_ribbon"
title=
"U
nsync
"
attrs=
"{'invisible': [('is_upload', '=', False)]}"
/>
<group>
<group>
<group>
<group>
<field
name=
"bl_id"
string=
"Bill of Loading"
/>
<field
name=
"bl_id"
string=
"Bill of Loading"
/>
<field
name=
"file"
string=
"File"
/>
<field
name=
"file"
string=
"File"
/>
<field
name=
"file_name"
string=
"File Name"
/>
<field
name=
"file_name"
string=
"File Name"
/>
<field
name=
"is_upload"
string=
"Is Upload"
/>
<field
name=
"is_upload"
/>
<field
name=
"upload_time"
string=
"Upload Time"
/>
<field
name=
"upload_time"
/>
</group>
</group>
<group>
<group>
...
@@ -55,11 +55,11 @@
...
@@ -55,11 +55,11 @@
<field
name=
"file_name"
string=
"File Name"
/>
<field
name=
"file_name"
string=
"File Name"
/>
<field
name=
"bl_id"
string=
"Bill of Loading"
/>
<field
name=
"bl_id"
string=
"Bill of Loading"
/>
<field
name=
"file"
string=
"File"
/>
<field
name=
"file"
string=
"File"
/>
<field
name=
"is_upload"
string=
"Is Upload"
/>
<field
name=
"is_upload"
/>
<field
name=
"upload_time"
string=
"Upload Time"
/>
<field
name=
"upload_time"
/>
<separator/>
<separator/>
<filter
name=
"filter_is_upload"
string=
"Is
Upload
"
domain=
"[('is_upload','=','')]"
/>
<filter
name=
"filter_is_upload"
string=
"Is
Sync
"
domain=
"[('is_upload','=','')]"
/>
<filter
name=
"filter_upload_time"
string=
"
Upload
Time"
date=
"upload_time"
/>
<filter
name=
"filter_upload_time"
string=
"
Sync
Time"
date=
"upload_time"
/>
<separator/>
<separator/>
<group
expand=
"0"
string=
"Group By"
>
<group
expand=
"0"
string=
"Group By"
>
<filter
domain=
"[]"
name=
"groupby_bl_id"
string=
"Bill of Loading"
context=
"{'group_by': 'bl_id'}"
/>
<filter
domain=
"[]"
name=
"groupby_bl_id"
string=
"Bill of Loading"
context=
"{'group_by': 'bl_id'}"
/>
...
...
ccs_connect_tiktok/controllers/order_controller.py
浏览文件 @
3438083d
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
import
math
import
math
import
re
import
re
import
pandas
as
pd
from
odoo
import
http
,
fields
,
exceptions
from
odoo
import
http
,
fields
,
exceptions
from
odoo.http
import
request
from
odoo.http
import
request
import
logging
import
logging
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论