Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java =================================================================== diff -u -r23614 -r23722 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java (.../PackingController.java) (revision 23614) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java (.../PackingController.java) (revision 23722) @@ -23,8 +23,6 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.security.service.OperationManager; -import com.forgon.system.activity.model.Activity; -import com.forgon.system.activity.model.AmountControl; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ResponseUtils; import com.forgon.util.ExtGridUtils; @@ -108,7 +106,6 @@ this.idCardInstanceManager = idCardInstanceManager; } - @Activity(name = "装配", amountControl = AmountControl.PACKING) @RequestMapping(value="/packingTousse") public void packingTousse(@RequestParam("packingParams") String params,HttpServletRequest request, HttpServletResponse response) { Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r23713 -r23722 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 23713) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 23722) @@ -130,6 +130,8 @@ import com.forgon.security.service.OperationManager; 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.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.timeout.model.TimeoutSetting; @@ -3047,6 +3049,7 @@ } @Override + @Activity(name = AmountControl.PACKING) public String packingTousse_TRANS_REQUIRED(String params,HttpSession session) { return packingTousse_internal(params, session); } @@ -3891,7 +3894,7 @@ packageType, sterilingType, sterilizerName, sterileFrequency); // if(true){ // throw new RuntimeException("装配速度测试 "); -// } +// } return json.toString(); }