Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r21535 -r21541 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 21535) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 21541) @@ -3044,7 +3044,7 @@ @SuppressWarnings("unchecked") @Override public String batchSignTousseInstanceByBarcode(String barcode) { - String msg = "扫描的条码不存在,或暂未发货"; + String msg = "该条码下暂无已发货的包"; String objStr = ""; boolean isSuccess = false; JSONObject json = new JSONObject(); @@ -3081,13 +3081,12 @@ //签收成功 if(msg == null){ arr.add(TousseInstanceUtils.tousseInstance2JsonString(dateFormat, dateFormat2, ti)); - isSuccess = true; }else{//失败 - isSuccess = false; + throw new RuntimeException(msg); } } //成功返回数据 - json.put("success", isSuccess); + json.put("success", true); json.put("msg", msg); json.put("arr", arr); json.put("signType", signType); @@ -3113,11 +3112,13 @@ public List getTousseInstanceBySignType(String signType ,String barcode){ if(StringUtils.isNotBlank(signType) && StringUtils.isNotBlank(barcode) ){ ResultSet rs = objectDao.executeSql(getTousseInstanceSqlBySignType(barcode)); + StringBuffer sb = new StringBuffer(); try { while(rs.next()){ sb.append(rs.getString("id")+","); } + } catch (SQLException e) { e.printStackTrace(); } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r21536 -r21541 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 21536) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 21541) @@ -218,8 +218,13 @@ */ public void signTousseInstanceByBarcode(){ String barcode = StrutsParamUtils.getPraramValue("barcode", null); - String result = tousseInstanceManager.batchSignTousseInstanceByBarcode(barcode); - + String result = ""; + try { + result = tousseInstanceManager.batchSignTousseInstanceByBarcode(barcode); + } catch (RuntimeException e1) { + e1.printStackTrace(); + StrutsResponseUtils.output(JSONUtil.buildJsonObject(false, e1.getMessage())); + } HttpServletResponse response = StrutsParamUtils.getResponse(); response.setCharacterEncoding("UTF-8"); PrintWriter out; Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp =================================================================== diff -u -r21540 -r21541 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 21540) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 21541) @@ -284,8 +284,14 @@ } loadTodaySignedTousse(); }else{ - speaker.speak(data.msg); - alertDiv(data.msg); + if(typeof(data.message)=="undefined"){ + speaker.speak(data.msg); + alertDiv(data.msg); + }else{ + speaker.speak(data.message); + alertDiv(data.message); + } + } }, error: function(x, t, m) { Index: ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.js =================================================================== diff -u -r21535 -r21541 --- ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.js (.../signRecord.js) (revision 21535) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.js (.../signRecord.js) (revision 21541) @@ -115,19 +115,6 @@ $("#table_server").bootstrapTable('refresh', opt); } -function resetSignRecord() { - var opt = { - url : WWWROOT - + '/disinfectSystem/signRecordAction!getSignRecordByDate.do?time=' - + new Date(), - silent : true, - query : { - beginDate : new Date(), - endDate : new Date() - } - }; - $("#table_server").bootstrapTable('refresh', opt); -} // 点击“查看详情”按钮时,打开器械包的table function changeTable(signRecordId) {