初始化

zwl

昨天 16ed2e0fee6c7e99b68d02bea6a54970d1ecf081

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -121,7 +121,7 @@
            HashMap<String, Object> r = new HashMap<>();

            if (param.getStereoscopicTaskType() == 1) {
                //出库任务创建
                //入库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no", 1)
                        .eq("crn_no", locMast.getCrnNo())
@@ -173,26 +173,31 @@
                map.put("ErrorMessage", "任务类型为空！");
                return map;
            }
            String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
            param.setStartPoint(fusion);
            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
            if (Cools.isEmpty(locMast)) {
                map.put("ReturnStatus", 1);
                map.put("ErrorMessage", "初始库位无法找到！");
                return map;
            if (param.getStereoscopicTaskType() == 2) {
                String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
                param.setStartPoint(fusion);
                LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
                if (Cools.isEmpty(locMast)) {
                    map.put("ReturnStatus", 1);
                    map.put("ErrorMessage", "初始库位无法找到！");
                    return map;
                }
            }else if (param.getStereoscopicTaskType() == 1){
                String fusion = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
                param.setStartPoint(fusion);
            }

            HashMap<String, Object> r = new HashMap<>();

            if (param.getStereoscopicTaskType() == 2) {
            HashMap<String, Object> r = new HashMap<>();
            if (param.getStereoscopicTaskType() <= 2) {
                //出库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no", 2)
                        .eq("crn_no", locMast.getCrnNo())
                        .eq("type_no", param.getStereoscopicTaskType())
                        .eq("crn_no", 1)
                        .eq("stn_no", param.getTerminalNo()));
                if (Cools.isEmpty(staDesc)) {
                    map.put("ReturnStatus", 1);
                    map.put("ErrorMessage", "出库路劲不存在！");
                    map.put("ErrorMessage", "出入库路劲不存在！");
                    return map;
                }
                r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
@@ -203,7 +208,7 @@
                String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
                param.setTerminalNo(fusion1);
                //移库任务创建
                r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
                r = openService.taskCreate(new TaskCreateParam(param, 1));
                if (r.get("ReturnStatus").equals(1)) {
                    return r;
                }