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

Accept Merge Request #1128: (feature/修复工单完成接口 -> 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/1128?initial=true
This commit is contained in:
杨金灵
2024-07-01 18:29:29 +08:00
committed by Coding
parent 150b684354 e9c9b77112
commit 79ab1cc573
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sf_manufacturing/controllers/controllers.py
View File

@@ -225,14 +225,14 @@ class Manufacturing_Connect(http.Controller):
# workorder.sudo().production_id.process_state = '待解除装夹' # workorder.sudo().production_id.process_state = '待解除装夹'
# 根据工单的实际结束时间修改排程单的结束时间、状态，同时修改销售订单的状态 # 根据工单的实际结束时间修改排程单的结束时间、状态，同时修改销售订单的状态
if workorder.date_finished: # if workorder.date_finished:
request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write( # request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
{'actual_end_time': workorder.date_finished, # {'actual_end_time': workorder.date_finished,
'state': 'finished'}) # 'state': 'finished'})
production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)]) # production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
if production_obj: # if production_obj:
production_obj.sudo().work_order_state = '已完成' # production_obj.sudo().work_order_state = '已完成'
production_obj.write({'state': 'completed'}) # production_obj.write({'state': 'done'})
# request.env['sale.order'].sudo().search( # request.env['sale.order'].sudo().search(
# [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'}) # [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})

2
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1015,7 +1015,7 @@ class ResMrpWorkOrder(models.Model):
move_raw_id.quantity_done = move_raw_id.product_uom_qty move_raw_id.quantity_done = move_raw_id.product_uom_qty
record.process_state = '已完工' record.process_state = '已完工'
record.production_id.process_state = '已完工' record.production_id.process_state = '已完工'
if record.routing_type in ['表面工艺']: if record.routing_type in ['解除装夹', '表面工艺']:
raw_move = self.env['stock.move'].sudo().search( raw_move = self.env['stock.move'].sudo().search(
[('origin', '=', record.production_id.name), ('procure_method', '=', 'make_to_order'), [('origin', '=', record.production_id.name), ('procure_method', '=', 'make_to_order'),
('state', '!=', 'done')]) ('state', '!=', 'done')])