#

luxiaotao1123

2022-10-13 b8fbfc4bc15782a5e30cb17d7d948ca9e832acfa

#

 src/main/java/com/zy/common/service/CommonService.java

@@ -284,7 +284,7 @@
                    }
                }
            }
            // 因库位移转、需预留空库位
            // 因库位移转、需预留空库位 todo:luxiaotao
//            if (!locMastService.checkEmptyCount(locMast)) {
//                locMast = null;
//            }

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

@@ -91,7 +91,7 @@
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 103:// 拣料入库
                break;
            case 104:// 并板入库
            case 107:// 盘点入库
                dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
                break;
@@ -251,8 +251,7 @@
        }
        // 检索库位
        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, ioType, devpNo, matnrList, locTypeDto,0);
        return dto; // 库位号， 堆垛机
        return commonService.getLocNo(1, ioType, devpNo, matnrList, locTypeDto,0); // 库位号， 堆垛机，目标站
    }

}