#

野心家

2023-10-10 ba4e5ac7bd44e0d24f480b44a94cfe8d256a86e9

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

@@ -11,12 +11,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.AgvTaskCreateParam;
import com.zy.asrs.service.AgvWaitPakinService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.*;

@RestController
@@ -25,6 +26,8 @@

    @Autowired
    AgvWrkMastService agvWrkMastService;
    @Autowired
    AgvWaitPakinService agvWaitPakinService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -157,23 +160,28 @@

    @RequestMapping(value = "/wrkMast/startWrk/auth")
    @ManagerAuth(memo = "工作档开始任务")
    public R startWrk(@RequestParam String param){
    public R startWrk(@RequestParam String param) throws IOException {
        List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class);
        if (Cools.isEmpty(agvWrkMastList)){
            return R.error();
        }
        int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");

        AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
        int code = agvWrkMastService.containerMove(agvWrkMastList);

//        agvWrkMastList.stream().map(agvWrkMast -> {
//            AgvTaskParam agvTaskParam = new AgvTaskParam();
//            AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
//            agvTaskParam.setTaskCode(agvWrkMast.getWrkNo().toString());
//            agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
//            agvTaskParam.setTaskkDescribe(agvTaskkDescribeParam);
//            agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.);
//        }).collect(Collectors.toList());
        if(code == 0){
            agvWrkMastList.forEach(agvWrkMast -> {
                //202.RCS取货中
                agvWrkMast.setWrkSts((long)202);
                //修改AGV入库通知档状态入出状态为Y
                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
            });
            agvWrkMastService.updateBatchById(agvWrkMastList);

        return R.ok();
            return R.ok("任务启动成功");
        }

        return R.error("任务启动失败");

    }
}