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
2024-02-23 10:17:46 +08:00
parent ad0b9983bf 648954faa3
commit 935b317fe6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_manufacturing/controllers/controllers.py
View File

@@ -148,11 +148,20 @@ class Manufacturing_Connect(http.Controller):
ret = json.loads(datas)
production_id = ret['BillId']
routing_type = ret['CraftId']
equipment_id = ret["DeviceId"]
workorder = request.env['mrp.workorder'].sudo().search(
[('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
if not workorder:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
return json.JSONEncoder().encode(res)
if workorder.state != 'ready':
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'}
return json.JSONEncoder().encode(res)
work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1)
if not work_equipment_id:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'}
return json.JSONEncoder().encode(res)
workorder.equipment_id = work_equipment_id
workorder.button_start()
except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -179,6 +188,9 @@ class Manufacturing_Connect(http.Controller):
if not workorder:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
return json.JSONEncoder().encode(res)
if workorder.state != 'progress':
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
return json.JSONEncoder().encode(res)
workorder.button_finish()
except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}

4
sf_warehouse/models/model.py
View File

@@ -330,7 +330,7 @@ class ShelfLocation(models.Model):
record.storage_time = False
name = fields.Char('货位名称', required=True, size=20)
barcode = fields.Char('货位编码', copy=False, size=15)
barcode = fields.Char('货位编码', copy=False, size=50)
# 货架
shelf_id = fields.Many2one('sf.shelf', string='货架')
@@ -398,7 +398,7 @@ class ShelfLocation(models.Model):
# objs_all = self.env['maintenance.equipment'].search([('id', '=', self.id)])
# machine_tool_list = []
params = {'DeviceId': 'Cabinet-AL'}
r = requests.get(crea_url, params=params,headers=headers)
r = requests.get(crea_url, params=params, headers=headers)
ret = r.json()
print(ret)
if ret['Succeed'] == True: