Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

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

@@ -1,13 +1,14 @@
package com.zy.asrs.controller;

import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvMobileService;
import com.zy.asrs.service.AgvWorkService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -32,6 +33,8 @@
    private AgvBasDevpService agvBasDevpService;
    @Autowired
    private AgvWorkService workService;
    @Autowired
    private OrderDetlService orderDetlService;


    /*
@@ -67,21 +70,26 @@
    }

    /*
    获取输送线站点
     */
    @PostMapping("/getBasDevp/noCacheShelves/auth")
    public R getBasDevpByNoCacheShelves(){
        return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
    }

    /*
    启动入库，生成工作档
     */
    @PostMapping("/pakin/auth")
    @Synchronized
    public R pakin(@RequestBody Map<String,Object> map){
        List<String> devNos = (List<String>) map.get("devNo");

        List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
            AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
            if (!"F".equals(agvBasDevp.getLocSts())) {
                throw new CoolException("当前站点货位状态不为F.在库，请重新选择");
            }
            return agvBasDevp;
            return agvBasDevpService.selectById(devNo);
        }).collect(Collectors.toList());

        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
        
        return R.ok("生成工作档成功");
    }