Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r23714 -r23733 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23714) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23733) @@ -104,6 +104,8 @@ import com.forgon.log.service.LogManager; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; +import com.forgon.system.activity.model.Activity; +import com.forgon.system.activity.model.AmountControl; import com.forgon.tools.BeanUtils; import com.forgon.tools.MathTools; import com.forgon.tools.SpringBeanManger; @@ -1189,6 +1191,7 @@ } @Override + @Activity(name = AmountControl.RECYCLING) public void save(RecyclingContext recyclingContext){ RecyclingRecord recyclingRecord = getForUpdate(recyclingContext.getId()); if(recyclingRecord == null){ @@ -1290,7 +1293,8 @@ } } @Override - public synchronized void save(RecyclingRecord record, RecyclingContext recyclingContext) { + @Activity(name = AmountControl.RECYCLING) + public void save(RecyclingRecord record, RecyclingContext recyclingContext) { JSONObject params = recyclingContext.getJsonParamObject(); boolean autoReturnTheBorrowingTousse = recyclingContext.getAutoReturnTheBorrowingTousse(); //放入篮筐的物品