增加空托出库条件(堆垛机自动+无报警码)

pjb

2025-07-13 1d3fdb2bf289396fb5d20aa48783c02b55f2d95d

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

@@ -103,7 +103,7 @@
        if(param.getIoType() == 1) {
            List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
            for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType()) { // 罐装线有要桶信号并且当前桶是罐装线要的桶
                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType() && wantBucket.getWantBucketCount() >= 1) { // 罐装线有要桶信号并且当前桶是罐装线要的桶
                    if(waitPakin == null) {
                        return R.error("入库通知档为空");
                    } else {
@@ -260,7 +260,7 @@
//            wrkMast.setCrnNo(dto.getCrnNo());
            wrkMast.setSourceStaNo(param.getSourceStaNo());
            wrkMast.setStaNo(1090);
//            wrkMast.setLocNo(dto.getLocNo());
            wrkMast.setLocNo(!param.isTbFlag() ? "贴标失败" : "复检重量异常");
            wrkMast.setBarcode(wrkMast1.getBarcode()); // 托盘码
            wrkMast.setFullPlt("Y"); // 满板：Y
//            wrkMast.setPicking("N"); // 拣料
@@ -450,15 +450,15 @@
        WrkMast wrkMast = wrkMastService.selectById(wrkNo);
        if (wrkMast == null) {
            throw new CoolException("异常口入库任务号无任务：" + wrkNo);
        } else if (wrkMast.getLocNo() != null) {
        } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
            throw new CoolException("异常口入库库位已分配：" + wrkMast.getLocNo());
        }

        if(!param.isTbFlag()) { //下线出库
            Config config = configService.selectConfigByCode("gzxfh" + wrkMast.getSourceStaNo());
            wrkMast.setSourceStaNo(1090);
            wrkMast.setStaNo(1024); // 异常下线默认入库站点为1024
            // 获取系统配置，看成品罐装完成是否直接出到发货口
            Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
            if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
                wrkMast.setStaNo(Integer.parseInt(config.getValue()));
            }
@@ -685,6 +685,7 @@
    @PostMapping("/autoOutEmptyBucket")
    @ResponseBody
    public R autoOutEmptyBucket(@RequestBody StockOutParam param){
        log.info("收到WCS自动出空桶接口请求====>>入参:{}", param);
        workService.startupFullTakeStore(param, 29L);
        return R.ok("出库启动成功");
    }
@@ -708,7 +709,7 @@
        }

        if (locMast == null) {
            return R.error("库存没有"+type+"类型空托盘");
            return R.error("库存没有"+type+"类型空托盘或无可用堆垛机");
        }

        String locNo = locMast.getLocNo();