#

lsh

2024-03-07 2534c069e82ec81119eb9f2477075e389dadf625

#

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

@@ -127,6 +127,44 @@
        return R.ok().add(taskWrk);
    }

    //取放货申请
    @PostMapping("/pick/and/place/v1")
    @AppAuth(memo = "agv取放货申请")
    public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
                            @RequestBody TaskOverParam param,
                            HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStaNo())){
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())){
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV1(param);
    }

    //取放货完成反馈
    @PostMapping("/pick/and/place/v2")
    @AppAuth(memo = "agv取放货完成反馈")
    public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
                                  @RequestBody TaskOverParam param,
                                  HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStaNo())){
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())){
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV2(param);
    }

    //查询任务指令集合
    @GetMapping("/queryTaskCommand")
    public R queryTaskCommand(@RequestHeader String appkey,

 src/main/java/com/zy/asrs/entity/param/TaskOverParam.java

@@ -6,5 +6,7 @@
public class TaskOverParam {
    private String wharfCode;
    private Boolean status;
    private int staNo;
    private int type;

}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -15,4 +15,7 @@
    R AgvToWCSToWms(WMSAndAGVInterfaceParam param) throws IOException;

    void getAgvTaskOver(TaskOverParam param);

    R getAgvPickAndPlaceV1(TaskOverParam param);
    R getAgvPickAndPlaceV2(TaskOverParam param);
}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -8,10 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.ToWmsDTO;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.TaskCreateParam;
@@ -50,6 +47,8 @@
    private CommonService commonService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private BasDevpService basDevpService;



@@ -255,6 +254,40 @@

    }

    @Override
    public R getAgvPickAndPlaceV1(TaskOverParam param) {
        BasDevp basDevp = basDevpService.selectById(param.getStaNo());
        if (Cools.isEmpty(basDevp)){
            return R.error("站点号有误"+param.getStaNo());
        }
        if (param.getType()==0 && basDevp.getAgvStartPick()==1){
            return R.ok();
        }else if (param.getType()==1 && basDevp.getAgvStartPlace()==1){
            return R.ok();
        }else {
            return R.error();
        }
    }

    @Override
    public R getAgvPickAndPlaceV2(TaskOverParam param) {
        BasDevp basDevp = basDevpService.selectById(param.getStaNo());
        if (Cools.isEmpty(basDevp)){
            return R.error("站点号有误"+param.getStaNo());
        }
        if (param.getType()==0){
            basDevp.setAgvTargetPick(1);
            basDevpService.updateById(basDevp);
            return R.ok();
        }else if (param.getType()==1){
            basDevp.setAgvTargetPlace(1);
            basDevpService.updateById(basDevp);
            return R.ok();
        }else {
            return R.error("请求类型异常"+param.getType());
        }
    }

    public List<Integer> getInEnableRoadway(){
        int[] roadway = null;
        List<Integer> list = new ArrayList<>();