diff --git a/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java index 748bfbb..1fe54fb 100644 --- a/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java +++ b/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java @@ -6,10 +6,7 @@ import com.huaheng.api.wcs.domain.WcsTask; import com.huaheng.common.constant.HttpConstant; import com.huaheng.common.constant.QuantityConstant; import com.huaheng.common.exception.service.ServiceException; -import com.huaheng.common.utils.StringUtils; -import com.huaheng.common.utils.http.HttpUtils; import com.huaheng.common.utils.restful.RestUtil; -import com.huaheng.framework.aspectj.lang.annotation.ApiLogger; import com.huaheng.framework.web.domain.AjaxResult; import com.huaheng.framework.web.domain.WcsAjaxResult; import com.huaheng.framework.web.service.ConfigService; @@ -29,10 +26,12 @@ public class TaskCancelServiceImpl implements TaskCancelService { @Resource private ConfigService configService; - /**取消任务 + /** + * 取消任务 * 1、判断参数是否为空 * 2、转换实体 * 3、发送数据 + * * @param id * @return */ @@ -40,7 +39,7 @@ public class TaskCancelServiceImpl implements TaskCancelService { public AjaxResult cancelTask(String id, String warehouseCode, String area) { //1、判断参数是否为空 - if(id == null){ + if (id == null) { throw new ServiceException("任务号为空"); } @@ -51,13 +50,13 @@ public class TaskCancelServiceImpl implements TaskCancelService { //3、发送数据 String value = configService.getKey(QuantityConstant.RULE_CONNECT_WCS); int connectWCS = Integer.parseInt(value); - if(connectWCS == QuantityConstant.RULE_WCS_CONNECT) { + if (connectWCS == QuantityConstant.RULE_WCS_CONNECT) { String url = addressService.selectAddress(QuantityConstant.ADDRESS_WCS_TASK_CANCEL, warehouseCode, area); String jsonParam = JSON.toJSONString(wcsTask); ResponseEntity<JSONObject> result = RestUtil.request_post(url, warehouseCode, jsonParam); if (result != null && result.getBody() != null) { String code = result.getBody().getString("code"); - String msg = result.getBody().getString("message"); + String msg = result.getBody().getString("msg"); if (Integer.parseInt(code) != HttpConstant.OK) { return AjaxResult.error(msg); } @@ -66,7 +65,7 @@ public class TaskCancelServiceImpl implements TaskCancelService { } String data = String.valueOf(result.getBody()); WcsAjaxResult ajaxResult = JSON.parseObject(data, WcsAjaxResult.class); - if(ajaxResult.hasErr()){ + if (ajaxResult.hasErr()) { return AjaxResult.error(ajaxResult.getMessage()); } return AjaxResult.success();