src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/WmsWrkCreateParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/taskCreateParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OpenService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,7 +5,7 @@ import com.core.common.Cools; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.param.WmsWrkCreateParam; import com.zy.asrs.entity.param.taskCreateParam; import com.zy.asrs.service.OpenService; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; @@ -27,17 +27,17 @@ add("ea1f0459efc02a79f046f982767939ae"); }}; //创建WMS任务 @PostMapping("/wmsWrkCreate") public R wmsWrkCreate(@RequestHeader(required = false) String appkey, @RequestBody(required = false) WmsWrkCreateParam param, //创建任务 @PostMapping("/taskCreate") public R taskCreate(@RequestHeader(required = false) String appkey, @RequestBody(required = false) taskCreateParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } if (Cools.isEmpty(param.getWmsWrkNo())) { return R.error("WMS任务号[wmsWrkNo]不能为空"); if (Cools.isEmpty(param.getTaskNo())) { return R.error("任务号[taskNo]不能为空"); } if (Cools.isEmpty(param.getIoType())) { return R.error("任务类型[ioType]不能为空"); @@ -45,7 +45,7 @@ if (Cools.isEmpty(param.getBarcode())) { return R.error("条码[barcode]不能为空"); } openService.wmsWrkCreate(param); openService.taskCreate(param); return R.ok(); } src/main/java/com/zy/asrs/entity/param/WmsWrkCreateParam.java
File was deleted src/main/java/com/zy/asrs/entity/param/taskCreateParam.java
New file @@ -0,0 +1,26 @@ package com.zy.asrs.entity.param; import lombok.Data; @Data public class taskCreateParam { //任务号 private String taskNo; //任务类型 private Integer ioType; //起点 private String startPoint; //终点 private String targetPoint; //条码 private String barcode; //备注 private String memo; } src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,10 +1,10 @@ package com.zy.asrs.service; import com.zy.asrs.entity.param.WmsWrkCreateParam; import com.zy.asrs.entity.param.taskCreateParam; public interface OpenService { //创建WMS任务 void wmsWrkCreate(WmsWrkCreateParam param); //创建任务 void taskCreate(taskCreateParam param); } src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,48 +1,50 @@ package com.zy.asrs.service.impl; import com.zy.asrs.entity.param.WmsWrkCreateParam; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.domain.enums.TaskStatusType; import com.zy.asrs.entity.TaskWrk; import com.zy.asrs.entity.param.taskCreateParam; import com.zy.asrs.service.OpenService; import com.zy.asrs.service.TaskWrkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @Service public class OpenServiceImpl implements OpenService { @Autowired private TaskWrkService taskWrkService; @Override public void wmsWrkCreate(WmsWrkCreateParam param) { // WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo()); // if (wmsWrk != null) { // throw new CoolException(param.getWmsWrkNo() + "任务已存在,请勿重复提交"); // } // // Date now = new Date(); // wmsWrk = new WmsWrk(); // wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS任务号 // wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS状态:接收 // wmsWrk.setCreateTime(now); // wmsWrk.setAppeTime(now); // wmsWrk.setAppeUser(9527L); // wmsWrk.setIoType(param.getIoType());//任务类型 // wmsWrk.setIoPri(13D);//优先级 // wmsWrk.setBarcode(param.getBarcode());//条码 // if (!Cools.isEmpty(param.getLocNo())) { // wmsWrk.setLocNo(param.getLocNo());//目标库位 // } // if (!Cools.isEmpty(param.getSourceLocNo())) { // wmsWrk.setSourceLocNo(param.getSourceLocNo());//源库位 // } // if (!Cools.isEmpty(param.getStaNo())) { // wmsWrk.setStaNo(param.getStaNo());//目标站 // } // if (!Cools.isEmpty(param.getSourceStaNo())) { // wmsWrk.setSourceStaNo(param.getSourceStaNo());//源站 // } // if (!Cools.isEmpty(param.getMemo())) { // wmsWrk.setMemo(param.getMemo());//备注 // } // // if (!wmsWrkService.insert(wmsWrk)) { // throw new CoolException("生成任务失败,请联系管理员"); // } public void taskCreate(taskCreateParam param) { TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo()); if (taskWrk != null) { throw new CoolException(param.getTaskNo() + "任务已存在,请勿重复提交"); } Date now = new Date(); taskWrk = new TaskWrk(); taskWrk.setTaskNo(param.getTaskNo());//任务号 taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态:接收 taskWrk.setCreateTime(now); taskWrk.setIoType(param.getIoType());//任务类型 taskWrk.setIoPri(13D);//优先级 taskWrk.setBarcode(param.getBarcode());//条码 if (!Cools.isEmpty(param.getStartPoint())) { taskWrk.setStartPoint(param.getStartPoint());//起点 } if (!Cools.isEmpty(param.getTargetPoint())) { taskWrk.setTargetPoint(param.getTargetPoint());//终点 } if (!Cools.isEmpty(param.getMemo())) { taskWrk.setMemo(param.getMemo());//备注 } if (!taskWrkService.insert(taskWrk)) { throw new CoolException("生成任务失败,请联系管理员"); } } }