Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r26488 -r26599 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26488) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26599) @@ -1816,7 +1816,7 @@ String extraOrder = ""; if(enableUrgentFunction){ extraOrder = " ul.grade desc,"; - sql = "select po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + sql = "select distinct po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask" + " ,ul.id urgentLevelId,ul.name urgentLevelName,ul.colorCode,ul.grade " @@ -1834,7 +1834,7 @@ }else{ extraOrder = " po.urgentAmount desc, "; - sql = "select po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + sql = "select distinct po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask from PackingTask po , CssdHandleTousses ct , TousseDefinition td " + "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "