#1

dubin

2025-12-16 f8ee1bea8543296792f23489d142e8b3231cd66c

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

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StatusParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -17,6 +18,7 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.param.SearchEmptyParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +72,10 @@
    private String url;
    @Value("${wcs-slave.loc}")
    private String loc;
    @Value("${wcs-slave.warehouse}")
    private String warehouse;

    //全板入库
    @PostMapping("/fromwcs/inware-task")
    @ResponseBody
    public synchronized Re getLocNo(@RequestBody SearchLocParam param) {
@@ -81,6 +86,12 @@
        if (Cools.isEmpty(param.getFromPort())) {
            return Re.error("源站编号不能为空");
        }
        if(Cools.isEmpty(param.getWarehouse())){
            return Re.error("仓库编号不能为空");
        }
        if(!param.getWarehouse().equals(warehouse)){
            return Re.error("仓库编号不匹配");
        }
        List<WaitPakin> waitPakins = null;
        if (param.getFromPort().equals("101")) {

@@ -90,7 +101,7 @@
                return Re.error("有空板出库到100站时时禁止入库");
            }

            if (Cools.isEmpty(param.getBarCode()) && param.getIoType() != 10) {
            if (Cools.isEmpty(param.getBarCode())) {
                return Re.error("条码不能为空");
            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarCode()));
@@ -128,20 +139,49 @@
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;

        //全板入库
        param.setIoType(1);

        switch (param.getIoType()) {
            case 1://满托盘入库
                assert waitPakins != null;
                dto = startupFullPutStore(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, waitPakins);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
                break;
//            case 10://空托盘入库
//                dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
//                break;
            default:
                break;
        }
        log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarCode());
        return Re.ok();
    }

    @PostMapping("/fromwcs/empty-pallet-task")
    @ResponseBody
    public synchronized Re getLocNo(@RequestBody SearchEmptyParam param) {
        log.info("收到WCS空板入库接口请求====>>入参:{}", param);
        if(Cools.isEmpty(param.getWarehouse())){
            return Re.error("仓库编号不能为空");
        }
        if(!param.getWarehouse().equals(warehouse)){
            return Re.error("仓库编号不匹配");
        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;

//        dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto);
        dto = startupFullPutStore(Integer.valueOf(param.getFromPort()), null, locTypeDto, null);
        log.info("WCS入库接口返参:{},托盘码:{}", dto);
        return Re.ok();
    }



    @PostMapping("/auto/emptyIn/v1")
    @ResponseBody
@@ -201,9 +241,14 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
//        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        WaitPakin waitPakin1 = waitPakins.get(0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
        findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());

//        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
        if (dto == null) {
            throw new CoolException("没有检索到空库位");
        }
@@ -232,6 +277,8 @@
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(waitPakin1.getModiUser());
        wrkMast.setAppeUser(waitPakin1.getAppeUser());
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
@@ -279,7 +326,7 @@
    }

    @Transactional
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
@@ -301,7 +348,6 @@
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setBarcode(barcode);
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(new Date());
@@ -422,8 +468,10 @@
                    throw new CoolException("修改库位状态失败");
                }
                wrkMast.setWrkSts(14L);//14.已出库未确认
            } else if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
            } else if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && statusParam.getTaskStatus() != 8) {
                wrkMast.setWrkSts(7L);//7.出库完成
            } else if (wrkMast.getWrkSts() == 7 && statusParam.getTaskStatus() == 8){
                wrkMast.setWrkSts(15L);//15.出库更新完成，任务结束
            }
        }
        wrkMastService.updateById(wrkMast);
@@ -446,16 +494,41 @@
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
        List<HashMap<String, Object>> mapList = new ArrayList<>();
        for (LocMast locMast : locMasts) {
            if (locMast.getLev1() != 4) {
            if (locMast.getLocSts() != "X" && locMast.getLocSts() != "G" ) {
                HashMap<String, Object> map = new HashMap<>();
                map.put("warehouse", "ddth");
                map.put("posiX", locMast.getRow1());
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());
                map.put("cargoNo", locMast.getLocNo());
                map.put("type", "0");
                if(locMast.getLev1() == 1 && locMast.getRow1() == 8 && locMast.getBay1() == 1){
                    map.put("type", "6");
                }else {
                    map.put("type", "0");
                }
                mapList.add(map);
            }
            if(locMast.getLocSts() == "G"){
                HashMap<String, Object> map = new HashMap<>();
                map.put("warehouse", "ddth");
                map.put("posiX", locMast.getRow1());
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());
                map.put("cargoNo", locMast.getLocNo());
                map.put("type", "1");
                mapList.add(map);
            }
            if(locMast.getLocSts() == "X"){
                HashMap<String, Object> map = new HashMap<>();
                map.put("warehouse", "ddth");
                map.put("posiX", locMast.getRow1());
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());
                map.put("cargoNo", locMast.getLocNo());
                map.put("type", "5");
                mapList.add(map);
            }

        }
        if (mapList.size() > 0) {
            String response = "";