修改

src/main/java/com/steerinfo/dil/controller/TmstruckWeightResultController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -169,13 +170,14 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     }
 
     @PostMapping("/queryApoByOrderNo")
-    public String queryApoByOrderNo(@RequestParam String orderNo){
-        String s = null;
+    public List<Map<String,Object>> queryApoByOrderNo(@RequestBody Map<String,Object> map){
+        List<Map<String,Object>> mapList = new ArrayList<>();
+        List<String> orderNos = (List<String>)map.get("orderNos");
         try {
-            s = tmstruckWeightResultServiceImpl.queryApoByOrderNo(orderNo);
+            mapList = tmstruckWeightResultServiceImpl.queryApoByOrderNo(orderNos);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return s;
+        return mapList;
     }
 }

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -159,10 +159,10 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     Map<String, Object> getWeightMesBySaleMaterialId(BigDecimal saleMaterialId);
 
-    String queryApoByOrderNo(String orderNo);
+    Map<String,Object> queryApoByOrderNo(String orderNo);
 
     Integer queryOrderType(String orderNo);
 
-    String queryApoInwardByOrderNo(String orderNo);
+    Map<String,Object> queryApoInwardByOrderNo(String orderNo);
 
 }

src/main/java/com/steerinfo/dil/service/ITmstruckWeightResultService.java

@@ -42,5 +42,5 @@ public interface ITmstruckWeightResultService {
 
     Boolean checkOrder(Map<String, Object> map);
 
-    String queryApoByOrderNo(String orderNo);
+    List<Map<String,Object>> queryApoByOrderNo(List<String> orderNo);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -1088,19 +1088,24 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     }
 
     @Override
-    public String queryApoByOrderNo(String orderNo) {
+    public List<Map<String,Object>> queryApoByOrderNo(List<String> orderNos) {
+        List<Map<String,Object>> mapList = new ArrayList<>();
+        for (String orderNo :orderNos) {
+            Integer orderType = tmstruckWeightResultMapper.queryOrderType(orderNo);
+            String apo = null;
+            Map<String,Object> map = null;
+            if(apoOrderType.contains(orderType)) {
+                 map = tmstruckWeightResultMapper.queryApoByOrderNo(orderNo);
+            }
+            if (apoInwardOrderType.contains(orderType)) {
+                map = tmstruckWeightResultMapper.queryApoInwardByOrderNo(orderNo);
+            }
+            if(map != null) {
+                mapList.add(map);
+            }
 
-        //
-        //首先判断订单类型
-        Integer orderType = tmstruckWeightResultMapper.queryOrderType(orderNo);
-        String apo = null;
-        if(apoOrderType.contains(orderType)) {
-            apo = tmstruckWeightResultMapper.queryApoByOrderNo(orderNo);
-        }
-        if (apoInwardOrderType.contains(orderType)) {
-            apo = tmstruckWeightResultMapper.queryApoInwardByOrderNo(orderNo);
         }
-        return apo;
+        return mapList;
 
     }
 }

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1351,8 +1351,10 @@
         TWR.SALE_MATERIAL_ID = #{saleMaterialId}
 
     </select>
-    <select id="queryApoByOrderNo" resultType="java.lang.String">
-        SELECT APO.PURCHASE_ORDER_NO from OMSTRUCK_ORDER OO
+    <select id="queryApoByOrderNo" resultType="map" parameterType="string">
+        SELECT APO.PURCHASE_ORDER_NO "apoNo",
+               OO.ORDER_NUMBER  "orderNo"
+               from OMSTRUCK_ORDER OO
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
         WHERE OO.ORDER_NUMBER = #{orderNo}
@@ -1361,8 +1363,10 @@
         SELECT OO.ORDER_TYPE FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_NUMBER = #{orderNo}
     </select>
-    <select id="queryApoInwardByOrderNo" resultType="java.lang.String" parameterType="string">
-        SELECT APO.PURCHASE_ORDER_NO FROM OMSTRUCK_ORDER OO
+    <select id="queryApoInwardByOrderNo" resultType="map" parameterType="string">
+        SELECT APO.PURCHASE_ORDER_NO "apoNo",
+               OO.ORDER_NUMBER  "orderNo"
+        FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP