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

@@ -113,7 +113,7 @@
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWhs basWhs : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basWhs.getId());
            map.put("id", basWhs.getIdentifying());
            map.put("value", basWhs.getWhsDesc());
            result.add(map);
        }

 src/main/java/com/zy/asrs/entity/BasWhs.java

@@ -23,7 +23,7 @@
     * 编号
     */
    @ApiModelProperty(value= "编号")
    @TableId(value = "id", type = IdType.AUTO)

    private Long id;

    /**
@@ -65,6 +65,7 @@
     * 标识
     */
    @ApiModelProperty(value= "标识")
    @TableId(value = "identifying", type = IdType.AUTO)
    private String identifying;

    public BasWhs() {}

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

@@ -47,7 +47,7 @@
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private  LocDetlService locDetlService;
    private LocDetlService locDetlService;
    @Autowired
    private RowLastnoService rowLastnoService;
    @Autowired
@@ -73,7 +73,9 @@
            List<WrkMast> wrkMasts = new ArrayList<>();
            // 获取工作档数据
            WrkMast wrkMast = wrkMastService.selectById(taskNo);
            if (null == wrkMast) { return R.error(); }
            if (null == wrkMast) {
                return R.error();
            }
            wrkMasts.add(wrkMast);
            // 组装命令
            LedCommand ledCommand = new LedCommand();
@@ -122,27 +124,27 @@
                    } else {
                        total = locDetl.getAnfme();
                    }
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())){
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
                                .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                        }
                    }else {
                    } else {
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                    }
                });
@@ -154,20 +156,114 @@
            for (WrkMast wrkMast1 : wrkMasts) {
                wrkMast1.setOveMk("Y");
                wrkMast1.setModiTime(new Date());
                if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) {
                if (!wrkMastService.update(wrkMast1, new EntityWrapper<WrkMast>().eq("wrk_No", wrkMast1.getWrkNo()))) {
                    throw new CoolException("更新工作档失败");
                }
            }
        }



        Map<String,Object> map=new HashMap<String, Object>();
        map.put("to",sta);
        map.put("message",Cools.add("type", "task").add("taskList",commands));
        webSocketServer.onMessage(JSONObject.toJSONString(map),null,sta);
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("to", sta);
        map.put("message", Cools.add("type", "task").add("taskList", commands));
        webSocketServer.onMessage(JSONObject.toJSONString(map), null, sta);
        return R.ok();

    }


    @PostMapping("/led/getTask2")
    @ResponseBody
    public synchronized R getledTask2(@RequestBody Map<String, String> param) {
        String taskNo = param.get("taskNo");
        String sta = param.get("sta");
        // 命令集合
        List<LedCommand> commands = new ArrayList<>();
        if (!"0".equals(taskNo)) {

            // 工作档集合
            List<WrkMast> wrkMasts = new ArrayList<>();
            // 获取工作档数据
            WrkMast wrkMast = wrkMastService.selectById(taskNo);
            if (null == wrkMast) {
                return R.error();
            }
            wrkMasts.add(wrkMast);
            // 组装命令
            LedCommand ledCommand = new LedCommand();
            ledCommand.setWorkNo(wrkMast.getWrkNo());
            ledCommand.setIoType(wrkMast.getIoType());
            wrkMasts.add(wrkMast);
            // 出库模式
            switch (wrkMast.getIoType()) {
                case 1:
                    ledCommand.setTitle("全板入库");
                    break;
                case 10:
                    ledCommand.setTitle("空板入库");
                    break;
                case 101:
                    ledCommand.setTitle("全板出库");
                    break;
                case 103:
                    ledCommand.setTitle("拣料出库");
                    break;
                case 104:
                    ledCommand.setTitle("并板出库");
                    break;
                case 107:
                    ledCommand.setTitle("盘点出库");
                    break;
                case 110:
                    ledCommand.setTitle("空板出库");
                    ledCommand.setEmptyMk(true);
                    break;
                default:
                    break;
            }
            ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
            ledCommand.setStaNo(wrkMast.getStaNo());
            ledCommand.setBarcode(wrkMast.getBarcode());
            if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());

                wrkDetls.forEach(wrkDetl -> {
                    Double total = 0.0;
                    EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                    LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                    if (Cools.isEmpty(locDetl)) {
                        total = wrkDetl.getAnfme();
                    } else {
                        total = locDetl.getAnfme();
                    }
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
                                .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetl.getSuppCode(), orderDetl.getSku()));
                        }
                    } else {
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                    }
                });
            }
            commands.add(ledCommand);
        }
        return R.ok(commands);
    }

    @PostMapping("/led/getError")
@@ -175,14 +271,14 @@
    public synchronized R getledError(@RequestBody Map<String, String> param) {
        String sta = param.get("sta");
        String message = param.get("msg");
        if (Cools.isEmpty(sta) ) {
        if (Cools.isEmpty(sta)) {
            return R.error();
        }
        Map<String,Object> map=new HashMap<String, Object>();
        Map<String, Object> map = new HashMap<String, Object>();

        map.put("to",sta);
        map.put("message",Cools.add("type", "error").add("errMsg",message));
        webSocketServer.onMessage(JSONObject.toJSONString(map),null,sta);
        map.put("to", sta);
        map.put("message", Cools.add("type", "error").add("errMsg", message));
        webSocketServer.onMessage(JSONObject.toJSONString(map), null, sta);


        return R.ok();
@@ -191,10 +287,10 @@


    @Transactional
    public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param){
    public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param) {
        log.info("收到WCS拣料入库接口请求====>>入参:{}", param);
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("未找到任务");
        }
        StartupDto dto = new StartupDto();
@@ -204,10 +300,10 @@
                .eq("stn_no", 31002) // 作业站点 = 拣料出库的目标站
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)){
        if (Cools.isEmpty(staDesc)) {
            throw new CoolException("未找到站点路径");
        }
        if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104)){
        if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104)) {
            try {
                // 保存工作明细档历史档
//                if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -248,7 +344,7 @@
            } catch (Exception e) {
                throw new CoolException("出错");
            }
        }else {
        } else {

        }
        return dto;
@@ -275,18 +371,18 @@
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", 107)
                .eq("wrk_sts",14));
                .eq("wrk_sts", 14));
        StartupDto dto = new StartupDto();

        if (Cools.isEmpty(wrkMast)){
            try{
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档未查询到盘点出库任务，开始查询盘点在入库任务==》");
        if (Cools.isEmpty(wrkMast)) {
            try {
                log.info("/pakin2/loc/v1:" + dto + "======托盘码:" + param.getBarcode() + "此笔工作档未查询到盘点出库任务，开始查询盘点在入库任务==》");
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", 57)
                        .eq("wrk_sts",2));
                if (Cools.isEmpty(wrkMast1)){
                    return R.error("未查询到工作档===》托盘码:"+param.getBarcode());
                        .eq("wrk_sts", 2));
                if (Cools.isEmpty(wrkMast1)) {
                    return R.error("未查询到工作档===》托盘码:" + param.getBarcode());
                }
                // 获取目标站
                Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -298,54 +394,54 @@
                    log.error("type_no={},stn_no={},crn_no={}", 57, sourceStaNo, wrkMast1.getCrnNo());
                    throw new CoolException("入库路径不存在");
                }
                if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())){
                    throw new CoolException("堆垛机作业站点与工作号目标站点不一致！！！请联系工程师修改"+
                            "\\n堆垛机号："+wrkMast1.getCrnNo()+
                            "\\n堆垛机站点："+staDesc.getCrnStn()+
                            "\\n工作号："+wrkMast1.getWrkNo()+
                            "\\n工作档目标站点："+wrkMast1.getStaNo());
                if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())) {
                    throw new CoolException("堆垛机作业站点与工作号目标站点不一致！！！请联系工程师修改" +
                            "\\n堆垛机号：" + wrkMast1.getCrnNo() +
                            "\\n堆垛机站点：" + staDesc.getCrnStn() +
                            "\\n工作号：" + wrkMast1.getWrkNo() +
                            "\\n工作档目标站点：" + wrkMast1.getStaNo());
                }
                dto.setWorkNo(wrkMast1.getWrkNo());
                dto.setCrnNo(wrkMast1.getCrnNo());
                dto.setLocNo(wrkMast1.getLocNo());
                dto.setStaNo(wrkMast1.getStaNo());
                dto.setSourceStaNo(wrkMast1.getSourceStaNo());
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档已经是盘点再入库状态，返回wcs下发信息");
                log.info("/pakin2/loc/v1:" + dto + "======托盘码:" + param.getBarcode() + "此笔工作档已经是盘点再入库状态，返回wcs下发信息");
                return R.ok().add(dto);
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库查询工作档出错======>"+e);
            } catch (Exception e) {
                log.error("/pakin2/loc/v1:======托盘码:" + param.getBarcode() + "盘点回库查询工作档出错======>" + e);
                return R.error("查看wms==>info==>error");
            }
        }
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (Cools.isEmpty(locDetls) || locDetls.size()<1){
            return R.error("托盘码:"+param.getBarcode()+",未查到库存明细");
        }else {
            if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())){
        if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
            return R.error("托盘码:" + param.getBarcode() + ",未查到库存明细");
        } else {
            if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())) {
                return R.error("明细已经被修改,故障");
            }
        }

        Date now = new Date();
        if (param.getIoType() == 107) {//盘点再入库
            try{
            try {
                // 检索库位
                List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
                try{
                try {
//                    dto = commonService.getLocNo(1, 57, param.getSourceStaNo(), list, locTypeDto, 0);
                    dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto,locDetls.size()>1);
                }catch (Exception e){
                    log.error("堆垛机站盘点再入库查询库位出错:"+e.getMessage()+e);
                    dto = commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(), locDetls.get(0).getBatch(), null, locTypeDto, locDetls.size() > 1);
                } catch (Exception e) {
                    log.error("堆垛机站盘点再入库查询库位出错:" + e.getMessage() + e);
                    return R.error("e.getMessage()");
//                    throw new Exception("查询库位出错，参数：param.getSourceStaNo():"+param.getSourceStaNo()+"==>list:"+list+"==>locTypeDto:"+locTypeDto);
                }
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
                if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())){
                if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())) {
                    throw new Exception("目标库位locMast查询为空||locMast.getLocSts为空");
                }else {
                    if (!locMast.getLocSts().equals("O")){
                        throw new Exception("目标库位！locMast.getLocSts.equals(“O”)"+locMast.getLocSts());
                    }else {
                } else {
                    if (!locMast.getLocSts().equals("O")) {
                        throw new Exception("目标库位！locMast.getLocSts.equals(“O”)" + locMast.getLocSts());
                    } else {
                        locMast.setLocSts("Q");
                        locMast.setBarcode(param.getBarcode());
                        if (!locMastService.updateById(locMast)) {
@@ -354,7 +450,7 @@
                        }
                    }
                }
                if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
                if (!locDetlService.updateLocNo(locMast.getLocNo(), wrkMast.getSourceLocNo())) {
                    log.error(" /pakin2/loc/v1 --- 库存明细转移失败！" + wrkMast.getWrkNo());
                    throw new Exception("库存明细转移失败");
                }
@@ -368,9 +464,9 @@
                    throw new Exception("修改源库位状态失败");
                }

                try{
                try {
                    // 保存工作主档历史档
                    if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
                    if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                        log.error(" stnToCrnStnPick2 --- 保存工作主档历史档失败！" + wrkMast.getWrkNo());
                    }
                    // 更新工作档数据状态
@@ -387,18 +483,18 @@
                        throw new CoolException("更新工作档数据状态失败");
                    }
                    // 更新明细档io_time (历史档关联使用）
                    wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
                }catch (Exception e){
                    wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(), now);
                } catch (Exception e) {
                    throw new CoolException("更新工作档数据状态出错");
                }
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库出错======>"+e);
            } catch (Exception e) {
                log.error("/pakin2/loc/v1:======托盘码:" + param.getBarcode() + "盘点回库出错======>" + e);
                return R.error("查看wmsError");
            }
        } else {
            return R.error();
        }
        log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        log.info("/pakin2/loc/v1:" + dto + "======托盘码:" + param.getBarcode());
        return R.ok().add(dto);
    }

@@ -414,12 +510,12 @@
        }
        WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .in("io_type", 103,53,107,57,104,54)
                .eq("wrk_sts",14));
        if (!Cools.isEmpty(wrkMastPakin)){
                .in("io_type", 103, 53, 107, 57, 104, 54)
                .eq("wrk_sts", 14));
        if (!Cools.isEmpty(wrkMastPakin)) {
            StartupDto locNo3 = getLocNo3(param);
            return R.ok(locNo3);
        }else {
        } else {
            List<WaitPakin> waitPakins = null;
            if (param.getIoType() == 1) {
                if (Cools.isEmpty(param.getBarcode())) {
@@ -433,16 +529,16 @@
                    }
                    return R.parse(CodeRes.NO_COMB_700);
                }
                int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
                if (countLoc > 0 ) {
                    return R.error(param.getBarcode()+"条码在库存中已存在");
                int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
                if (countLoc > 0) {
                    return R.error(param.getBarcode() + "条码在库存中已存在");
                }
                int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
                if ( countWrk > 0) {
                    return R.error(param.getBarcode()+"条码在工作档中已存在");
                int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
                if (countWrk > 0) {
                    return R.error(param.getBarcode() + "条码在工作档中已存在");
                }
            }
            if (Cools.isEmpty(param.getLocType1())){
            if (Cools.isEmpty(param.getLocType1())) {
                return R.error("高低检测信号不能为空");
            }

@@ -472,12 +568,12 @@

    @PostMapping("/auto/emptyIn/v1")
    @ResponseBody
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);

        // 检索库位
        StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto,false);
        StartupDto dto = commonService.getLocNo(10, 12, null, null, null, locTypeDto, false);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -500,12 +596,12 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setMemo("自动空托入库");
        return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:"+wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");
        return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");
    }

    @PostMapping("auto/emptyOut/v1")
    @ResponseBody
    public R autoEmptyOut(){
    public R autoEmptyOut() {
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("loc_sts", "D"));
        if (Cools.isEmpty(locMast)) {
@@ -513,9 +609,11 @@
        }
        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
        emptyPlateOutParam.setOutSite(12);
        emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
        emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
            add(locMast.getLocNo() + "");
        }});
        WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
        return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
        return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
    }

    /**
@@ -528,11 +626,11 @@
        // 检索库位
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        boolean mixtrue =false;
        boolean mixtrue = false;


        StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto, mixtrue);
        if (Cools.isEmpty(dto)){
        StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto, mixtrue);
        if (Cools.isEmpty(dto)) {
            throw new CoolException("未找到库位信息");
        }
        int workNo = dto.getWorkNo();
@@ -587,19 +685,19 @@
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(now);
        if (!basDevpService.updateById(sourceStaNo)){
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)){
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto;
    }
@@ -609,7 +707,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto,false);
        StartupDto dto = commonService.getLocNo(10, devpNo, null, null, null, locTypeDto, false);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -622,7 +720,7 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt(dto.getSourceStaNo() == 1025?"Y":"N"); // 满板
        wrkMast.setFullPlt(dto.getSourceStaNo() == 1025 ? "Y" : "N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
@@ -639,21 +737,22 @@
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiTime(new Date());
        if (!basDevpService.updateById(sourceStaNo)){
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(new Date());
            if (!locMastService.updateById(locMast)){
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto;
    }


}