Accept Merge Request #1072: (release/release_1.5 -> develop)
Merge Request: 添加刀具按批次管理 Created By: @禹翔辉 Reviewed By: @马广威 Approved By: @马广威 Accepted By: @马广威 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1072
This commit is contained in:
@@ -26,6 +26,7 @@ class ResConfigSettings(models.TransientModel):
|
||||
ftp_port = fields.Char(string='FTP端口')
|
||||
ftp_user = fields.Char(string='FTP用户')
|
||||
ftp_password = fields.Char(string='FTP密码')
|
||||
enable_tool_presetter = fields.Boolean('是否启用刀具预调仪', default=True)
|
||||
|
||||
def sf_all_sync(self):
|
||||
try:
|
||||
@@ -108,6 +109,7 @@ class ResConfigSettings(models.TransientModel):
|
||||
ftp_port = config.get_param('ftp_port', default='')
|
||||
ftp_user = config.get_param('ftp_user', default='')
|
||||
ftp_password = config.get_param('ftp_password', default='')
|
||||
enable_tool_presetter = config.get_param('enable_tool_presetter', default='')
|
||||
|
||||
values.update(
|
||||
token=token,
|
||||
@@ -121,7 +123,8 @@ class ResConfigSettings(models.TransientModel):
|
||||
ftp_host=ftp_host,
|
||||
ftp_port=ftp_port,
|
||||
ftp_user=ftp_user,
|
||||
ftp_password=ftp_password
|
||||
ftp_password=ftp_password,
|
||||
enable_tool_presetter=enable_tool_presetter
|
||||
)
|
||||
return values
|
||||
|
||||
@@ -140,3 +143,4 @@ class ResConfigSettings(models.TransientModel):
|
||||
ir_config.set_param("ftp_port", self.ftp_port or "")
|
||||
ir_config.set_param("ftp_user", self.ftp_user or "")
|
||||
ir_config.set_param("ftp_password", self.ftp_password or "")
|
||||
ir_config.set_param("enable_tool_presetter", self.enable_tool_presetter or False)
|
||||
|
||||
Reference in New Issue
Block a user