Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.23_20210917_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r31908 -r32071
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31908)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 32071)
@@ -1333,7 +1333,34 @@
 		JsonObject params2 = (JsonObject)new JsonParser().parse(params.toString());
 		//pda发货计划扫描核对员、下送责任人限制只能扫描当前登录用户的当前所属科室的用户
 		params2.addProperty("limitScanBelongsToCurrentLoginUserOrgs", true);
-		return addIsRoutineInfo(invoiceManager.getInfoByBarcodeForInvoiceScan(params2)).toString();
+		try{
+			JsonObject invoiceScanResult = invoiceManager.getInfoByBarcodeForInvoiceScan(params2);
+			//如果有开启enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems配置项时(DGSETYY-9)
+			if(CssdUtils.getSystemSetConfigByNameBool("enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems")){
+				boolean success = invoiceScanResult.get(JSONUtil.JSON_KEY_SUCCESS).getAsBoolean();
+				if(!success){
+					//请求是否成功
+					invoiceScanResult.addProperty(JSONUtil.JSON_KEY_SUCCESS, true);
+					//业务是否成功
+					invoiceScanResult.addProperty("businessSuccess", false);
+					JsonElement errorJsonElement = invoiceScanResult.get("error");
+					if(errorJsonElement != null && !errorJsonElement.isJsonNull()){
+						invoiceScanResult.addProperty(JSONUtil.JSON_KEY_MESSAGE, errorJsonElement.getAsString());
+					}
+				}
+			}
+			String result = addIsRoutineInfo(invoiceScanResult).toString();
+			return result;
+		}catch(RuntimeException e){
+			e.printStackTrace();
+			JSONObject result = JSONUtil.buildJsonObject(false, e.getMessage());
+			//如果有开启enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems配置项时(DGSETYY-9)
+			if(CssdUtils.getSystemSetConfigByNameBool("enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems")){
+				JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, true);
+				JSONUtil.addProperty(result, "businessSuccess", false);
+			}
+			return result.toString();
+		}
 	}
 	public String getInfoByBarcode_ExpressInvoice(JSONObject params){
 		JsonObject params2 = (JsonObject)new JsonParser().parse(params.toString());
@@ -1445,7 +1472,8 @@
 //				//没有启用,不做处理,pda端对应属性有默认值
 //				return json;
 //			}
-			String itemType = json.get("type").getAsString();
+			JsonElement typeJsonElement = json.get("type");
+			String itemType = (typeJsonElement != null && !typeJsonElement.isJsonNull()) ? typeJsonElement.getAsString() : null;
 			if("tousseInstance".equals(itemType)){
 				JsonObject dataJSON = json.getAsJsonObject("data");
 				if(dataJSON != null){
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.23_20210917_v4_1_nologo_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.23_20210917_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r31628 -r32071
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 31628)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 32071)
@@ -1,7 +1,7 @@
 {
 	"success":"true",
-	"version":"4.7.22",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.22_20210713_v4_1_release.apk",
-	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.22_20210713_v4_1_nologo_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.22_20210713_v4_1_6p_release.apk",
+	"version":"4.7.23",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.23_20210917_v4_1_release.apk",
+	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.23_20210917_v4_1_nologo_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.23_20210917_v4_1_6p_release.apk",
 }
\ No newline at end of file