From 222faaec622c83f10dc0416d2683b974cc5900d4 Mon Sep 17 00:00:00 2001 From: TQS <56479841@qq.com> Date: 星期六, 04 二月 2023 15:35:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 986c290..dc7c1b1 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -1,6 +1,8 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; @@ -113,7 +115,7 @@ // 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺 List<OrderDto> orderDtos = new ArrayList<>(); for (LocDto locDto : locDtos) { - if (isJSON(locDto.getOrderNo())) { + if (!isJSON(locDto.getOrderNo())) { if (Cools.isEmpty(locDto.getOrderNo())) { continue; } OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme()); if (OrderDto.has(orderDtos, orderDto)) { @@ -127,8 +129,7 @@ // 璁㈠崟鍚堝苟鍑哄簱 // List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class); - List<OrderDto> orderDtoList = new ArrayList<>(); - orderDtoList.add(new OrderDto(locDto.getOrderNo(),locDto.getMatnr(),locDto.getAnfme())); + List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class); for (OrderDto one : orderDtoList) { OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), one.getAnfme()); -- Gitblit v1.9.1