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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板

Browse Source
This commit is contained in:
jinling.yang
2023-06-15 16:15:28 +08:00
parent c7ec8be141 95870699d5
commit 8a0d89161b
12 changed files with 468 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_mrs_connect/models/sync_common.py
View File

@@ -1988,7 +1988,7 @@ class SyncCutterBar(models.Model):
self.env['sf.cutter.bar'].create({
"code": item['code'],
"name": item['name'],
"cutter_bar_model_number": self.env['sf.cutter.bar'].search(
"cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
[("code", '=', item['cutter_bar_model_number'])]).id,
"brand": self.env['sf.machine.brand'].search(
[("code", '=', item['brand'])]).id,
@@ -2013,7 +2013,7 @@ class SyncCutterBar(models.Model):
brand.write({
"code": item['code'],
"name": item['name'],
"cutter_bar_model_number": self.env['sf.cutter.bar'].search(
"cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
[("code", '=', item['cutter_bar_model_number'])]).id,
"brand": self.env['sf.machine.brand'].search(
[("code", '=', item['brand'])]).id,
@@ -2049,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']:
@@ -2070,7 +2070,7 @@ class SyncCutterBar(models.Model):
self.env['sf.cutter.bar'].create({
"code": item['code'],
"name": item['name'],
"cutter_bar_model_number": self.env['sf.cutter.bar'].search(
"cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
[("code", '=', item['cutter_bar_model_number'])]).id,
"brand": self.env['sf.machine.brand'].search(
[("code", '=', item['brand'])]).id,
@@ -2095,7 +2095,7 @@ class SyncCutterBar(models.Model):
brand.write({
"code": item['code'],
"name": item['name'],
"cutter_bar_model_number": self.env['sf.cutter.bar'].search(
"cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
[("code", '=', item['cutter_bar_model_number'])]).id,
"brand": self.env['sf.machine.brand'].search(
[("code", '=', item['brand'])]).id,