From c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期四, 24 四月 2025 14:22:20 +0800 Subject: [PATCH] #新增盘点单号,页面修改 --- src/main/java/com/zy/asrs/controller/LocMastController.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index 9763ded..2d82d5e 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -184,10 +184,16 @@ String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l); // 鑾峰彇鍫嗗灈鏈哄彿 int crnNo = 0; - Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount()); + Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow()); for (List<Integer> node : shelves.nodes){ + if (node.contains(r)) { - crnNo = shelves.nodes.indexOf(node) + 1; + if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){ + crnNo = shelves.nodes.indexOf(node) + param.getStaCrn(); + }else { + crnNo = shelves.nodes.indexOf(node) + 1; + } + break; } } @@ -210,8 +216,9 @@ } } } - locMastService.delete(new EntityWrapper<>()); - locDetlService.delete(new EntityWrapper<>()); + if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){ + locMastService.delete(new EntityWrapper<>()); + } locMastService.insertBatch(list); return R.ok("鍒濆鍖栨垚鍔�"); } -- Gitblit v1.9.1