jikimo/jikimo_sf
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/优化agv和ftp

Browse Source 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/models/ftp_operate.py
#	sf_sale/models/quick_easy_order_old.py
This commit is contained in:
jinling.yang
2024-04-19 11:28:50 +08:00
parent d8a876796a 25ee2136c3
commit bcba08042b
38 changed files with 2005 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_mrs_connect/models/sync_common.py
View File

@@ -591,6 +591,7 @@ class MachineBrand(models.Model):
if not brand:
self.create({
"name": item['name'],
"active": item['active'],
"code": item['code'],
"remark": item['remark'],
"image_brand": '' if not item['image_brand'] else base64.b64decode(item['image_brand']),
@@ -599,6 +600,7 @@ class MachineBrand(models.Model):
})
else:
brand.name = item['name']
brand.active = item['active']
brand.remark = item['remark']
brand.image_brand = '' if not item['image_brand'] else base64.b64decode(item['image_brand'])
brand.tag_ids = self.env['sf.machine.brand.tags'].search(