Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复
This commit is contained in:
@@ -1187,7 +1187,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
# 功能刀具类型
|
||||
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
|
||||
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
|
||||
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
|
||||
# # 刀具型号
|
||||
# "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
|
||||
@@ -1222,7 +1222,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
# 功能刀具类型
|
||||
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
|
||||
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
|
||||
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
|
||||
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
|
||||
item['mrs_cutting_tool_integral_model_ids']),
|
||||
@@ -1279,7 +1279,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
# 功能刀具类型
|
||||
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
|
||||
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
|
||||
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
|
||||
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
|
||||
item['mrs_cutting_tool_integral_model_ids']),
|
||||
@@ -1311,7 +1311,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
# 功能刀具类型
|
||||
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
|
||||
"mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
|
||||
[('code', '=', item['mrs_cutting_tool_type_id'])]).id,
|
||||
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
|
||||
item['mrs_cutting_tool_integral_model_ids']),
|
||||
|
||||
Reference in New Issue
Block a user