提交 ce0cffe3 authored 作者: 郑笛's avatar 郑笛

增加一键全扫完成时间配置

上级 07d7a530
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
import logging import logging
from odoo import api, fields, models, _ from odoo import api, fields, models, _
from odoo.exceptions import ValidationError
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
...@@ -11,6 +12,7 @@ class ResConfigSettings(models.TransientModel): ...@@ -11,6 +12,7 @@ class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings' _inherit = 'res.config.settings'
before_min = fields.Integer('清关时间取值(早于清关结束)') before_min = fields.Integer('清关时间取值(早于清关结束)')
package_scan_min = fields.Integer('一键全扫完成时间(min)', help='输入示范:10,即表示在10分钟内大包时间随机分配,并不能重复')
@api.model @api.model
def get_values(self): def get_values(self):
...@@ -21,9 +23,11 @@ class ResConfigSettings(models.TransientModel): ...@@ -21,9 +23,11 @@ class ResConfigSettings(models.TransientModel):
values = super(ResConfigSettings, self).get_values() values = super(ResConfigSettings, self).get_values()
config = self.env['ir.config_parameter'].sudo() config = self.env['ir.config_parameter'].sudo()
before_min = config.get_param('before_min', default=10) before_min = config.get_param('before_min', default=10)
package_scan_min = config.get_param('package_scan_min', default=10)
values.update( values.update(
before_min=before_min, before_min=before_min,
package_scan_min=package_scan_min,
) )
return values return values
...@@ -31,3 +35,4 @@ class ResConfigSettings(models.TransientModel): ...@@ -31,3 +35,4 @@ class ResConfigSettings(models.TransientModel):
super(ResConfigSettings, self).set_values() super(ResConfigSettings, self).set_values()
ir_config = self.env['ir.config_parameter'].sudo() ir_config = self.env['ir.config_parameter'].sudo()
ir_config.set_param("before_min", self.before_min or 10) ir_config.set_param("before_min", self.before_min or 10)
ir_config.set_param("package_scan_min", self.package_scan_min or 10)
...@@ -21,6 +21,20 @@ ...@@ -21,6 +21,20 @@
</div> </div>
</div> </div>
</div> </div>
<div>
<h2>pda扫码配置</h2>
<div class="row mt16 o_settings_container" id="pda_scan">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<div class="text-muted">
<label for="package_scan_min"/>
<field name="package_scan_min"/>
</div>
</div>
</div>
</div>
</div>
</xpath> </xpath>
</field> </field>
</record> </record>
......
...@@ -89,6 +89,7 @@ class OrderController(http.Controller): ...@@ -89,6 +89,7 @@ class OrderController(http.Controller):
if bl_obj: if bl_obj:
if bl_obj.state in state_arr: if bl_obj.state in state_arr:
res['bl_info'] = bl_obj.search_bl_info(pda_lang=pda_lang, type=action_type) res['bl_info'] = bl_obj.search_bl_info(pda_lang=pda_lang, type=action_type)
res['package_scan_min'] = int(request.env['res.config.settings'].sudo().get_values().get('package_scan_min'))
res['state'] = 200 res['state'] = 200
else: else:
res['message'] = bill_state_msg_dic[pda_lang] # 没有在系统中找到未完成清关的该提单信息 res['message'] = bill_state_msg_dic[pda_lang] # 没有在系统中找到未完成清关的该提单信息
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论