自动化立体仓库 - WMS系统
#
1
昨天 235521258c79edb6c71ccd6b935fa7e856454856
#
2个文件已修改
22 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -413,15 +414,29 @@
    public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
                                        @RequestBody TaskAgvReportParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
//        auth(appkey, param, request);
        // 日志记录
        ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
        apiLogService.save(
                "AGV上报接收",
                "/open/asrs/agv/task/v1/agvCallback",
                null,
                request.getRemoteAddr(),
                JSON.toJSONString(param),
                null,
                true
        );
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getReqCode())) {
            return R.error("WMS任务号[reqCode]不能为空");
        }
        String reqCode = param.getReqCode();
        String[] split = reqCode.split("-");
        if (Cools.isEmpty(param.getTaskCode())) {
            return R.error("WMS任务号[reqCode]不能为空");
        }
        String taskCode = param.getTaskCode();
        String[] split = taskCode.split("-");
        param.setTaskNo(Integer.parseInt(split[0]));
//        if (Cools.isEmpty(param.getTimestamp())) {
//            return R.error("RGV任务号[timestamp]不能为空");
src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java
@@ -10,6 +10,7 @@
    //WMS任务号
    private int taskNo;
    private String reqCode;
    private String taskCode;
    //RGV任务号
    private Long timestamp;
    //