From dc8367b8e744f9f02b606597a2c3a3b0783afc19 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 13 四月 2024 14:44:47 +0800 Subject: [PATCH] 地图数据json文件改为常量存储 --- src/main/java/com/zy/asrs/controller/PlaQtyController.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/PlaQtyController.java b/src/main/java/com/zy/asrs/controller/PlaQtyController.java index 3e2ef0b..8633d63 100644 --- a/src/main/java/com/zy/asrs/controller/PlaQtyController.java +++ b/src/main/java/com/zy/asrs/controller/PlaQtyController.java @@ -57,6 +57,9 @@ if (Cools.isEmpty(manPakOut.getStatus()) || manPakOut.getStatus() != 1) { return false; } + if(plaQty.getReturned() > 0){ + return false; + } return true; }).collect(Collectors.toList()); @@ -86,6 +89,7 @@ map.put("id", plaQty.getId()); map.put("value", orderNo); map.put("customer", plaQty.getCustomer()); + map.put("type","returned"); result.add(map); } return R.ok(result); @@ -99,7 +103,7 @@ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { - wrapper.like(entry.getKey(), val); + wrapper.eq(entry.getKey(), val); } } } -- Gitblit v1.9.1