Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
H
hh_ccs
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
贺阳
hh_ccs
Commits
76921d8f
提交
76921d8f
authored
9月 12, 2025
作者:
贺阳
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
托盘增加托盘使用日期。已使用的时候进行回写。接口返回
上级
3f74d1ca
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
34 行增加
和
36 行删除
+34
-36
cc_pallet.py
ccs_connect_tiktok/models/cc_pallet.py
+16
-16
zh_CN.po
ccs_pallet/i18n/zh_CN.po
+12
-16
cc_pallet.py
ccs_pallet/models/cc_pallet.py
+2
-2
cc_pallet_view.xml
ccs_pallet/views/cc_pallet_view.xml
+2
-0
associate_pallet_wizard.py
ccs_pallet/wizard/associate_pallet_wizard.py
+2
-2
没有找到文件。
ccs_connect_tiktok/models/cc_pallet.py
浏览文件 @
76921d8f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
# 导入日志
# 导入日志
import
logging
import
logging
from
odoo
import
models
,
fields
,
api
,
_
from
odoo
import
models
# 获取日志
# 获取日志
_logger
=
logging
.
getLogger
(
__name__
)
_logger
=
logging
.
getLogger
(
__name__
)
...
@@ -14,20 +14,21 @@ class CcPallet(models.Model):
...
@@ -14,20 +14,21 @@ class CcPallet(models.Model):
_inherit
=
'cc.pallet'
_inherit
=
'cc.pallet'
# 模型描述
# 模型描述
_description
=
'Pallet'
_description
=
'Pallet'
def
search_pallet_info
(
self
):
def
search_pallet_info
(
self
):
"""搜索托盘信息"""
"""搜索托盘信息"""
return
{
return
{
'id'
:
self
.
id
,
#托盘id
'id'
:
self
.
id
,
# 托盘id
'name'
:
self
.
name
,
#托盘号
'name'
:
self
.
name
,
# 托盘号
'express_company_id'
:
self
.
express_company_id
.
id
,
#快递公司id
'express_company_id'
:
self
.
express_company_id
.
id
,
# 快递公司id
'express_company_name'
:
self
.
express_company_id
.
name
,
#快递公司名称
'express_company_name'
:
self
.
express_company_id
.
name
,
# 快递公司名称
'usage_state'
:
self
.
usage_state
,
#使用状态 unused未使用 used已使用
'usage_state'
:
self
.
usage_state
,
# 使用状态 unused未使用 used已使用
'print_state'
:
self
.
print_state
,
#打印状态 unprinted未打印 printed已打印
'usage_date'
:
str
(
self
.
usage_date
)
if
self
.
usage_date
else
''
,
# 使用日期
'sorting_time'
:
str
(
self
.
sorting_time
)
if
self
.
sorting_time
else
''
,
#托盘理货时间
'print_state'
:
self
.
print_state
,
# 打印状态 unprinted未打印 printed已打印
'delivery_time'
:
str
(
self
.
delivery_time
)
if
self
.
delivery_time
else
''
,
#托盘交货时间
'sorting_time'
:
str
(
self
.
sorting_time
)
if
self
.
sorting_time
else
''
,
# 托盘理货时间
'package_count'
:
self
.
package_count
,
#大包数量
'delivery_time'
:
str
(
self
.
delivery_time
)
if
self
.
delivery_time
else
''
,
# 托盘交货时间
'partner_id'
:
self
.
partner_id
.
id
,
#使用客户id
'package_count'
:
self
.
package_count
,
# 大包数量
'partner_name'
:
self
.
partner_id
.
name
,
#使用客户名称
'partner_id'
:
self
.
partner_id
.
id
,
# 使用客户id
'delivery_plate_number'
:
self
.
delivery_plate_number
or
''
,
#托盘交付车牌号
'partner_name'
:
self
.
partner_id
.
name
,
# 使用客户名称
}
'delivery_plate_number'
:
self
.
delivery_plate_number
or
''
,
# 托盘交付车牌号
\ No newline at end of file
}
ccs_pallet/i18n/zh_CN.po
浏览文件 @
76921d8f
...
@@ -6,8 +6,8 @@ msgid ""
...
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-09-12 0
3:26
+0000\n"
"POT-Creation-Date: 2025-09-12 0
8:55
+0000\n"
"PO-Revision-Date: 2025-09-12 1
1:31
+0800\n"
"PO-Revision-Date: 2025-09-12 1
6:56
+0800\n"
"Last-Translator: \n"
"Last-Translator: \n"
"Language-Team: \n"
"Language-Team: \n"
"Language: zh_CN\n"
"Language: zh_CN\n"
...
@@ -22,7 +22,7 @@ msgstr ""
...
@@ -22,7 +22,7 @@ msgstr ""
#: code:addons/ccs_pallet/wizard/associate_pallet_wizard.py:0
#: code:addons/ccs_pallet/wizard/associate_pallet_wizard.py:0
#, python-format
#, python-format
msgid "%s The package does not exist, please check the input information!"
msgid "%s The package does not exist, please check the input information!"
msgstr ""
msgstr "
%s 不存在该大包,请检查输入信息!
"
#. module: ccs_pallet
#. module: ccs_pallet
#. odoo-python
#. odoo-python
...
@@ -45,7 +45,7 @@ msgstr "%s %s关联了托盘%s,托盘使用日期为%s"
...
@@ -45,7 +45,7 @@ msgstr "%s %s关联了托盘%s,托盘使用日期为%s"
msgid ""
msgid ""
"%s at %s changed the pallet number from %s to %s, and the pallet usage date "
"%s at %s changed the pallet number from %s to %s, and the pallet usage date "
"from %s to %s"
"from %s to %s"
msgstr "%s
处的%s将托盘编号从%s改为%s,将托盘使用日期从%s改为%s。
"
msgstr "%s
%s更改了托盘号,由%s变更为%s,托盘使用日期%s变更为%s
"
#. module: ccs_pallet
#. module: ccs_pallet
#: model:ir.model.fields,field_description:ccs_pallet.field_cc_pallet__message_needaction
#: model:ir.model.fields,field_description:ccs_pallet.field_cc_pallet__message_needaction
...
@@ -120,15 +120,6 @@ msgstr "批量创建托盘"
...
@@ -120,15 +120,6 @@ msgstr "批量创建托盘"
msgid "Big Package"
msgid "Big Package"
msgstr "大包"
msgstr "大包"
#. module: ccs_pallet
#. odoo-python
#: code:addons/ccs_pallet/models/cc_pallet.py:0
#, python-format
msgid ""
"Big Package No :%s ,The same bill of lading, same pallet number, and usage "
"date must be consistent!"
msgstr "大包号:%s ,同一提单、同一托盘号的使用日期必须一致!"
#. module: ccs_pallet
#. module: ccs_pallet
#: model_terms:ir.ui.view,arch_db:ccs_pallet.view_pallet_batch_wizard_form
#: model_terms:ir.ui.view,arch_db:ccs_pallet.view_pallet_batch_wizard_form
#: model_terms:ir.ui.view,arch_db:ccs_pallet.view_pallet_print_wizard_form
#: model_terms:ir.ui.view,arch_db:ccs_pallet.view_pallet_print_wizard_form
...
@@ -608,9 +599,9 @@ msgstr ""
...
@@ -608,9 +599,9 @@ msgstr ""
#: code:addons/ccs_pallet/wizard/associate_pallet_wizard.py:0
#: code:addons/ccs_pallet/wizard/associate_pallet_wizard.py:0
#, python-format
#, python-format
msgid ""
msgid ""
"The
next level service provider of the package 【%s】 is not the same as
"
"The
last mile carrier of package 【%s】 does not match the last mile
"
"
the next level service provider of the pallet
!"
"
carrier of the pallet. Please check and retry
!"
msgstr "大包号【%s】的
下一级服务商必须与托盘的下一级服务商一致
"
msgstr "大包号【%s】的
尾程快递与托盘归属的尾程快递不一致!
"
#. module: ccs_pallet
#. module: ccs_pallet
#. odoo-python
#. odoo-python
...
@@ -642,6 +633,11 @@ msgstr "未打印"
...
@@ -642,6 +633,11 @@ msgstr "未打印"
msgid "Unused"
msgid "Unused"
msgstr "未使用"
msgstr "未使用"
#. module: ccs_pallet
#: model:ir.model.fields,field_description:ccs_pallet.field_cc_pallet__usage_date
msgid "Usage Date"
msgstr "托盘使用日期"
#. module: ccs_pallet
#. module: ccs_pallet
#. odoo-python
#. odoo-python
#: code:addons/ccs_pallet/models/cc_pallet.py:0
#: code:addons/ccs_pallet/models/cc_pallet.py:0
...
...
ccs_pallet/models/cc_pallet.py
浏览文件 @
76921d8f
...
@@ -7,7 +7,6 @@ from odoo import models, fields, api, _
...
@@ -7,7 +7,6 @@ from odoo import models, fields, api, _
# 获取日志
# 获取日志
_logger
=
logging
.
getLogger
(
__name__
)
_logger
=
logging
.
getLogger
(
__name__
)
from
odoo.exceptions
import
ValidationError
class
CcPallet
(
models
.
Model
):
class
CcPallet
(
models
.
Model
):
...
@@ -81,7 +80,7 @@ class CcPallet(models.Model):
...
@@ -81,7 +80,7 @@ class CcPallet(models.Model):
# 使用状态
# 使用状态
usage_state
=
fields
.
Selection
([(
'unused'
,
_
(
'Unused'
)),
(
'used'
,
_
(
'Used'
))],
string
=
_
(
'Usage State'
),
usage_state
=
fields
.
Selection
([(
'unused'
,
_
(
'Unused'
)),
(
'used'
,
_
(
'Used'
))],
string
=
_
(
'Usage State'
),
default
=
'unused'
,
index
=
True
,
tracking
=
True
)
default
=
'unused'
,
index
=
True
,
tracking
=
True
)
usage_date
=
fields
.
Date
(
string
=
'Usage Date'
,
index
=
True
)
# 打印状态
# 打印状态
print_state
=
fields
.
Selection
([(
'unprinted'
,
_
(
'Unprinted'
)),
(
'printed'
,
_
(
'Printed'
))],
string
=
_
(
'Print State'
),
print_state
=
fields
.
Selection
([(
'unprinted'
,
_
(
'Unprinted'
)),
(
'printed'
,
_
(
'Printed'
))],
string
=
_
(
'Print State'
),
default
=
'unprinted'
,
index
=
True
,
tracking
=
True
)
default
=
'unprinted'
,
index
=
True
,
tracking
=
True
)
...
@@ -115,6 +114,7 @@ class CcPallet(models.Model):
...
@@ -115,6 +114,7 @@ class CcPallet(models.Model):
"""更新托盘使用状态"""
"""更新托盘使用状态"""
for
pallet
in
self
:
for
pallet
in
self
:
pallet
.
usage_state
=
'used'
pallet
.
usage_state
=
'used'
pallet
.
usage_date
=
usage_date
# 关联大包到托盘
# 关联大包到托盘
pallet
.
package_ids
=
[(
4
,
package_id
.
id
,
0
)
for
package_id
in
success_package
]
pallet
.
package_ids
=
[(
4
,
package_id
.
id
,
0
)
for
package_id
in
success_package
]
# 更新大包的托盘信息
# 更新大包的托盘信息
...
...
ccs_pallet/views/cc_pallet_view.xml
浏览文件 @
76921d8f
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
</group>
</group>
<group
string=
"Status Information"
>
<group
string=
"Status Information"
>
<field
name=
"print_state"
readonly=
"1"
/>
<field
name=
"print_state"
readonly=
"1"
/>
<field
name=
"usage_date"
readonly=
"1"
/>
<field
name=
"sorting_time"
readonly=
"1"
/>
<field
name=
"sorting_time"
readonly=
"1"
/>
<field
name=
"delivery_time"
readonly=
"1"
/>
<field
name=
"delivery_time"
readonly=
"1"
/>
</group>
</group>
...
@@ -62,6 +63,7 @@
...
@@ -62,6 +63,7 @@
<field
name=
"sorting_time"
/>
<field
name=
"sorting_time"
/>
<field
name=
"delivery_time"
/>
<field
name=
"delivery_time"
/>
<field
name=
"package_count"
/>
<field
name=
"package_count"
/>
<field
name=
"usage_date"
/>
<field
name=
"delivery_plate_number"
/>
<field
name=
"delivery_plate_number"
/>
<field
name=
"create_uid"
string=
"Create By"
/>
<field
name=
"create_uid"
string=
"Create By"
/>
<field
name=
"create_date"
string=
"Create Date"
/>
<field
name=
"create_date"
string=
"Create Date"
/>
...
...
ccs_pallet/wizard/associate_pallet_wizard.py
浏览文件 @
76921d8f
...
@@ -42,8 +42,8 @@ class AssociatePalletWizard(models.TransientModel):
...
@@ -42,8 +42,8 @@ class AssociatePalletWizard(models.TransientModel):
if
not
provider
:
if
not
provider
:
error_package
.
append
(
package
.
big_package_no
)
error_package
.
append
(
package
.
big_package_no
)
if
error_package
:
if
error_package
:
raise
ValidationError
(
_
(
'The
next level service provider of the package 【
%
s】 is not the same as the next level service provider of the pallet
!'
)
%
(
raise
ValidationError
(
_
(
'The
last mile carrier of package 【
%
s】 does not match the last mile carrier of the pallet. Please check and retry
!'
)
%
(
'、'
.
join
(
error_package
)))
#大包号
[xxx]的下一级服务商必须与托盘的下一级服务商
一致
'、'
.
join
(
error_package
)))
#大包号
XXXXXX的尾程快递与托盘归属的尾程快递不
一致
# 更新托盘的使用状态(理货时间和交货时间会自动通过计算字段更新)
# 更新托盘的使用状态(理货时间和交货时间会自动通过计算字段更新)
record
.
pallet_id
.
update_usage_state
(
success_package
,
record
.
usage_date
)
record
.
pallet_id
.
update_usage_state
(
success_package
,
record
.
usage_date
)
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论