库位编号规则和和CTU保持一致

cl

2 天以前 f21530d33ca23aeeba2ef073ac6b64422e4e26ca

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

@@ -74,7 +74,7 @@
    private CheckOrderService checkOrderService;

    @Autowired
    private CusItemSyncViewQueryService cusItemSyncViewQueryService;
    private CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;


    @Override
@@ -279,7 +279,15 @@
        return R.ok(checkDiffItem);
    }

    /** 扫物料先查视图，命中后同步物料主数据 */
    private Matnr findLocalMatnrByCode(String matnrCode) {
        String t = StringUtils.trimToNull(matnrCode);
        if (t == null) {
            return null;
        }
        return matnrService.getOneByCodeAndBatch(t, "");
    }

    /** 视图 barcode 即物料号，与 man_matnr.code 一致 */
    private Matnr getMatnrByCodePreferView(String matnrCode) {
        String code = StringUtils.trimToNull(matnrCode);
        if (code == null) {
@@ -287,28 +295,30 @@
        }
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusItemSyncViewQueryService.listByItemNos(Collections.singletonList(code));
            viewItems = cusBarcodeSyncViewQueryService.listByItemNos(Collections.singletonList(code));
        } catch (Exception ignore) {
        }
        Map<String, Object> row = null;
        if (viewItems != null) {
            row = viewItems.stream()
                    .filter(v -> StringUtils.equals(code, StringUtils.trimToNull(Objects.toString(v.get("item_no"), null))))
                    .filter(v -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(v.get("barcode"), null)))
                    .findFirst()
                    .orElse(null);
        }
        if (row == null) {
            return matnrService.getOneByCodeAndBatch(code, "");
            return findLocalMatnrByCode(code);
        }
        String fullCode = CusBarcodeSyncViewQueryService.matnrCodeFromBarcode(Objects.toString(row.get("barcode"), null));
        String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
        String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
        String viewName = StringUtils.trimToNull(Objects.toString(row.get("item_name"), null));
        Long loginUserId = SystemAuthUtils.getLoginUserId() == null ? 1L : SystemAuthUtils.getLoginUserId();
        Matnr local = matnrService.getOneByCodeAndBatch(code, "");
        Matnr local = findLocalMatnrByCode(fullCode);
        if (local == null) {
            Matnr matnr = new Matnr();
            matnr.setCode(code)
            matnr.setCode(fullCode)
                    .setBatch("")
                    .setName(code)
                    .setName(viewName != null ? viewName : fullCode)
                    .setSpec(viewSpec)
                    .setUnit(viewUnit)
                    .setStockUnit(viewUnit)