Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
This commit is contained in:
jinling.yang
@@ -51,6 +51,11 @@ class ResConfigSettings(models.TransientModel):
|
||||
_logger.info("定时同步每日整体式刀具类型列表...")
|
||||
# self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool()
|
||||
_logger.info("同步整体式刀具类型完成")
|
||||
_logger.info("同步每日刀具物料...")
|
||||
self.env['sf.cutting.tool.material'].sync_cutting_tool_material()
|
||||
_logger.info("同步每日刀具物料完成")
|
||||
_logger.info("同步所有刀具物料...")
|
||||
self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
|
||||
_logger.info("同步每日刀片类型列表...")
|
||||
self.env['sf.blade.model'].sync_blade_model()
|
||||
_logger.info("同步每日刀片类型完成")
|
||||
@@ -130,14 +135,14 @@ class ResConfigSettings(models.TransientModel):
|
||||
self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
|
||||
_logger.info("同步所有功能刀具列表完成")
|
||||
|
||||
self.env['sf.fixture.clamping.element'].sync_all_fixture_clamping_element()
|
||||
_logger.info("同步资源库夹紧元件型号")
|
||||
self.env['sf.clamping.element.type'].sync_all_clamping_element_type()
|
||||
_logger.info("同步资源库夹紧元件类型")
|
||||
self.env['sf.guide.element.type'].sync_all_guide_element_type()
|
||||
_logger.info("同步资源库导向元件类型")
|
||||
self.env['sf.guide.element.guide.mode'].sync_all_guide_element_guide_mode()
|
||||
_logger.info("同步资源库导向元件导向方式")
|
||||
# self.env['sf.fixture.clamping.element'].sync_all_fixture_clamping_element()
|
||||
# _logger.info("同步资源库夹紧元件型号")
|
||||
# self.env['sf.clamping.element.type'].sync_all_clamping_element_type()
|
||||
# _logger.info("同步资源库夹紧元件类型")
|
||||
# self.env['sf.guide.element.type'].sync_all_guide_element_type()
|
||||
# _logger.info("同步资源库导向元件类型")
|
||||
# self.env['sf.guide.element.guide.mode'].sync_all_guide_element_guide_mode()
|
||||
# _logger.info("同步资源库导向元件导向方式")
|
||||
|
||||
except Exception as e:
|
||||
_logger.info("捕获错误信息:%s" % e)
|
||||
|
||||
@@ -726,7 +726,7 @@ class MachineToolType(models.Model):
|
||||
[('code', '=', item['machine_tool_id'])]).id
|
||||
|
||||
else:
|
||||
print(item['machine_tool_picture'].encode('utf-8'))
|
||||
# print(item['machine_tool_picture'].encode('utf-8'))
|
||||
self.env['sf.machine_tool.type'].create({
|
||||
"id": item['id'],
|
||||
"name": item['name'],
|
||||
@@ -1075,6 +1075,78 @@ class MachineToolCategory(models.Model):
|
||||
raise ValidationError("认证未通过")
|
||||
|
||||
|
||||
# 同步刀具物料
|
||||
class sfSyncCutting_tool_Material(models.Model):
|
||||
_inherit = 'sf.cutting.tool.material'
|
||||
_description = '刀具物料同步'
|
||||
|
||||
url = '/api/mrs_cutting_tool_material/list'
|
||||
|
||||
# 定时同步每日刀具物料
|
||||
def sync_cutting_tool_material(self):
|
||||
sf_sync_config = self.env['res.config.settings'].get_values()
|
||||
token = sf_sync_config['token']
|
||||
sf_secret_key = sf_sync_config['sf_secret_key']
|
||||
headers = Common.get_headers(self, token, sf_secret_key)
|
||||
|
||||
strUrl = sf_sync_config['sf_url'] + self.url
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutting_tool_material_yesterday_list'):
|
||||
for item in result['mrs_cutting_tool_material_yesterday_list']:
|
||||
if item:
|
||||
brand = self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['code'])])
|
||||
if not brand:
|
||||
self.env['sf.cutting.tool.material'].create({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
})
|
||||
else:
|
||||
raise ValidationError("认证未通过")
|
||||
|
||||
# 同步所有刀具物料
|
||||
def sync_all_cutting_tool_material(self):
|
||||
sf_sync_config = self.env['res.config.settings'].get_values()
|
||||
token = sf_sync_config['token']
|
||||
sf_secret_key = sf_sync_config['sf_secret_key']
|
||||
headers = Common.get_headers(self, token, sf_secret_key)
|
||||
|
||||
strUrl = sf_sync_config['sf_url'] + self.url
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutting_tool_material_all_list'):
|
||||
for item in result['mrs_cutting_tool_material_all_list']:
|
||||
if item:
|
||||
brand = self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['code'])])
|
||||
if not brand:
|
||||
self.env['sf.cutting.tool.material'].create({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
})
|
||||
|
||||
|
||||
# 同步功能刀具列表
|
||||
class sfSyncFunctional_cutting_tool(models.Model):
|
||||
_inherit = 'sf.functional.cutting.tool'
|
||||
@@ -1092,7 +1164,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_functional_cutting_tool_yesterday_list'):
|
||||
for item in result['mrs_functional_cutting_tool_yesterday_list']:
|
||||
@@ -1300,7 +1372,7 @@ class SyncFunctionalCuttingToolModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_functional_cutting_tool_model_yesterday_list'):
|
||||
for item in result['mrs_functional_cutting_tool_model_yesterday_list']:
|
||||
@@ -1333,7 +1405,7 @@ class SyncFunctionalCuttingToolModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_functional_cutting_tool_model_all_list'):
|
||||
for item in result['mrs_functional_cutting_tool_model_all_list']:
|
||||
@@ -1374,7 +1446,7 @@ class SyncIntegralCuttingTool(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_integral_cutting_tool_yesterday_list'):
|
||||
for item in result['mrs_integral_cutting_tool_yesterday_list']:
|
||||
@@ -1399,6 +1471,8 @@ class SyncIntegralCuttingTool(models.Model):
|
||||
[("code", '=', item['integral_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"total_length": item['total_length'],
|
||||
"shank_length": item['shank_length'],
|
||||
"blade_length": item['blade_length'],
|
||||
@@ -1422,6 +1496,8 @@ class SyncIntegralCuttingTool(models.Model):
|
||||
[("code", '=', item['integral_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"total_length": item['total_length'],
|
||||
"shank_length": item['shank_length'],
|
||||
"blade_length": item['blade_length'],
|
||||
@@ -1451,7 +1527,7 @@ class SyncIntegralCuttingTool(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_integral_cutting_tool_all_list'):
|
||||
for item in result['mrs_integral_cutting_tool_all_list']:
|
||||
@@ -1476,6 +1552,8 @@ class SyncIntegralCuttingTool(models.Model):
|
||||
[("code", '=', item['integral_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"total_length": item['total_length'],
|
||||
"shank_length": item['shank_length'],
|
||||
"blade_length": item['blade_length'],
|
||||
@@ -1499,6 +1577,8 @@ class SyncIntegralCuttingTool(models.Model):
|
||||
[("code", '=', item['integral_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"total_length": item['total_length'],
|
||||
"shank_length": item['shank_length'],
|
||||
"blade_length": item['blade_length'],
|
||||
@@ -1536,7 +1616,7 @@ class SyncIntegralCuttingToolModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_integral_cutting_tool_model_list'):
|
||||
for item in result['mrs_integral_cutting_tool_model_list']:
|
||||
@@ -1548,6 +1628,16 @@ class SyncIntegralCuttingToolModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
raise ValidationError("认证未通过")
|
||||
@@ -1563,7 +1653,7 @@ class SyncIntegralCuttingToolModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_integral_cutting_tool_model_all_list'):
|
||||
for item in result['mrs_integral_cutting_tool_model_all_list']:
|
||||
@@ -1575,6 +1665,16 @@ class SyncIntegralCuttingToolModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
raise ValidationError("认证未通过")
|
||||
@@ -1597,10 +1697,20 @@ class SyncBlade(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_blade_yesterday_list'):
|
||||
for item in result['mrs_blade_yesterday_list']:
|
||||
bar_list = []
|
||||
pad_list = []
|
||||
if item.get('cutter_bar'):
|
||||
for i in item.get('cutter_bar'):
|
||||
bar_list.append(self.env['sf.cutter.bar'].search(
|
||||
[("code", '=', i)]).id)
|
||||
if item.get('cutter_pad'):
|
||||
for j in item.get('cutter_pad'):
|
||||
pad_list.append(self.env['sf.cutter.pad'].search(
|
||||
[("code", '=', j)]).id)
|
||||
if item:
|
||||
# code, name, blade_model_number, brand, length, width, height, top_angle, front_angle, rear_angle, main_included_angle, r_angle, material_model, hardness, nut, cutter_bar, cutter_pad, radius, image, create_uid, create_date
|
||||
brand = self.env['sf.blade'].search(
|
||||
@@ -1617,6 +1727,8 @@ class SyncBlade(models.Model):
|
||||
[("code", '=', item['blade_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
@@ -1629,8 +1741,8 @@ class SyncBlade(models.Model):
|
||||
[("materials_no", '=', item['material_model'])]).id,
|
||||
"hardness": item['hardness'],
|
||||
"nut": item['nut'],
|
||||
"cutter_bar": item['cutter_bar'],
|
||||
"cutter_pad": item['cutter_pad'],
|
||||
"cutter_bar": bar_list,
|
||||
"cutter_pad": pad_list,
|
||||
"radius": item['radius'],
|
||||
"image": image,
|
||||
})
|
||||
@@ -1641,6 +1753,8 @@ class SyncBlade(models.Model):
|
||||
[("code", '=', item['blade_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
@@ -1653,8 +1767,8 @@ class SyncBlade(models.Model):
|
||||
[("materials_no", '=', item['material_model'])]).id,
|
||||
"hardness": item['hardness'],
|
||||
"nut": item['nut'],
|
||||
"cutter_bar": item['cutter_bar'],
|
||||
"cutter_pad": item['cutter_pad'],
|
||||
"cutter_bar": bar_list,
|
||||
"cutter_pad": pad_list,
|
||||
"radius": item['radius'],
|
||||
"image": image,
|
||||
})
|
||||
@@ -1676,7 +1790,16 @@ class SyncBlade(models.Model):
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_blade_all_list'):
|
||||
for item in result['mrs_blade_all_list']:
|
||||
# print('item_image:%s' % item['image'].encode('utf-8)
|
||||
bar_list = []
|
||||
pad_list = []
|
||||
if item.get('cutter_bar'):
|
||||
for i in item.get('cutter_bar'):
|
||||
bar_list.append(self.env['sf.cutter.bar'].search(
|
||||
[("code", '=', i)]).id)
|
||||
if item.get('cutter_pad'):
|
||||
for j in item.get('cutter_pad'):
|
||||
pad_list.append(self.env['sf.cutter.pad'].search(
|
||||
[("code", '=', j)]).id)
|
||||
|
||||
if item:
|
||||
brand = self.env['sf.blade'].search(
|
||||
@@ -1693,6 +1816,8 @@ class SyncBlade(models.Model):
|
||||
[("code", '=', item['blade_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
@@ -1705,8 +1830,8 @@ class SyncBlade(models.Model):
|
||||
[("materials_no", '=', item['material_model'])]).id,
|
||||
"hardness": item['hardness'],
|
||||
"nut": item['nut'],
|
||||
"cutter_bar": item['cutter_bar'],
|
||||
"cutter_pad": item['cutter_pad'],
|
||||
"cutter_bar": bar_list,
|
||||
"cutter_pad": pad_list,
|
||||
"radius": item['radius'],
|
||||
"image": image,
|
||||
})
|
||||
@@ -1717,6 +1842,8 @@ class SyncBlade(models.Model):
|
||||
[("code", '=', item['blade_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"width": item['width'],
|
||||
"height": item['height'],
|
||||
@@ -1729,8 +1856,8 @@ class SyncBlade(models.Model):
|
||||
[("materials_no", '=', item['material_model'])]).id,
|
||||
"hardness": item['hardness'],
|
||||
"nut": item['nut'],
|
||||
"cutter_bar": item['cutter_bar'],
|
||||
"cutter_pad": item['cutter_pad'],
|
||||
"cutter_bar": bar_list,
|
||||
"cutter_pad": pad_list,
|
||||
"radius": item['radius'],
|
||||
"image": image,
|
||||
})
|
||||
@@ -1756,7 +1883,7 @@ class SyncBladeModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_blade_model_yesterday_list'):
|
||||
for item in result['mrs_blade_model_yesterday_list']:
|
||||
@@ -1768,12 +1895,16 @@ class SyncBladeModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步每日刀片类型列表成功')
|
||||
else:
|
||||
@@ -1790,7 +1921,7 @@ class SyncBladeModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_blade_model_all_list'):
|
||||
for item in result['mrs_blade_model_all_list']:
|
||||
@@ -1802,12 +1933,16 @@ class SyncBladeModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步刀片类型列表成功')
|
||||
else:
|
||||
@@ -1832,7 +1967,7 @@ class SyncCutterBar(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_bar_yesterday_list'):
|
||||
for item in result['mrs_cutter_bar_yesterday_list']:
|
||||
@@ -1857,6 +1992,8 @@ class SyncCutterBar(models.Model):
|
||||
[("code", '=', item['cutter_bar_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -1880,6 +2017,8 @@ class SyncCutterBar(models.Model):
|
||||
[("code", '=', item['cutter_bar_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -1910,7 +2049,7 @@ class SyncCutterBar(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_bar_all_list'):
|
||||
for item in result['mrs_cutter_bar_all_list']:
|
||||
@@ -1935,6 +2074,8 @@ class SyncCutterBar(models.Model):
|
||||
[("code", '=', item['cutter_bar_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -1958,6 +2099,8 @@ class SyncCutterBar(models.Model):
|
||||
[("code", '=', item['cutter_bar_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -1996,7 +2139,7 @@ class SyncCutterBarModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_bar_model_yesterday_list'):
|
||||
for item in result['mrs_cutter_bar_model_yesterday_list']:
|
||||
@@ -2008,18 +2151,22 @@ class SyncCutterBarModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步每日刀片类型列表成功')
|
||||
else:
|
||||
raise ValidationError("认证未通过")
|
||||
|
||||
# 定时同步所有刀杆类型列表
|
||||
# 同步所有刀杆类型列表
|
||||
def sync_all_cutter_bar_model(self):
|
||||
sf_sync_config = self.env['res.config.settings'].get_values()
|
||||
token = sf_sync_config['token']
|
||||
@@ -2030,7 +2177,7 @@ class SyncCutterBarModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_bar_model_all_list'):
|
||||
for item in result['mrs_cutter_bar_model_all_list']:
|
||||
@@ -2042,12 +2189,16 @@ class SyncCutterBarModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步刀杆类型列表成功')
|
||||
else:
|
||||
@@ -2072,7 +2223,7 @@ class SyncCutterPad(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_pad_yesterday_list'):
|
||||
for item in result['mrs_cutter_pad_yesterday_list']:
|
||||
@@ -2097,6 +2248,8 @@ class SyncCutterPad(models.Model):
|
||||
[("code", '=', item['cutter_pad_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -2121,6 +2274,8 @@ class SyncCutterPad(models.Model):
|
||||
[("code", '=', item['cutter_pad_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -2152,7 +2307,7 @@ class SyncCutterPad(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_pad_all_list'):
|
||||
for item in result['mrs_cutter_pad_all_list']:
|
||||
@@ -2177,6 +2332,8 @@ class SyncCutterPad(models.Model):
|
||||
[("code", '=', item['cutter_pad_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -2201,6 +2358,8 @@ class SyncCutterPad(models.Model):
|
||||
[("code", '=', item['cutter_pad_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"c_diameter": item['c_diameter'],
|
||||
"total_length": item['total_length'],
|
||||
"material_model": self.env['sf.materials.model'].search(
|
||||
@@ -2240,7 +2399,7 @@ class SyncCutterPadModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_pad_model_yesterday_list'):
|
||||
for item in result['mrs_cutter_pad_model_yesterday_list']:
|
||||
@@ -2252,12 +2411,16 @@ class SyncCutterPadModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步每日刀盘类型列表成功')
|
||||
else:
|
||||
@@ -2274,7 +2437,7 @@ class SyncCutterPadModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_cutter_pad_model_all_list'):
|
||||
for item in result['mrs_cutter_pad_model_all_list']:
|
||||
@@ -2286,12 +2449,16 @@ class SyncCutterPadModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步刀盘类型列表成功')
|
||||
else:
|
||||
@@ -2316,7 +2483,7 @@ class SyncHandle(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_handle_yesterday_list'):
|
||||
for item in result['mrs_handle_yesterday_list']:
|
||||
@@ -2341,6 +2508,8 @@ class SyncHandle(models.Model):
|
||||
[("code", '=', item['handle_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"length1": item['length1'],
|
||||
"diameter1": item['diameter1'],
|
||||
@@ -2365,6 +2534,8 @@ class SyncHandle(models.Model):
|
||||
[("code", '=', item['handle_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"length1": item['length1'],
|
||||
"diameter1": item['diameter1'],
|
||||
@@ -2396,7 +2567,7 @@ class SyncHandle(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_handle_all_list'):
|
||||
for item in result['mrs_handle_all_list']:
|
||||
@@ -2421,6 +2592,8 @@ class SyncHandle(models.Model):
|
||||
[("code", '=', item['handle_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"length1": item['length1'],
|
||||
"diameter1": item['diameter1'],
|
||||
@@ -2445,6 +2618,8 @@ class SyncHandle(models.Model):
|
||||
[("code", '=', item['handle_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"length": item['length'],
|
||||
"length1": item['length1'],
|
||||
"diameter1": item['diameter1'],
|
||||
@@ -2484,7 +2659,7 @@ class SyncHandleModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_handle_model_yesterday_list'):
|
||||
for item in result['mrs_handle_model_yesterday_list']:
|
||||
@@ -2496,12 +2671,16 @@ class SyncHandleModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步每日刀柄类型列表成功')
|
||||
else:
|
||||
@@ -2518,7 +2697,7 @@ class SyncHandleModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_handle_model_all_list'):
|
||||
for item in result['mrs_handle_model_all_list']:
|
||||
@@ -2530,12 +2709,16 @@ class SyncHandleModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步刀柄类型列表成功')
|
||||
else:
|
||||
@@ -2560,7 +2743,7 @@ class SyncChuck(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_chuck_yesterday_list'):
|
||||
for item in result['mrs_chuck_yesterday_list']:
|
||||
@@ -2585,6 +2768,8 @@ class SyncChuck(models.Model):
|
||||
[("code", '=', item['chuck_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"accuracy": item['accuracy'],
|
||||
"diameter": item['diameter'],
|
||||
"inner_diameter": item['inner_diameter'],
|
||||
@@ -2605,6 +2790,8 @@ class SyncChuck(models.Model):
|
||||
[("code", '=', item['chuck_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"accuracy": item['accuracy'],
|
||||
"diameter": item['diameter'],
|
||||
"inner_diameter": item['inner_diameter'],
|
||||
@@ -2632,7 +2819,7 @@ class SyncChuck(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_chuck_all_list'):
|
||||
for item in result['mrs_chuck_all_list']:
|
||||
@@ -2657,6 +2844,8 @@ class SyncChuck(models.Model):
|
||||
[("code", '=', item['chuck_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"accuracy": item['accuracy'],
|
||||
"diameter": item['diameter'],
|
||||
"inner_diameter": item['inner_diameter'],
|
||||
@@ -2677,6 +2866,8 @@ class SyncChuck(models.Model):
|
||||
[("code", '=', item['chuck_model_number'])]).id,
|
||||
"brand": self.env['sf.machine.brand'].search(
|
||||
[("code", '=', item['brand'])]).id,
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
"accuracy": item['accuracy'],
|
||||
"diameter": item['diameter'],
|
||||
"inner_diameter": item['inner_diameter'],
|
||||
@@ -2712,7 +2903,7 @@ class SyncChuckModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_chuck_model_yesterday_list'):
|
||||
for item in result['mrs_chuck_model_yesterday_list']:
|
||||
@@ -2724,12 +2915,16 @@ class SyncChuckModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步每日夹头类型列表成功')
|
||||
else:
|
||||
@@ -2746,7 +2941,7 @@ class SyncChuckModel(models.Model):
|
||||
r = requests.post(strUrl, json={}, data=None, headers=headers)
|
||||
r = r.json()
|
||||
result = json.loads(r['result'])
|
||||
print('result:%s' % result)
|
||||
# print('result:%s' % result)
|
||||
if result['status'] == 1:
|
||||
if result.get('mrs_chuck_model_all_list'):
|
||||
for item in result['mrs_chuck_model_all_list']:
|
||||
@@ -2758,20 +2953,22 @@ class SyncChuckModel(models.Model):
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
else:
|
||||
brand.write({
|
||||
"name": item['name'],
|
||||
"code": item['code'],
|
||||
"remark": item['remark'],
|
||||
"cutting_tool_material": self.env['sf.cutting.tool.material'].search(
|
||||
[("code", '=', item['cutting_tool_material'])]).id,
|
||||
})
|
||||
print('同步夹头类型列表成功')
|
||||
else:
|
||||
raise ValidationError("认证未通过")
|
||||
|
||||
|
||||
|
||||
|
||||
'''=========================================夹紧元件类型==============================================='''
|
||||
|
||||
|
||||
@@ -2900,7 +3097,6 @@ class sfFixtureClampingElement(models.Model):
|
||||
# "picture": item['picture'].encode('utf-8'),
|
||||
"comment": item['comment'],
|
||||
|
||||
|
||||
'brand_id': self.env['sf.machine.brand'].search(
|
||||
[('code', '=', item['brand_id'])]).id,
|
||||
"material_type_id": self.env['sf.materials.model'].search(
|
||||
@@ -3103,4 +3299,3 @@ class sfGuideElementGuideMode(models.Model):
|
||||
})
|
||||
else:
|
||||
raise ValidationError("认证未通过")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user