Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java =================================================================== diff -u -r24449 -r24503 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java (.../PackingController.java) (revision 24449) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java (.../PackingController.java) (revision 24503) @@ -6,13 +6,14 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.idcardinstance.service.IDCardInstanceManager; import com.forgon.disinfectsystem.packing.service.PackingManager; import com.forgon.disinfectsystem.packing.service.VirtualBasketNotEnoughException; @@ -31,8 +32,8 @@ * @author dandan 2018年6月16日 下午4:24:52 * */ -@Controller -@RequestMapping("/disinfectSystem/packingController") +@RestController +@RequestMapping(value="/disinfectSystem/packingController", produces = "application/json;charset=UTF-8") public class PackingController { @Autowired @@ -90,7 +91,6 @@ } @RequestMapping(value="/packingTousse") - @ResponseBody public void packingTousse(@RequestParam("packingParams") String params,HttpServletRequest request) { JSONObject json = new JSONObject(); @@ -119,4 +119,26 @@ } SpringUtils.output(json); } + @RequestMapping(value="/getErrorAndDamageCount") + public String deletePackingTask() { + String idStr = SpringUtils.getPraramValue("ids", ""); + boolean success = false; + String message = null; + try { + if (StringUtils.isNotBlank(idStr)) { + String[] str = idStr.split(";"); + for (String id : str) { + PackingTask packingTask = packingManager.get(id); + packingManager.delete(packingTask,PackingTask.DELETE_CAUSE_MANUAL); + } + success = true; + } + } catch (Exception e) { + success = false; + e.printStackTrace(); + message = e.getMessage(); + } + JSONObject json = JSONUtil.buildJsonObject(success, message); + return json.toString(); + } }