Skip to content

H
hh_ccs
提交 d5f56c8e authored 作者: 贺阳's avatar 贺阳
浏览文件
操作

1、小包增加显示状态变更的 时间

2、推送的日志成功的失败原因 为空 3、创建推送日志的代码增加sudo
上级 1c838c27
显示空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 20 行删除
ccs_base/views/cc_ship_package_view.xml
浏览文件 @ d5f56c8e
......@@ -7,6 +7,7 @@
<field name="arch" type="xml">
<tree string="Ship Package" decoration-warning="is_cancel==True">
<field optional="show" name="state" string="Progress" widget="badge" decoration-info="1 == 1"/>
<field optional="show" name="process_time"/>
<field optional="show" name="tracking_no" string="Tracking No."/>
<field optional="show" name="trade_no" string="Trade No"/>
<field optional="show" name="customer_id" string="From Customer"/>
......@@ -67,6 +68,7 @@
<field optional="show" name="is_cancel" string="Is Cancel"/>
<field optional="hide" name="cancel_reason" string="Cancel Reason"/>
<field optional="hide" name="next_provider_name" string="Next Provider"/>
</tree>
</field>
</record>
......@@ -92,7 +94,7 @@
<field name="big_package_id" string="Big Package"/>
<field name="bl_id" string="Bill of Loading"/>
<field name="next_provider_name" string="Next Provider Name"/>
<field name="process_time" readonly="1"/>
</group>
<group>
......
ccs_connect_tiktok/controllers/tt_controllers.py
浏览文件 @ d5f56c8e
......@@ -23,7 +23,7 @@ def check_customer(func):
def wrapper(*args, **kw):
res = {
"code": 0,
"msg": "success",
"msg": "",
"requestID": "202312251715021060522200417739B9",
"ts": "2023-12-25 17:15:03"
}
......@@ -81,14 +81,14 @@ def check_customer(func):
class TTApi(http.Controller):
@http.route('/logistics/provider/customs/package_declare', type='http', auth='public', method=["POST", "GET"],
@http.route('/logistics/provider/customs/package_declare', type='http', auth='public', methods=["POST", "GET"],
csrf=False, cors="*")
def package_declare(self, **kw):
# 接收清关包裹信息
_logger.info('/logistics/provider/customs/package_declare:%s' % kw)
res = {
"code": 0,
"msg": "success",
"msg": "",
"data": {
"all_result": True,
"failed_provider_order_ids": [],
......@@ -228,13 +228,13 @@ class TTApi(http.Controller):
return json.JSONEncoder().encode(res)
@http.route('/logistics/provider/customs/mawb_declare', type='http', auth='public',
method=["POST", "GET"], csrf=False, cors="*")
methods=["POST", "GET"], csrf=False, cors="*")
def mawb_declare(self, **kw):
# 接收提单信息、大包与小包的关联信息
_logger.info('mawb_declare kw:%s' % kw)
res = {
"code": 0,
"msg": "success",
"msg": "",
"requestID": "202312251715021060522200417739B9",
"ts": "2023-12-25 17:15:03",
}
......@@ -328,13 +328,13 @@ class TTApi(http.Controller):
return json.JSONEncoder().encode(res)
@http.route('/logistics/provider/customs/mawb_copy_upload', type='http', auth='public',
method=["POST", "GET"], csrf=False, cors="*")
methods=["POST", "GET"], csrf=False, cors="*")
def mawb_copy_upload(self, **kw):
# 接收提单的附件信息
_logger.info('mawb_copy_upload kw:%s' % kw)
res = {
"code": 0,
"msg": "success",
"msg": "",
"requestID": "202312251715021060522200417739B9",
"ts": "2023-12-25 17:15:03",
}
......@@ -392,13 +392,13 @@ class TTApi(http.Controller):
return json.JSONEncoder().encode(res)
@http.route('/logistics/provider/customs/package_cancel', type='http', auth='public',
method=["POST", "GET"], csrf=False, cors="*")
methods=["POST", "GET"], csrf=False, cors="*")
def package_cancel(self, **kw):
# 接收取消包裹
_logger.info('package_cancel kw:%s' % kw)
res = {
"code": 0,
"msg": "success",
"msg": "",
"requestID": "202312251715021060522200417739B9",
"ts": "2023-12-25 17:15:03",
}
......@@ -442,13 +442,13 @@ class TTApi(http.Controller):
return json.JSONEncoder().encode(res)
@http.route('/logistics/provider/customs/mawb_cancel', type='http', auth='public',
method=["POST", "GET"], csrf=False, cors="*")
methods=["POST", "GET"], csrf=False, cors="*")
def mawb_cancel(self, **kw):
# 接收提单取消
_logger.info('mawb_cancel kw:%s' % kw)
res = {
"code": 0,
"msg": "success",
"msg": "",
"requestID": "202312251715021060522200417739B9",
"ts": "2023-12-25 17:15:03",
}
......
ccs_connect_tiktok/models/cc_bill_loading.py
浏览文件 @ d5f56c8e
......@@ -67,7 +67,7 @@ class CcClearanceFile(models.Model):
error_msg = response_data['msg']
request_id = response_data['requestID']
code = response_data['code']
self.env['ao.tt.api.log'].create_api_log(self.file_name or '', '清关文件回传:' + error_msg, '', code,
self.env['ao.tt.api.log'].sudo().create_api_log(self.file_name or '', '清关文件回传:' + error_msg, '', code,
request_id, source='推出')
return error_msg
else:
......@@ -75,7 +75,7 @@ class CcClearanceFile(models.Model):
self.is_upload = True
self.upload_time = datetime.now()
request_id = response_data['requestID']
self.env['ao.tt.api.log'].create_api_log(self.file_name or '', '', '', 0, request_id, source='推出')
self.env['ao.tt.api.log'].sudo().create_api_log(self.file_name or '', '', '', 0, request_id, source='推出')
return ''
# 重载action_upload方法
......@@ -140,7 +140,7 @@ class CcShipPackage(models.Model):
def action_sync(self):
for record in self:
record.is_sync = True
self.env['cc.ship.package.sync.log'].create_sync_log(record.id, 'Tiktok', record.state.tk_code,
self.env['cc.ship.package.sync.log'].sudo().create_sync_log(record.id, 'Tiktok', record.state.tk_code,
record.state_explain,
record.process_time.strftime('%Y-%m-%d %H:%M:%S'))
......@@ -176,18 +176,18 @@ class CcShipPackage(models.Model):
error_msg = response_data['msg']
request_id = response_data['requestID']
code = response_data['code']
self.env['ao.tt.api.log'].create_api_log(self.tracking_no or '', '小包状态轨迹回传:' + error_msg, '',
self.env['ao.tt.api.log'].sudo().create_api_log(self.tracking_no or '', '小包状态轨迹回传:' + error_msg, '',
code,
request_id, source='推出')
return error_msg
else:
# 清关文件回传成功
self.is_sync = True
self.env['cc.ship.package.sync.log'].create_sync_log(self.id, 'Tiktok', self.state.tk_code,
self.env['cc.ship.package.sync.log'].sudo().create_sync_log(self.id, 'Tiktok', self.state.tk_code,
self.state_explain,
self.process_time.strftime('%Y-%m-%d %H:%M:%S'))
request_id = response_data['requestID']
self.env['ao.tt.api.log'].create_api_log(self.tracking_no or '', '', '', 0, request_id, source='推出')
self.env['ao.tt.api.log'].sudo().create_api_log(self.tracking_no or '', '', '', 0, request_id, source='推出')
return ''
......
ccs_connect_tiktok/security/ir.model.access.csv
浏览文件 @ d5f56c8e
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_group_user_ao_tt_api,access_group_user_ao_tt_api,ccs_connect_tiktok.model_ao_tt_api,base.group_user,1,0,0,0
access_ao_tt_api_log,ao_tt_api_log,model_ao_tt_api_log,base.group_system,1,1,1,1
access_cc_ship_package_sync_log_base.group_user,cc_ship_package_sync_log base.group_user,ccs_connect_tiktok.model_cc_ship_package_sync_log,base.group_user,1,0,0,0
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论