Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r27786 -r27790
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 27786)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 27790)
@@ -46,6 +46,7 @@
 import com.forgon.disinfectsystem.basedatamanager.goodsdepartshareconfig.service.GoodsDepartShareConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionUtils;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.StorageRecordManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
@@ -6385,7 +6386,22 @@
 //									obj.put("idCardUseAmount", idCardDefinition.getUseAmount());
 //								}
 //							}
-							obj.put("idCardUseAmount", ti.getUseAmount());
+							Long useAmount = ti.getUseAmount();
+							obj.put("idCardUseAmount", useAmount);
+							boolean disableIdCard = CssdUtils.getSystemSetConfigByNameBool("disableIdCard", true);
+							if(!disableIdCard){
+								int autoDiscardCount = TousseDefinitionUtils.getAutoDiscardCount(ti.getTousseDefinition());
+								String idCardMsg = null;
+								if(useAmount == null){
+									useAmount = 0L;
+								}
+								if(autoDiscardCount == 0 || useAmount < autoDiscardCount){
+									idCardMsg = ti.getTousseName() + "第"+ useAmount +"次使用";
+								}else{
+									idCardMsg = ti.getTousseName() + "第"+ useAmount +"次使用,已达到最大使用次数"+ autoDiscardCount +",请使用后进行报废处理!";
+								}
+								obj.put("idCardMsg", idCardMsg);
+							}
 							if(older != null){
 								JSONObject json = new JSONObject();
 								json.put("barcode", older.getBarcode());