Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r13438 -r13447 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 13438) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 13447) @@ -1228,100 +1228,104 @@ @Override public String getWaitPackingTaskJson(String taskGroup, String basketBarcode) { List taskVos = new ArrayList(); - if (StringUtils.isNotBlank(taskGroup)) { - List taskList = findPackingTaskFromCssdHandleToussesConfig(taskGroup,basketBarcode); - Map taskMap = new HashMap(); - if (taskList != null) { - - Map> errorsMap = loadWaitSupplementRecyclingErrors(); - Map> damagesMap = loadWaitSupplementRecyclingDamages(); - - for (Object[] result : taskList) { + try { + if (StringUtils.isNotBlank(taskGroup)) { + List taskList = findPackingTaskFromCssdHandleToussesConfig(taskGroup,basketBarcode); + Map taskMap = new HashMap(); + if (taskList != null) { - PackingTask task = (PackingTask)result[0]; - TousseDefinition td = (TousseDefinition)result[1]; + Map> errorsMap = loadWaitSupplementRecyclingErrors(); + Map> damagesMap = loadWaitSupplementRecyclingDamages(); - String tousseName = td.getName(); - Long tousseID = td.getId(); - boolean haveIDCard = tousseDefinitionManager.isThereIDCard(td); - WaitPackingTaskItemVo itemVo = new WaitPackingTaskItemVo(); - itemVo.setTaskId(task.getId()); - itemVo.setBasketName(task.getRecyclingBasketName()); - itemVo.setBasketBarcode(task.getBasketBarcode()); - itemVo.setDepartment(task.getDepartment()); - itemVo.setTousseType(td.getTousseType()); - itemVo.setStatus(task.getStatus()); - itemVo.setHaveIDCard(haveIDCard); - String washTime = task.getWashTime(); - if (StringUtils.isNotBlank(washTime) - && washTime.length() > 16) { - washTime = washTime.substring(0, 16); + for (Object[] result : taskList) { + + PackingTask task = (PackingTask)result[0]; + TousseDefinition td = (TousseDefinition)result[1]; + + String tousseName = td.getName(); + Long tousseID = td.getId(); + boolean haveIDCard = tousseDefinitionManager.isThereIDCard(td); + WaitPackingTaskItemVo itemVo = new WaitPackingTaskItemVo(); + itemVo.setTaskId(task.getId()); + itemVo.setBasketName(task.getRecyclingBasketName()); + itemVo.setBasketBarcode(task.getBasketBarcode()); + itemVo.setDepartment(task.getDepartment()); + itemVo.setTousseType(td.getTousseType()); + itemVo.setStatus(task.getStatus()); + itemVo.setHaveIDCard(haveIDCard); + String washTime = task.getWashTime(); + if (StringUtils.isNotBlank(washTime) + && washTime.length() > 16) { + washTime = washTime.substring(0, 16); + } + itemVo.setWashTime(washTime); + Date startDate = task.getStartTime(); + if (startDate != null) { + itemVo.setDateTime(new SimpleDateFormat( + "yyyy-MM-dd HH:mm").format(startDate)); + } + itemVo.setPackageType(td.getPackageType()); + itemVo.setSterilingMethod(td.getSterilingMethod()); + itemVo.setIsTraceable(td.getIsTraceable()); + itemVo.setIsPrint(td.getIsPrint()); + itemVo.setIsReview(td.getIsReview()); + itemVo.setNote(td.getNote()); + itemVo.setUuid_vedioNames(td.getUuid_vedioNames()); + itemVo.setIsUploadVideo(td.getIsUploadVideo()); + itemVo.setTousseName(tousseName); + itemVo.setTousseID(tousseID); + String nodeText = tousseName; + itemVo.setText(nodeText); + WaitPackingTaskVo vo = taskMap.get(nodeText); + if(vo == null){ + vo = new WaitPackingTaskVo(); + vo.setAmount(task.getUnPackAmount()); + vo.setText(nodeText); + vo.setPackageType(td.getPackageType()); + vo.setSterilingMethod(td.getSterilingMethod()); + vo.setTousseType(td.getTousseType()); + vo.setIsTraceable(td.getIsTraceable()); + vo.setIsPrint(td.getIsPrint()); + vo.setIsReview(td.getIsReview()); + vo.setTousseName(tousseName); + vo.setTousseID(tousseID); + vo.setTaskType(task.getTaskType()); + vo.setUuid_vedioNames(td.getUuid_vedioNames()); + vo.setHaveIDCard(haveIDCard); + taskMap.put(nodeText, vo); + }else{ + vo.setAmount(vo.getAmount() + task.getUnPackAmount()); + } + vo.setUnPackingAmount(vo.getAmount()); + List childrens = vo.getChildren(); + childrens.add(itemVo); + + itemVo.setAmount(task.getUnPackAmount()); + itemVo.setSupplierName(td.getSupplierName()); + itemVo.setTaskType(task.getTaskType()); + + List errorList = errorsMap.get(task.getId()); + if(errorList != null && errorList.size() > 0){ + itemVo.setReplenishMaterils(true); + vo.setReplenishMaterils(true); + itemVo.getErrors().addAll(errorList); + } + List damages = damagesMap.get(task.getId()); + if(damages != null && damages.size() > 0){ + itemVo.setReplenishMaterils(true); + vo.setReplenishMaterils(true); + itemVo.getDamages().addAll(damages); + } } - itemVo.setWashTime(washTime); - Date startDate = task.getStartTime(); - if (startDate != null) { - itemVo.setDateTime(new SimpleDateFormat( - "yyyy-MM-dd HH:mm").format(startDate)); - } - itemVo.setPackageType(td.getPackageType()); - itemVo.setSterilingMethod(td.getSterilingMethod()); - itemVo.setIsTraceable(td.getIsTraceable()); - itemVo.setIsPrint(td.getIsPrint()); - itemVo.setIsReview(td.getIsReview()); - itemVo.setNote(td.getNote()); - itemVo.setUuid_vedioNames(td.getUuid_vedioNames()); - itemVo.setIsUploadVideo(td.getIsUploadVideo()); - itemVo.setTousseName(tousseName); - itemVo.setTousseID(tousseID); - String nodeText = tousseName; - itemVo.setText(nodeText); - WaitPackingTaskVo vo = taskMap.get(nodeText); - if(vo == null){ - vo = new WaitPackingTaskVo(); - vo.setAmount(task.getUnPackAmount()); - vo.setText(nodeText); - vo.setPackageType(td.getPackageType()); - vo.setSterilingMethod(td.getSterilingMethod()); - vo.setTousseType(td.getTousseType()); - vo.setIsTraceable(td.getIsTraceable()); - vo.setIsPrint(td.getIsPrint()); - vo.setIsReview(td.getIsReview()); - vo.setTousseName(tousseName); - vo.setTousseID(tousseID); - vo.setTaskType(task.getTaskType()); - vo.setUuid_vedioNames(td.getUuid_vedioNames()); - vo.setHaveIDCard(haveIDCard); - taskMap.put(nodeText, vo); - }else{ - vo.setAmount(vo.getAmount() + task.getUnPackAmount()); - } - vo.setUnPackingAmount(vo.getAmount()); - List childrens = vo.getChildren(); - childrens.add(itemVo); - - itemVo.setAmount(task.getUnPackAmount()); - itemVo.setSupplierName(td.getSupplierName()); - itemVo.setTaskType(task.getTaskType()); - - List errorList = errorsMap.get(task.getId()); - if(errorList != null && errorList.size() > 0){ - itemVo.setReplenishMaterils(true); - vo.setReplenishMaterils(true); - itemVo.getErrors().addAll(errorList); - } - List damages = damagesMap.get(task.getId()); - if(damages != null && damages.size() > 0){ - itemVo.setReplenishMaterils(true); - vo.setReplenishMaterils(true); - itemVo.getDamages().addAll(damages); - } } + Iterator itr = taskMap.keySet().iterator(); + while(itr.hasNext()){ + String name = itr.next(); + taskVos.add(taskMap.get(name)); + } } - Iterator itr = taskMap.keySet().iterator(); - while(itr.hasNext()){ - String name = itr.next(); - taskVos.add(taskMap.get(name)); - } + } catch (Exception e) { + e.printStackTrace(); } JSONArray jsonArray = new JSONArray(); jsonArray.add(taskVos); @@ -1372,7 +1376,7 @@ String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType," + "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable," - + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName from PackingTask as po , CssdHandleTousses as ct , TousseDefinition as td " + + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName from PackingTask po , CssdHandleTousses ct , TousseDefinition td " + "where po.tousseDefinition_id = ct.tousseDefinitionId and ct.tousseDefinitionId=td.id and po.orgUnitCoding = ct.orgUnitCode " + "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "'"; if(StringUtils.isNotBlank(basketBarcode)){ @@ -1395,15 +1399,17 @@ while(rs.next()){ PackingTask task = new PackingTask(); BigDecimal taskIdBigDecimal = (BigDecimal)rs.getObject("taskId"); + Number unPackAmount = (Number)rs.getObject("unPackAmount"); + Number taskType = (Number)rs.getObject("taskType"); task.setId(taskIdBigDecimal == null ? null : taskIdBigDecimal.longValue()); task.setRecyclingBasketName(rs.getString("recyclingBasketName")); task.setBasketBarcode(rs.getString("basketBarcode")); task.setDepartment(rs.getString("department")); task.setStatus(rs.getString("status")); task.setWashTime(rs.getString("washTime")); task.setStartTime(rs.getDate("startTime")); - task.setUnPackAmount((Integer)rs.getObject("unPackAmount")); - task.setTaskType((Integer)rs.getObject("taskType")); + task.setUnPackAmount(unPackAmount.intValue()); + task.setTaskType(taskType.intValue()); TousseDefinition td = new TousseDefinition(); BigDecimal tousseDefinitionIdBigDecimal = (BigDecimal)rs.getObject("tousseDefinitionId");