Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java =================================================================== diff -u -r35505 -r35507 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 35505) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 35507) @@ -477,10 +477,11 @@ ] } * @exception BorrowUnRecturnException 当科室供应室配置的发货参数【器械包发货时间】的值设置为【预回收后发货】且"有借物未归还是否继续"的参数不为true时,此时如果检查到有其中某一个或多个包有借物未归还完的情况,抛出此异常,并返回具体的业务消息内容 + * @param scanBarcodeInfo 扫码的条码信息 示例如:{"1140518":["0125808233"],"1140525":["0125803225"]},其中key为包定义id,value为器械包实例条码的集合 * @exception SystemException 如果有其它业务异常,抛出该异常 * @return 如果保存成功,返回{succesee:true},否则返回{succesee:false,message:"具体的消息"} */ - public JSONObject savePrepareRecyleTousse(JSONObject params); + public JSONObject savePrepareRecyleTousse(JSONObject params,String scanBarcodeInfo); /** * 检查申请单是否合法(版本号、回收状态、发货状态) Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r35506 -r35507 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 35506) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 35507) @@ -6550,7 +6550,7 @@ } @Override - public JSONObject savePrepareRecyleTousse(JSONObject params) { + public JSONObject savePrepareRecyleTousse(JSONObject params,String scanBarcodeInfo) { // TODO Auto-generated method stub return null; } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r35499 -r35507 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 35499) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 35507) @@ -446,7 +446,6 @@ return JSONUtil.buildErrorMsgJsonResult("调用异常"); } result = (String) method.invoke(this, jsonObject); - logger.debug("return result=" + result); } catch (NoSuchMethodException ex) { retException = new RuntimeException(JSONUtil.buildErrorMsgJsonResult("非法action值")); } catch (InvocationTargetException ex) { @@ -706,7 +705,9 @@ * @return */ public String savePrepareRecyleTousse(JSONObject params){ - JSONObject result = prepareRecycleTousseManager.savePrepareRecyleTousse(params); + //所扫的条码信息,格式为:{"器械包1包定义的id":["包实例1条码","包实例2条码"],"器械包2包定义的id":["包实例3条码","包实例4条码"]} + String scanBarcodeInfo = params.optString("scanBarcodeInfo"); + JSONObject result = prepareRecycleTousseManager.savePrepareRecyleTousse(params,scanBarcodeInfo); return result.toString(); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java =================================================================== diff -u -r32192 -r35507 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java (.../PrepareRecycleTousseManagerImpl.java) (revision 32192) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java (.../PrepareRecycleTousseManagerImpl.java) (revision 35507) @@ -44,7 +44,7 @@ @Autowired private RecyclingApplicationManager recyclingApplicationManager; - public JSONObject savePrepareRecyleTousse(JSONObject params){ + public JSONObject savePrepareRecyleTousse(JSONObject params,String scanBarcodeInfo){ //如果保存成功,返回{succesee:true},否则返回{succesee:false,message:"具体的消息"} //以下代码为原serviceManager实现方法的代码,现已移值到此manager实现类中,在此基础上做新增的需求内容 boolean success = false;