Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r35712 -r36611 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 35712) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 36611) @@ -1583,17 +1583,32 @@ List tds = objectDao.findByHql("select po from " + TousseDefinition.class.getSimpleName() +" po where po.name in('Test开胸包','Test开口包') "); + TousseDefinition tdTest开胸包 = null; + TousseDefinition tdTest开口包 = null; for (TousseDefinition td : tds) { ids.add(td.getId().toString()); + if("Test开胸包".equals(td.getName())){ + tdTest开胸包 = td; + }else if("Test开口包".equals(td.getName())){ + tdTest开口包 = td; + } } + PackingTask pt = new PackingTask(); + pt.setDepartCoding("testNeike"); + pt.setTousseDefinition(tdTest开胸包); + + PackingTask pt2 = new PackingTask(); + pt2.setDepartCoding("testNeike"); + pt2.setTousseDefinition(tdTest开口包); + objectDao.save(pt); + objectDao.save(pt2); try { JSONArray infoArr = packingManager.verifyTousseCanBeAggregated(ids); retObj = JSONUtil.buildJsonObject(true,infoArr); } catch (Exception e) { e.printStackTrace(); retObj = JSONUtil.buildJsonObject(false,e.getMessage()); } - System.out.println(retObj.toString()); assertEquals(retObj.optBoolean("success"), true); JSONArray data = retObj.optJSONArray("data"); assertEquals(2, data.size());