Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r25666 -r25685 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25666) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25685) @@ -3895,6 +3895,18 @@ validUntilDateToPrint = tousse.optString(""); sterileDateToPrint = tousse.optString(""); + Double weight = null; + String strWeight = tousse.optString("weight"); + if (StringUtils.isNotBlank(strWeight)){ + try{ + weight = Double.valueOf(strWeight); + } + catch(Exception e){ + e.printStackTrace(); + } + + } + JSONObject obj = CssdUtils.getTousseObjForPrint( tousse.optString("tousseName"), tousse.optJSONObject("tousseDefinition"), @@ -3923,7 +3935,7 @@ tousse.optInt("toolAmount"), tousse.optInt("implantAmount"),tousse.optString("department"), td.getPrintOrgSource(),0L,"","",objectDao,td.getBarcodePaperType(),tousse.optString("washOperator"),tousse.optString("washOperatorCode"), - Double.valueOf(tousse.optString("weight")),tousse.optString("remark"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse"),0); + weight,tousse.optString("remark"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse"),0); setPrintCause(currentPackingTask,obj); toussesArray.add(obj); @@ -4781,14 +4793,18 @@ tousseInstance.setTaskGroup(taskGroup); tousseInstance.setBarcode(barcodeStr); - //如果不能转换为Double,则设置为null - Double weight = null; - try { - weight = Double.valueOf(tousseWeight); - } catch (Exception e) { - e.printStackTrace(); + + // 如果页面传入的重量不为空,则进行重量属性的处理 + if (StringUtils.isNotBlank(tousseWeight)){ + //如果不能转换为Double,则设置为null + Double weight = null; + try { + weight = Double.valueOf(tousseWeight); + } catch (Exception e) { + e.printStackTrace(); + } + tousseInstance.setWeight(weight); } - tousseInstance.setWeight(weight); tousseInstance.setRemark(remark); tousseInstance.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); tousseInstance.setSterilizationUser(sterileUserName);