jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #152: (feature/修正关系bug -> develop)

Browse Source 
Merge Request: 修正关系bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/152?initial=true
This commit is contained in:
马广威
2023-03-16 11:39:15 +08:00
parent 1d9e64e5e2 4b82d20f18
commit 9e5f70c988
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_machine_connect/models/ftp_client.py
View File

@@ -366,7 +366,7 @@ class CuttingTimeToolType(models.Model):
predict_life_time = fields.Char(string='预估寿命') predict_life_time = fields.Char(string='预估寿命')
# 只能看到未被占用的刀位，或者有提示说占没占用 # 只能看到未被占用的刀位，或者有提示说占没占用
tool_position = fields.Char(string='选择刀位') tool_position = fields.Char(string='选择刀位')
cnc_ids = fields.One2many(string='选择机床') # cnc_ids = fields.One2many(string='选择机床')
is_connect_tool_position = fields.Boolean(string='是否已绑定刀位', default=False) is_connect_tool_position = fields.Boolean(string='是否已绑定刀位', default=False)
def tool_connect_machine(self): def tool_connect_machine(self):