Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java =================================================================== diff -u -r24779 -r24784 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java (.../PackingTableManager.java) (revision 24779) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java (.../PackingTableManager.java) (revision 24784) @@ -434,11 +434,21 @@ } } } -// DateTools.fomatDate(sourceDatePatten, destinationDatePatten, dateString) -// new SimpleDateFormat( -// "yyyy-MM-dd HH:mm:ss").format(date) - retObj.put("operationTime", tousseInstance.getOperationTime()); - retObj.put("reviewTime", tousseInstance.getReviewTime()); + String operationTimeHHMM = ""; + String reviewTimeHHMM = ""; + Date operationTime = tousseInstance.getOperationTime(); + Date reviewTime = tousseInstance.getReviewTime(); + if(operationTime != null){ + operationTimeHHMM = new SimpleDateFormat( + "HH:mm").format(operationTime); + } + if(reviewTime != null){ + reviewTimeHHMM = new SimpleDateFormat( + "HH:mm").format(reviewTime); + } + + retObj.put("operationTimeHHMM", operationTimeHHMM); + retObj.put("reviewTimeHHMM", reviewTimeHHMM); } } totalAmount = materialAmount + diposableGoodsAmount; Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r24691 -r24784 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 24691) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 24784) @@ -132,6 +132,8 @@ }); DWREngine.setAsync(true); } + tousseObj.operationTimeHHMM = jsonObj.operationTimeHHMM; + tousseObj.reviewTimeHHMM = jsonObj.reviewTimeHHMM; setMaterialsByMaterialObjForPrint(tousseObj,jsonObj); return jsonObj; }