Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r30869 -r30881 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 30869) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 30881) @@ -1672,7 +1672,7 @@ * @param objectDao * @return */ - public static JSONObject getTousseObjForPrint(String tousseNameAlias, String tousseName, + public static JSONObject getTousseObjForPrint(String tousseName, JSONObject tdJson,TousseInstance tousseInstance, JSONArray barcodeArray, JSONArray virtualSeqNumArray, String tousseType, String packageType, String packageTypeAbbreviation, @@ -1693,7 +1693,6 @@ String washOperatorCode, Double weight,String remark, int printAmount,boolean haveUnSupplementMaterials,String isUrgentTousse, int includedTousseAmount) { JSONObject obj = new JSONObject(); - obj.put("tousseNameAlias", tousseNameAlias); obj.put("tousseName", tousseName); // 名称 obj.put("tousseDefinition", tdJson); obj.put("barcodes", barcodeArray); // 条码集合 Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r30869 -r30881 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30869) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30881) @@ -7866,7 +7866,7 @@ }else{ validUntilStr = ti.getValidUntilStr(format); } - JSONObject result = CssdUtils.getTousseObjForPrint(ti.getTousseNameAlias(), td.getName(), getTousseDefinitionJson(td), ti, + JSONObject result = CssdUtils.getTousseObjForPrint(StringUtils.isBlank(ti.getTousseNameAlias())? td.getName():ti.getTousseNameAlias(), getTousseDefinitionJson(td), ti, subBarcodeArray, virtualBasketSeqNumArray, td.getTousseType(), ti.getPackageType(), packageTypeAbbreviation, ti.getSterilingType(), ti.getSterilizerName(), ti.getSterileFrequency(), @@ -8687,6 +8687,9 @@ @Override public void saveSplitForeignTousseName( String splitForeignTousseName) { + if(StringUtils.isBlank(splitForeignTousseName)){ + return; + } if(objectDao.countBySql(" select count(0) from " + SplitForeignTousseName.class.getSimpleName() + " where splitTousseName='"+ splitForeignTousseName +"'") > 0){ return; } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r30869 -r30881 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 30869) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 30881) @@ -911,7 +911,7 @@ JSONObject toolAndImplantAmount = tousseDefinitionManager.getToolAndImplantAmount(td); JSONObject obj = CssdUtils.getTousseObjForPrint( - tousseInstance.getTousseNameAlias(),td.getName(), tdJson,tousseInstance, subBarcodeArray, subVirtualSeqNumArray, tousseType, + StringUtils.isBlank(tousseInstance.getTousseNameAlias())? td.getName():tousseInstance.getTousseNameAlias(), tdJson,tousseInstance, subBarcodeArray, subVirtualSeqNumArray, tousseType, packageType,packageTypeAbbreviation, sterilingType, sterilizerName, sterileFrequency, isPrintUserName, @@ -1041,7 +1041,11 @@ } String saPurpose = sterilisationManager.getSterilisationPurposeByName(tousseInstance.getSterilingType()); obj.put("id", tousseInstance.getId()); - obj.put("tousseName", tousseName); + if(StringUtils.isNotBlank(tousseInstance.getTousseNameAlias())){ + obj.put("tousseName", tousseInstance.getTousseNameAlias()); + }else{ + obj.put("tousseName", tousseName); + } obj.put("tousseDefinitionId", td.getId()); obj.put("tousseNameAlias", tousseInstance.getTousseNameAlias()); obj.put("tousseBarcode", tousseInstance.getBarcode()); @@ -2757,7 +2761,7 @@ if(packageTypeAbbreviation == null){ packageTypeAbbreviation = ""; } - JSONObject obj = CssdUtils.getTousseObjForPrint(tousseInstance.getTousseNameAlias(),tousseName,tdJson,tousseInstance, + JSONObject obj = CssdUtils.getTousseObjForPrint(StringUtils.isBlank(tousseInstance.getTousseNameAlias())? tousseName:tousseInstance.getTousseNameAlias(),tdJson,tousseInstance, barcodeArray, virtualBasketSeqNumArray, td.getTousseType(), packageType, packageTypeAbbreviation,sterilingType, tousseInstance.getSterilizerName(), tousseInstance.getSterileFrequency(), isPrintUserName, tousseInstance.getOperator(), @@ -4369,8 +4373,7 @@ Double weight =StringUtil.nanAndInfiniteDoubleToNull(tousse.optDouble("weight")); String tousseNameAlias = tousse.optString("tousseNameAlias"); JSONObject obj = CssdUtils.getTousseObjForPrint( - tousseNameAlias, - tousse.optString("tousseName"), + StringUtils.isBlank(tousseNameAlias)?tousse.optString("tousseName"):tousseNameAlias, tousse.optJSONObject("tousseDefinition"), tousseInstance, arr, arrSeqNum, @@ -4451,8 +4454,7 @@ // String department = String.valueOf(departmentArray.get(i)); - JSONObject obj = CssdUtils.getTousseObjForPrint( - null,tdOfPackingTask.getName(), tdJson,tousse, subBarcodeArray, subVirtualSeqNumArray, tousseType, + JSONObject obj = CssdUtils.getTousseObjForPrint(tdOfPackingTask.getName(), tdJson,tousse, subBarcodeArray, subVirtualSeqNumArray, tousseType, packageType,packageTypeAbbreviation, sterilingType, sterilizerName, sterileFrequency, isPrintUserName, @@ -7117,7 +7119,7 @@ if(printAmount == null){ printAmount = 1; } - JSONObject result = CssdUtils.getTousseObjForPrint(ti.getTousseNameAlias(), td.getName(), tdJson,ti, + JSONObject result = CssdUtils.getTousseObjForPrint(StringUtils.isBlank(ti.getTousseNameAlias())? td.getName():ti.getTousseNameAlias(), tdJson,ti, subBarcodeArray, null, td.getTousseType(), td.getPackageType(), packageTypeAbbreviation, td.getSterilingMethod(), ti.getSterilizerName(), ti.getSterileFrequency(),