生产派工批量工单编号查询

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -111,7 +111,12 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     @Override
     public List<SfcDispatchDto> findSfcDispatchList(Map paramMap) throws IOException {
 
-
+        //批量查询工单编号
+        if (paramMap.containsKey("shopOrderInput")){
+            String[] shopOrderInputs = String.valueOf(paramMap.get("shopOrderInput")).split(",");
+            paramMap.put("shopOrderList",shopOrderInputs);
+            paramMap.remove("shopOrderInput");
+        }
         List<SfcDispatchDto> list = sfcDispatchMapper.findSfcDispatchList(paramMap);
         if (list == null || list.size() <= 0) {
             return list;

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -848,6 +848,12 @@
         <if test="shopOrder != null and shopOrder != ''">
             AND SD.SHOP_ORDER LIKE '%' ||#{shopOrder}|| '%'
         </if>
+        <if test="shopOrderList != null and shopOrderList.length > 0">
+            AND SD.SHOP_ORDER IN
+            <foreach collection="shopOrderList" index="index" item="shopOrderItem" open="(" separator="," close=")">
+                #{shopOrderItem}
+            </foreach>
+        </if>
         <if test="resourceType != null and resourceType != ''">
             AND SD.RESOURCE_TYPE = #{resourceType}
         </if>

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
@@ -105,18 +106,17 @@ public class ShopOrderController {
      * @return
      */
     @GetMapping("/findShopOrderList")
-    public R findShopOrderList(Map paramMap){
+    public R findShopOrderList(@RequestParam(required = false) Map paramMap){
-        QueryWrapper<ShopOrder> wrapper = new QueryWrapper<>();
+        Map<String,String> map = new HashMap<>();
-        wrapper.select("SHOP_ORDER");
+        if (!StringUtils.isEmpty(String.valueOf(paramMap.get("shopOrder")))){
-        List<ShopOrder> result = shopOrderService.list();
+            ShopOrder shopOrder = shopOrderService.findById(String.valueOf(paramMap.get("shopOrder")), null);
-        ArrayList<Map<String,String>> List = new ArrayList<>();
+            if (shopOrder == null){
-        for (int i = 0; i < result.size(); i++) {
+                map.put("shopOrder",null);
-                HashMap<String, String> map = new HashMap<>();
+            }else {
-                map.put("shopOrderId",String.valueOf(i));
+                map.put("shopOrder",shopOrder.getShopOrder());
-                map.put("shopOrder",String.valueOf(result.get(i).getShopOrder()));
-                List.add(map);
             }
-       return R.ok(List);
+        }
+       return R.ok(map);
     }
 
 }