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

Accept Merge Request #1694: (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/1694
This commit is contained in:
管欢
2024-12-31 13:32:34 +08:00
committed by Coding
parent 79ec60bd6b 39ed32f3e9
commit af7eeb55f1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_manufacturing/models/stock.py
View File

@@ -654,7 +654,10 @@ class StockPicking(models.Model):
if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户': if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
sale_id = self.env['sale.order'].sudo().search( sale_id = self.env['sale.order'].sudo().search(
[('name', '=', self.origin)]) [('name', '=', self.origin)])
if sale_id and res: stock_picking_list = self.env['stock.picking'].sudo().search(
[('id', 'in', sale_id.picking_ids.ids)])
stock_picking = stock_picking_list.filtered(lambda p: p.state not in ("done", "cancel"))
if sale_id and not stock_picking:
sale_id.write({'state': 'delivered'}) sale_id.write({'state': 'delivered'})
return res return res
@@ -678,7 +681,7 @@ class StockPicking(models.Model):
# 从sorted_workorders中找到上一工单的move # 从sorted_workorders中找到上一工单的move
if len(sorted_workorders) > 1: if len(sorted_workorders) > 1:
move_dest_id = \ move_dest_id = \
sorted_workorders[sorted_workorders.index(workorder) + 1].move_subcontract_workorder_ids[1].id sorted_workorders[sorted_workorders.index(workorder) + 1].move_subcontract_workorder_ids[1].id
new_picking = True new_picking = True
outcontract_picking_type_in = self.env.ref( outcontract_picking_type_in = self.env.ref(
'sf_manufacturing.outcontract_picking_in').id, 'sf_manufacturing.outcontract_picking_in').id,