Fisheye: Tag 40566 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.java
===================================================================
diff -u -r40526 -r40566
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.java	(.../AllTests.java)	(revision 40526)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.java	(.../AllTests.java)	(revision 40566)
@@ -3,6 +3,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
+import test.forgon.disinfectsystem.packing.controller.PackingReviewControllerTests;
 import test.forgon.disinfectsystem.packing.service.ComboToussePackingTests;
 import test.forgon.disinfectsystem.packing.service.PackHandoverRecordManagerTests;
 import test.forgon.disinfectsystem.packing.service.PackingManagerTests;
@@ -24,10 +25,8 @@
 		TousseInstanceReviewManagerTests.class,
 		PackingManagerTests.class,
 		PackHandoverRecordManagerTests.class,
-		ComboToussePackingTests.class
-		//,
-		//TODO: PackingReviewControllerTests.class,
-		//TODO: PackingControllerTests.class
+		ComboToussePackingTests.class,
+		PackingReviewControllerTests.class
 		})
 public class AllTests {
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
===================================================================
diff -u -r40515 -r40566
--- ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js	(.../config.js)	(revision 40515)
+++ ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js	(.../config.js)	(revision 40566)
@@ -224,7 +224,7 @@
   //自定义装配界面是否显示选择申请科室
   selectDepartInCustomPacking:true,
   //使用记录转换申请单后的合并规则
-  useRecordConvertRecyclingApplicationMergeRegular:'operationRoom',
+  useRecordConvertRecyclingApplicationMergeRegular:'depart',
   //是否启用异常物品列表功能
   isUseAbnormalGoodsTable:true,
   //自定义入筐界面,材料的一键入筐功能
@@ -419,6 +419,8 @@
 	 enableTousseTournoverDaysStatisticsReport:true,
 	 tousseMaterialsLostMustConfirm:true,
 	 enableReduceSendAmountAfterTerminatePackAmountFunction:true,
+	 //开启通过模糊查询后4位清洗篮筐条码查询装配任务
+	 enableFuzzySearchCleaningBasketFunction:true,
 	 //启用RFID标签形式的标识牌
 	 //enableRFIDTousseIdCard:true,
 	 //
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java
===================================================================
diff -u -r40523 -r40566
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java	(.../PackingReviewControllerTests.java)	(revision 40523)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java	(.../PackingReviewControllerTests.java)	(revision 40566)
@@ -1,104 +1,28 @@
 package test.forgon.disinfectsystem.packing.controller;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.junit.Assert.*;
-
-
-import java.util.Calendar;
-
+import static org.junit.Assert.assertNotNull;
 import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.junit.Before;
 import org.junit.Test;
 
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
-import com.forgon.tools.json.JSONUtil;
 
 
-
 /**
  * @author Terry Kwan 2018年9月25日 下午20:00:02
  * 
  *
  */
 public class PackingReviewControllerTests extends AbstractCSSDTest{
 	
-	private MockMvc mockMvc;
-	@Before
-	public void setUp() throws Exception {
-        DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(webApplicationContext);
-        mockMvc = builder.build();
-	}
-
-	//@Test TODO: 先注释 @Testorg.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter': Instantiation of bean failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter]: Constructor threw exception; nested exception is java.util.ServiceConfigurationError: java.nio.charset.spi.CharsetProvider: Provider com.ibm.mq.jmqi.CustomCharsetProvider not a subtype
+	@Test 
 	public void testGetFromBasket() {
 		try {
-
-			ResultActions resultActions = mockMvc
-					.perform(
-							get(
-									"/disinfectSystem/packingReviewController/getFromBasket")
-									.param("basketBarcode", "018000001"))
-					.andDo(print()).andExpect(status().isOk());
-
-			MvcResult result = resultActions.andReturn();
-			String contentAsString = result.getResponse().getContentAsString();
-
-			JSONObject jsonObj = JSONUtil.fromJson(contentAsString,
-					JSONObject.class);
-
-			assertEquals(true, jsonObj.getBoolean("success"));
-
-			JSONArray data = jsonObj.getJSONArray("data");
+			JSONArray data = tousseInstanceManager.getFromBasket("018000001",null);
 			assertNotNull(data);
-
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
-	
-	//@Test TODO: 先注释 @Testorg.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter': Instantiation of bean failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter]: Constructor threw exception; nested exception is java.util.ServiceConfigurationError: java.nio.charset.spi.CharsetProvider: Provider com.ibm.mq.jmqi.CustomCharsetProvider not a subtype
-	public void testReviewTousseInstance() {
-		try {
-			Calendar calendar = Calendar.getInstance();
-			ResultActions resultActions = mockMvc
-					.perform(
-							get(
-									"/disinfectSystem/packingReviewController/reviewTousseInstance")
-									.param("tousseIds",
-											"012000001;012000002;012000003")
-									.param("sterileBasketBarcode", "018000001")
-									.param("reviewerName", "cssduser1全名")
-									.param("reviewerCode", "0100001001")
-									.param("sterileDate", calendar.getTimeInMillis() + ""))
-
-					.andDo(print()).andExpect(status().isOk());
-
-			MvcResult result = resultActions.andReturn();
-			String contentAsString = result.getResponse().getContentAsString();
-
-			JSONObject jsonObj = JSONUtil.fromJson(contentAsString,
-					JSONObject.class);
-
-
-			assertEquals(false, jsonObj.getBoolean("success"));
-			assertEquals("没有要审核的包", jsonObj.getString("message"));
-			
-	
-			// TODO:自定义装配一个器械包，该包的状态为待审核，然后进行相关的断言
-			
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 }