#

whycq

2024-04-16 114657d034c80ca40f08d767a71d169c34bde0b5

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

@@ -11,7 +11,7 @@
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;
@@ -25,6 +25,8 @@

    @Autowired
    AgvWrkMastService agvWrkMastService;
    @Autowired
    AgvWaitPakinService agvWaitPakinService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -155,25 +157,30 @@
        return R.ok();
    }

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

        AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();

//        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());

        return R.ok();
    }
//    @RequestMapping(value = "/wrkMast/startWrk/auth")
//    @ManagerAuth(memo = "工作档开始任务")
//    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");
//
//        int code = agvWrkMastService.containerMoveIn(agvWrkMastList);
//
//        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.error("任务启动失败");
//
//    }
}