Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r40694 -r40701 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 40694) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 40701) @@ -1972,12 +1972,32 @@ System.out.println(containerInfos.toString()); assertEquals(2,containerInfos.size()); } + /** + * 回收记录(经过回收的)的装配任务 + */ @Test public void testUpdateUrgentLevelOfPackingTask(){ JSONObject retObj = new JSONObject(); + + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + InvoicePlan ip = new InvoicePlan(); + objectDao.saveOrUpdate(ip); + TousseItem ti = new TousseItem(); + ti.setInvoicePlan(ip); + ti.setTousseDefinitionId(td_Test开胸包.getId()); + objectDao.saveOrUpdate(ti); + List applicationItems = new ArrayList(); + applicationItems.add(ti); + ip.setApplicationItems(applicationItems); + RecyclingRecord recyclingRecord = new RecyclingRecord(); + recyclingRecord.setRecyclingApplication(ip); + objectDao.saveOrUpdate(recyclingRecord); PackingTask pt = new PackingTask(); pt.setAmount(10); pt.setUnPackAmount(10); + pt.setSourceId(recyclingRecord.getId()); + pt.setTousseDefinition(td_Test开胸包); + pt.setTaskType(PackingTask.TASK_RECYCLINGRECORD); objectDao.save(pt); UrgentLevel ul = new UrgentLevel(); @@ -1994,10 +2014,54 @@ retObj.put("success", false); retObj.put("message", e.getMessage()); } - assertEquals(2,pt.getUrgentAmount().intValue()); - assertNotNull(pt.getUrgentLevelObj()); + assertEquals("装配任务的加急数量为2个",2,pt.getUrgentAmount().intValue()); + assertNotNull("装配任务有加急对象", pt.getUrgentLevelObj()); + assertNotNull("申请项联动加急", ti.getUrgentLevelObj()); } + /** + * 申请单(不经过回收的) + */ @Test + public void testUpdateUrgentLevelOfPackingTask2(){ + JSONObject retObj = new JSONObject(); + + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + InvoicePlan ip = new InvoicePlan(); + objectDao.saveOrUpdate(ip); + TousseItem ti = new TousseItem(); + ti.setInvoicePlan(ip); + ti.setTousseDefinitionId(td_Test开胸包.getId()); + objectDao.saveOrUpdate(ti); + List applicationItems = new ArrayList(); + applicationItems.add(ti); + ip.setApplicationItems(applicationItems); + PackingTask pt = new PackingTask(); + pt.setAmount(10); + pt.setUnPackAmount(10); + pt.setSourceId(ip.getId()); + pt.setTousseDefinition(td_Test开胸包); + pt.setTaskType(PackingTask.TASK_APPLICATION); + objectDao.save(pt); + + UrgentLevel ul = new UrgentLevel(); + ul.setGrade(1); + objectDao.save(ul); + Long packingTaskId = pt.getId(); + Long urgentLevelId = ul.getId(); + int urgentAmount = 2; + try { + packingManager.updateUrgentLevelOfPackingTask(packingTaskId, urgentAmount, urgentLevelId); + retObj.put("success", true); + } catch (Exception e) { + e.printStackTrace(); + retObj.put("success", false); + retObj.put("message", e.getMessage()); + } + assertEquals("装配任务的加急数量为2个",2,pt.getUrgentAmount().intValue()); + assertNotNull("装配任务有加急对象", pt.getUrgentLevelObj()); + assertNotNull("申请项联动加急", ti.getUrgentLevelObj()); + } + @Test public void testUpdateDeliverStatusOfInvoicePlanWhenPackingSplit(){ ForeignTousseApplication foreignTousseApplication = new ForeignTousseApplication(); foreignTousseApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);