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

Accept Merge Request #1095: (release/release_1.8 -> develop)

Browse Source 
Merge Request: 功能刀具、工件状态优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1095
This commit is contained in:
禹翔辉
2024-06-25 09:53:14 +08:00
committed by Coding
parent 6a24776701 f005a29beb
commit e437875a92
2 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_manufacturing/controllers/controllers.py
View File

@@ -460,6 +460,7 @@ class Manufacturing_Connect(http.Controller):
if f'RfidCode{i}' in ret: if f'RfidCode{i}' in ret:
rfid_code = ret[f'RfidCode{i}'] rfid_code = ret[f'RfidCode{i}']
logging.info('RfidCode:%s' % rfid_code) logging.info('RfidCode:%s' % rfid_code)
if rfid_code is not None:
domain = [ domain = [
('rfid_code', '=', rfid_code), ('rfid_code', '=', rfid_code),
('routing_type', '=', 'CNC加工') ('routing_type', '=', 'CNC加工')
@@ -471,7 +472,8 @@ class Manufacturing_Connect(http.Controller):
logging.info( logging.info(
'制造订单产线状态:%s' % order.production_id.production_line_state) '制造订单产线状态:%s' % order.production_id.production_line_state)
order.production_id.write({'production_line_state': '已上产线'}) order.production_id.write({'production_line_state': '已上产线'})
workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search([ workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
[
('rfid_code', '=', rfid_code), ('type', '=', '上产线'), ('rfid_code', '=', rfid_code), ('type', '=', '上产线'),
('production_id', '=', order.production_id.id)]) ('production_id', '=', order.production_id.id)])
if workpiece_delivery.status == '待下发': if workpiece_delivery.status == '待下发':
@@ -515,6 +517,7 @@ class Manufacturing_Connect(http.Controller):
if f'RfidCode{i}' in ret: if f'RfidCode{i}' in ret:
rfid_code = ret[f'RfidCode{i}'] rfid_code = ret[f'RfidCode{i}']
logging.info('RfidCode:%s' % rfid_code) logging.info('RfidCode:%s' % rfid_code)
if rfid_code is not None:
domain = [ domain = [
('rfid_code', '=', rfid_code), ('rfid_code', '=', rfid_code),
('routing_type', '=', 'CNC加工') ('routing_type', '=', 'CNC加工')
@@ -526,7 +529,8 @@ class Manufacturing_Connect(http.Controller):
logging.info( logging.info(
'制造订单产线状态:%s' % order.production_id.production_line_state) '制造订单产线状态:%s' % order.production_id.production_line_state)
order.production_id.write({'production_line_state': '已下产线'}) order.production_id.write({'production_line_state': '已下产线'})
workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search([ workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
[
('rfid_code', '=', rfid_code), ('type', '=', '下产线'), ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),
('production_id', '=', order.production_id.id)]) ('production_id', '=', order.production_id.id)])
delivery_Arr.append(workpiece_delivery.id) delivery_Arr.append(workpiece_delivery.id)