Merge branch 'sdddl_project' of https://git.rokedata.com/dws/dwsproject into zyl_sdddl_project

sdddl_project/wizard/inherit_result_put_warehose_wizard.py

@@ -67,7 +67,7 @@ class InheritRokeResultPutWarehouseWizard(models.TransientModel):
         insert_sql_data = []
         insert_sql_data = []
         _uuid = uuid.uuid1()
         _uuid = uuid.uuid1()
         for v in new_results:
         for v in new_results:
-            if v.id in insert_id:
+            if f"'{v.id}'" in insert_id:
                 continue
                 continue
             insert_sql_data.append(f"""
             insert_sql_data.append(f"""
                 ('{_uuid}', '{v.product_id.code}', '{v.wo_id.code}', {v.qty or 0}, {v.id}, '{v.pt_id.code}', '{v.pt_id.task_type}',
                 ('{_uuid}', '{v.product_id.code}', '{v.wo_id.code}', {v.qty or 0}, {v.id}, '{v.pt_id.code}', '{v.pt_id.task_type}',