Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

昨天 e596214d84efa77d0cf316563548f1b1d7643a37

 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;
@@ -243,16 +244,23 @@
        if (Cools.isEmpty(param.getUpc())) {
            return R.error("UPC[upc]不能为空");
        }
        if (Cools.isEmpty(param.getSupplier())) {
            return R.error("货源[supplier]不能为空");
        if (Cools.isEmpty(param.getItem())) {
            return R.error("UPC[item]不能为空");
        }
//        if (Cools.isEmpty(param.getSupplier())) {
//            return R.error("货源[supplier]不能为空");
//        }
        if (Cools.isEmpty(param.getStaNo())) {
            return R.error("分拣点位[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getBindingTags())) {
            return R.error("分拣绑定类别[bindingTags]不能为空");
        }
        openService.taskArmReport(param);
        try{
            openService.taskArmReport(param);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok();
    }

@@ -402,20 +410,37 @@


    /**
     * 分拣线上报接收
     * AGV上报接收
     */
    @PostMapping("/agv/task/v1")
    @PostMapping("/agv/task/v1/agvCallback")
    @AppAuth(memo = "AGV上报接收")
    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.getTaskNo())) {
            return R.error("WMS任务号[taskNo]不能为空");
        if (Cools.isEmpty(param.getReqCode())) {
            return R.error("WMS任务号[reqCode]不能为空");
        }
        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]不能为空");
//        }