#

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
@@ -497,21 +495,21 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        Date now = new Date();
        for (LocDetl locDetl : locDetls) {
            locDetl.setLocNo(dto.getLocNo());//修改目标库位
            locDetl.setAppeTime(now);
            locDetl.setModiTime(now);
            if (!locDetlService.insert(locDetl)) {
                throw new CoolException("库存明细更新失败");
            }
        }
//        Date now = new Date();
//        for (LocDetl locDetl : locDetls) {
//            locDetl.setLocNo(dto.getLocNo());//修改目标库位
//            locDetl.setAppeTime(now);
//            locDetl.setModiTime(now);
//            if (!locDetlService.insert(locDetl)) {
//                throw new CoolException("库存明细更新失败");
//            }
//        }

        //检查目标库位，库存明细是否添加成功
        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
        if (checkLocDetls.isEmpty()) {
            throw new CoolException("库存明细迁移失败");
        }
//        //检查目标库位，库存明细是否添加成功
//        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
//        if (checkLocDetls.isEmpty()) {
//            throw new CoolException("库存明细迁移失败");
//        }

//        //清空源库位数据
        LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
@@ -577,8 +575,10 @@
     */
    @PostMapping("/start")
    @ResponseBody
    @Transactional
    @Synchronized
    public R start(@RequestBody ReplenishmentParam param){

        log.info("start param: " + param.toString());
        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
@@ -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,8 +687,20 @@
    @ResponseBody
    public R containerMove(@RequestBody ReplenishmentParam param){

        String devNo = param.getDevNo();
        String containerCode = currentContainerMap.get(devNo);
        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("站点有误");
        }

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

@@ -723,10 +737,10 @@
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
        }

        System.out.println("currentContainerMap: " + currentContainerMap);
        //System.out.println("currentContainerMap: " + currentContainerMap);


        System.out.println("agvBasDevpDto: " + agvBasDevpDto);
        //System.out.println("agvBasDevpDto: " + agvBasDevpDto);

        return R.ok(agvBasDevpDto);
    }