Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r31988 -r32019 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 31988) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 32019) @@ -6474,8 +6474,9 @@ } @Override - public void interfereSplitForeignTousse(String params) { + public JSONArray interfereSplitForeignTousse(String params) { + JSONArray tiJSONArray = new JSONArray(); JSONObject obj = JSONObject.fromObject(params); String applicationId = obj.optString("applicationId"); //1.根据外来器械申请单id查询外来器械申请单 @@ -6612,6 +6613,11 @@ buff.append(","); } buff.append(tousseInstance.getBarcode()); + JSONObject tiJSON = new JSONObject(); + tiJSON.put("id", tousseInstance.getId()); + tiJSON.put("tousseName", tousseInstance.getTousseName()); + tiJSON.put("barcode", tousseInstance.getBarcode()); + tiJSONArray.add(tiJSON); } updatePackingRecordInfo(splitPackages.size(),originalTousseInstance.getPackingRecord_id()); @@ -6631,6 +6637,7 @@ appLogManager.saveLog(loginUser, Log.MODEL_PACKING, "U", "ID=" + applicationId + "的外来器械申请单,将条码为" + originalTousseInstance.getBarcode()+"的器械包重新拆成条码为[" + buff.toString() + "]的小包!"); + return tiJSONArray; } /** Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java =================================================================== diff -u -r28535 -r32019 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java (.../PackingTableManager.java) (revision 28535) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java (.../PackingTableManager.java) (revision 32019) @@ -617,13 +617,16 @@ public String interfereSplitForeignTousse(String params) { boolean success = true; String msg = "保存成功!"; + JSONArray tiJSONArray = new JSONArray(); try { - packingManager.interfereSplitForeignTousse(params); + tiJSONArray = packingManager.interfereSplitForeignTousse(params); } catch (Exception e) { success = false; msg = e.getMessage(); } - return JSONUtil.buildJsonObject(success, msg).toString(); + JSONObject result = JSONUtil.buildJsonObject(success, msg); + result.put("tousses", tiJSONArray); + return result.toString(); } /** Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java =================================================================== diff -u -r30800 -r32019 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 30800) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 32019) @@ -210,7 +210,7 @@ * 干预外来器械拆包 * @param params */ - public void interfereSplitForeignTousse(String params); + public JSONArray interfereSplitForeignTousse(String params); /** * 自定义装配,传参方式待重构..