#

zyx

2024-04-11 42b697ac9b5d04d884296d28daf6082487e62984

 src/main/java/com/zy/common/web/WcsController.java

@@ -15,20 +15,18 @@
import com.zy.common.service.CommonService;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;

import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;

/**
 * Created by vincent on 2020/10/30
@@ -577,6 +575,8 @@
     */
    @PostMapping("/start")
    @ResponseBody
    @Transactional
    @Synchronized
    public R start(@RequestBody ReplenishmentParam param){
        log.info("start param: " + param.toString());
        String containerCode = param.getContainerCode();
@@ -630,6 +630,8 @@
    @PostMapping("/current/containerCode")
    @ResponseBody
    public R move(@RequestBody ReplenishmentParam param){

        log.info("current containerCode: " + param.toString());

        if(Cools.isEmpty(currentContainerMap)){
            currentContainerMap = new HashMap<>();
@@ -685,11 +687,20 @@
    @ResponseBody
    public R containerMove(@RequestBody ReplenishmentParam param){

        String devNo = param.getDevNo();
        if(Cools.isEmpty(currentContainerMap)){
            currentContainerMap = new HashMap<>();
        String devNo = Cools.eq("CS-310",param.getDevNo()) ? "310-1" : Cools.eq("CS-311",param.getDevNo()) ? "312-2" : Cools.eq("CS-312",param.getDevNo()) ? "314-1" : Cools.eq("CS-313",param.getDevNo()) ? "316-1" : null;

        if(Cools.isEmpty(devNo)){
            return R.error("站点有误");
        }
        String containerCode = currentContainerMap.get(devNo);

        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
        String containerCode = agvBasDevp.getBarcode();

//        String devNo = param.getDevNo();
//        if(Cools.isEmpty(currentContainerMap)){
//            currentContainerMap = new HashMap<>();
//        }
//        String containerCode = currentContainerMap.get(devNo);

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();