强制组托单号必填

cl

3 天以前 d8cbfdcac8292522dd3c39e5cafdf19a43d15a5d

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -539,6 +539,27 @@
                .eq(Fields::getStatus, 1).orderByAsc(Fields::getId));
    }

    @Override
    public R getPdaPalletConfig() {
        Map<String, Object> data = new HashMap<>(2);
        data.put("pdaPakinAsnRequired", isPdaPakinAsnRequired());
        return R.ok(data);
    }

    /** PDA 组盘是否强制传 WMS 单号（无配置或缺省时按 true） */
    private boolean isPdaPakinAsnRequired() {
        Config c = configService.getOne(new LambdaQueryWrapper<Config>()
                .eq(Config::getFlag, GlobalConfigCode.PDA_PAKIN_ASN_REQUIRED)
                .eq(Config::getDeleted, 0)
                .last("LIMIT 1"));
        boolean required = true;
        if (c != null && StringUtils.isNotBlank(c.getVal())) {
            String v = c.getVal().trim();
            required = Boolean.parseBoolean(v) || "1".equals(v);
        }
        return required;
    }

    /**
     * @param
     * @return
@@ -557,6 +578,9 @@
                asnCode = null;
            }
        }
        if (isPdaPakinAsnRequired() && Cools.isEmpty(asnCode)) {
            return R.error("请先扫描WMS单号");
        }
        String crushNo = params.get("fieldsIndex");
        String batch = params.get("batch");
//        String barcode = params.get("barcode");