Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r34210 -r34226 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 34210) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 34226) @@ -82,7 +82,6 @@ ,@Index(columnList = "recyclingApplicationID", name = "td_raid_index") ,@Index(columnList = "tousseGroupID", name = "td_tgid_index") ,@Index(columnList = "parentID", name = "td_pid_index") -,@Index(columnList = "note_id", name = "td_noteid_index") }) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class TousseDefinition implements IDAble{ Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r34136 -r34226 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34136) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34226) @@ -94,6 +94,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.ComboTousseComposite; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.ComboTousseOrgUint; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinitionNote; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.StorageLocation; @@ -1552,6 +1553,8 @@ TimeoutSetting timeoutSetting = timeoutManager.getTimeoutSetting(TimeoutManager.PROCEDURE_WASH_TO_PACKING); SerialNum serialNum = serialNumManager.getSerialNumber(SerialNum.TYPE_PACKING_TASK); Map taskSourceIdAndTDIdToCountMap = new HashMap(); + //包定义的配包注意事项(ZSRY-9支持富文本编辑，配包注意事项保存到TousseDefinitionNote表中) + Map tousseIdNoteMap = getTousseIdNoteMap(taskList); if(StringUtils.isBlank(basketBarcode) && waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount){ Set taskSourceIdSet = new HashSet(); Set tdIdSet = new HashSet(); @@ -1624,6 +1627,7 @@ String tousseName = td.getName(); Long tousseID = td.getId(); Long invoicePlanId = td.getInvoicePlanID(); + td.setNote(tousseIdNoteMap.get(tousseID)); boolean haveIDCard = tousseDefinitionManager.isThereIDCard(td); boolean isTimeout = false; if(washTimeOfVerifiedMap.containsKey(task.getWashTime())){ @@ -1950,6 +1954,35 @@ } return taskVos; } + + /** + * 查询配包注意事项 + * @param tdIdCol + * @return + */ + private Map getTousseIdNoteMap(List taskList) { + Map result = new HashMap(); + if(CollectionUtils.isEmpty(taskList)){ + return result; + } + Set tdIdSet = new HashSet(); + // 查询外来器械拆分篮筐的情况 + for (Object[] task : taskList) { + TousseDefinition td = (TousseDefinition)task[1]; + tdIdSet.add(td.getId()); + } + //查询包定义的配包注意事项 + String hql = String.format("select po from %s po where %s", TousseDefinitionNote.class.getSimpleName(), SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.tousseDefinitionId", tdIdSet)); + List notes = objectDao.findByHql(hql); + if(CollectionUtils.isEmpty(notes)){ + return result; + } + for (TousseDefinitionNote tousseDefinitionNote : notes) { + result.put(tousseDefinitionNote.getTousseDefinitionId(), tousseDefinitionNote.getNote()); + } + return result; + } + @Override public List getWaitPackingTaskTaskVoList(String taskGroup, String basketBarcode, JSONObject returnObj, String tousseOrDepart, Integer pageIndex, Integer pageSize) { return getWaitPackingTaskTaskVoList(null, taskGroup, basketBarcode, returnObj,tousseOrDepart, pageIndex, pageSize); @@ -2293,7 +2326,7 @@ extraOrder = " ul.grade desc,"; sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask" + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask" + " ,ul.id urgentLevelId,ul.name urgentLevelName,ul.colorCode,ul.grade " + " from PackingTask po " //+ ", CssdHandleTousses ct , TousseDefinition td " @@ -2315,7 +2348,7 @@ extraOrder = " po.urgentAmount desc, "; sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask " + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask " + "from PackingTask po " + " inner join TousseDefinition td on po.tousseDefinition_id = td.id " + " inner join CssdHandleTousses ct on ct.tousseDefinitionId=td.ancestorID " @@ -2437,7 +2470,7 @@ } String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.classifyBasket_id,po.classifyBasketIds,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + urgentlevelQuery + " from PackingTask po " + " inner join TousseDefinition td on po.tousseDefinition_id = td.id " @@ -2538,7 +2571,7 @@ } String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + "from PackingTask po " + " inner join TousseDefinition td on po.tousseDefinition_id = td.id " + " left join IDCardInfoForPackingTask ifp on ifp.packingTaskID=po.id " @@ -2688,7 +2721,7 @@ td.setIsTraceable(rs.getString("isTraceable")); td.setIsPrint(rs.getString("isPrint")); td.setIsReview(rs.getString("isReview")); - td.setNote(rs.getString("note")); + //td.setNote(rs.getString("note")); td.setUuid_vedioNames(rs.getString("uuid_vedioNames")); td.setIsUploadVideo(rs.getString("isUploadVideo")); td.setSupplierName(rs.getString("supplierName")); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java =================================================================== diff -u -r34210 -r34226 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java (.../TousseDefinitionNote.java) (revision 34210) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java (.../TousseDefinitionNote.java) (revision 34226) @@ -4,7 +4,9 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Index; import javax.persistence.Lob; +import javax.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -19,6 +21,9 @@ @Entity @DynamicInsert(false) @DynamicUpdate(true) +@Table(name = "TousseDefinitionNote",indexes = { +@Index(columnList = "tousseDefinitionId", name = "tdn_tdid_index") +}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class TousseDefinitionNote {