Accept Merge Request #1658: (feature/part_number -> develop)

Merge Request: 表面工艺确认回退再重新确认调拨单报错问题

Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1658

sf_manufacturing/models/stock.py

@@ -657,15 +657,19 @@ class StockPicking(models.Model):
             if move_out:
                 workorder = move_out.subcontract_workorder_id
                 workorder.button_start()
+        # if self.location_id.name == '成品存货区' and self.location_dest_id == '客户':
+        #     sale_id = self.env['sale.order'].sudo().search(
+        #         [('name', '=', self.origin)])
+        #     if sale_id:
+        #         sale_id.write({'state':'delivered'})
         return res
 
     # 创建 外协出库入单
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
         for workorder in workorders:
             if workorder.move_subcontract_workorder_ids:
-                workorder.move_subcontract_workorder_ids.write({'state': 'waiting'})
-                workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'waiting'})
-            else:
+                workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
+                workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
             # 创建一个新的补货组
             procurement_group_id = self.env['procurement.group'].create({
                 'name': workorder.name,
@@ -673,7 +677,7 @@ class StockPicking(models.Model):
             })
             move_dest_id = False
             # 如果当前工单是是制造订单的最后一个工艺外协工单
-                if workorder == next((workorder for workorder in reversed(item.workorder_ids) if workorder.is_subcontract), None):
+            if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract), None):
                 move_dest_id = item.move_raw_ids[0].id
             else:
                 # 从sorted_workorders中找到上一工单的move
@@ -704,6 +708,9 @@ class StockPicking(models.Model):
                 {'picking_id': picking_out.id, 'state': 'waiting'})
             moves_out._assign_picking_post_process(new=new_picking)
 
+
+
+
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):
         super(StockPicking, self)._compute_state()