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

Accept Merge Request #142: (feature/优化进度反馈 -> develop)

Browse Source 
Merge Request: 京东物流对接sf端基本完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/142?initial=true
This commit is contained in:
马广威
2023-02-17 15:30:08 +08:00
parent 97c64ff290 f67c1fb719
commit d81cf77bbe
9 changed files with 429 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
sf_manufacturing/models/mrp_workorder.py
View File

@@ -217,20 +217,29 @@ class ResMrpWorkOrder(models.Model):
'production_id': self.production_id,
'state': '占用',
})
self.work_state = "已绑定"
orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
for a in orders:
a.tray_id = values
return values
# return {
# 'name': _('New Maintenance Request'),
# 'view_mode': 'form',
# 'res_model': 'maintenance.request',
# 'type': 'ir.actions.act_window',
# 'context': {
# 'default_company_id': self.company_id.id,
# 'default_production_id': self.id,
# },
# 'domain': [('production_id', '=', self.id)],
# }
else:
raise UserError('该托盘编码已失效')
else:
return {
'name': _('New Maintenance Request'),
'view_mode': 'form',
'res_model': 'maintenance.request',
'type': 'ir.actions.act_window',
'context': {
'default_company_id': self.company_id.id,
'default_production_id': self.id,
},
'domain': [('production_id', '=', self.id)],
}
raise UserError('托盘码不能为空')
# 解除托盘绑定
def unbindtray(self):
@@ -532,4 +541,15 @@ class SfWorkOrderBarcodes(models.Model):
tray_code = self.env['sf.tray'].search([('code', '=', barcode)])
self.tray_code = tray_code.code
workorder = self.env['mrp.workorder'].browse(self.ids)
workorder.gettray_auto(barcode)
self.tray_id = workorder.gettray_auto(barcode)
# return {
# 'type': 'ir.actions.act_window',
# 'name': '工单',
# 'res_model': 'mrp.workorder',
# 'view_mode': 'form',
# 'context': {'active_id': self.id},
# # 'target': 'current',
# }