Merge branch 'develop' into release/release_2.14

Merge Request: 采购申请单完成操作提示调整

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2180

jikimo_purchase_request/models/purchase_request.py

@@ -41,6 +41,7 @@ class PurchaseRequest(models.Model):
         if lines:
             for line in lines:
                 for line_item in line.order_line:
+                    if line_item.state == 'purchase':
                         product_id = line_item.product_id.id
                         qty = line_item.product_qty
                         product_rounding[product_id] = line_item.product_id.uom_id.rounding
@@ -60,10 +61,10 @@ class PurchaseRequest(models.Model):
 
         if discrepancies:
             # 弹出提示框
-            message = "产品数量不一致:\n"
+            message = "产品与采购数量不一致:\n"
             for product_id, required_qty, order_qty in discrepancies:
                 product_name = self.env['product.product'].browse(product_id).display_name  # 获取产品名称
-                message += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单数量 {order_qty}（含询价状态）\n"
+                message += f"产品 {product_name}，需求数量 {required_qty}，关联采购订单确认的数量 {order_qty}。\n"
                 # 添加确认框
             message += "确认关闭？"
             return {

sf_manufacturing/controllers/main.py

@@ -47,7 +47,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
                 i += 1
             if kw.get('contract_file_name') and kw.get('contract_file') and kw.get('contract_code'):
                 order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
-                order_id.write({'contract_code': kw.get('contract_code')})
+                order_id.write({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
             res['factory_order_no'] = order_id.name
             order_id.confirm_to_supply_method()
         except Exception as e:

sf_manufacturing/models/mrp_workorder.py

@@ -227,6 +227,14 @@ class ResMrpWorkOrder(models.Model):
                 # finish_move.move_dest_ids.move_line_ids.reserved_uom_qty = 0
         else:
             next_workorder = sorted_workorders[position + 1]
+            # 持续获取下一个工单，直到找到一个不是返工的工单
+            while next_workorder and next_workorder.state == 'rework':
+                position += 1
+                if position + 1 < len(sorted_workorders):
+                    next_workorder = sorted_workorders[position + 1]
+                else:
+                    next_workorder = None
+            if next_workorder:
                 next_state = next_workorder.state
                 if next_state not in ['pending', 'waiting', 'ready']:
                     raise UserError('下工序已经开始，无法回退')

sf_sale/models/sale_order.py

@@ -64,6 +64,7 @@ class ReSaleOrder(models.Model):
     model_display_version = fields.Char('模型展示版本', default="v1")
 
     contract_code = fields.Char('合同编号')
+    contract_date = fields.Date('合同日期')
     contract_document_id = fields.Many2one('documents.document', string='合同文件')
     contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
     contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')