diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java
index 394adb13..d62bb635 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java
@@ -1,9 +1,12 @@
 package com.foreverwin.mesnac.dispatch.model;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -64,6 +67,19 @@ public class ShopOrderRelease extends SfcDispatch {
      */
     private String router;
 
+    /**
+     * 多选工单编号查询
+     */
+    @TableField(exist = false)
+    private List<String> shopOrderInput;
+
+    public List<String> getShopOrderInput() {
+        return shopOrderInput;
+    }
+
+    public void setShopOrderInput(List<String> shopOrderInput) {
+        this.shopOrderInput = shopOrderInput;
+    }
 
     public String getBom() {
         return bom;
diff --git a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
index fbe623dc..075b6a15 100644
--- a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
+++ b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
@@ -53,6 +53,12 @@
         <if test="shopOrder != null and shopOrder != ''">
             AND SO.SHOP_ORDER = #{shopOrder}
         </if>
+        <if test="shopOrderInput != null and shopOrderInput.size() > 0">
+            AND SO.SHOP_ORDER IN
+            <foreach collection="shopOrderInput" index="index" item="shopOrderItem" open="(" separator="," close=")">
+                #{shopOrderItem}
+            </foreach>
+        </if>
         <if test="workOrder != null and workOrder != ''">
             AND CF1.VALUE LIKE  '%'|| #{workOrder} || '%'
         </if>
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
index e58440ae..c1f0bd33 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
@@ -11,6 +11,11 @@ import com.sap.me.status.StatusBOHandle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  * @author Leon.L
@@ -92,6 +97,28 @@ public class ShopOrderController {
     public R findAbnormalShopOrder(ShopOrder shopOrder){
         return R.ok(shopOrderService.findAbnormalShopOrder(shopOrder));
     }
+
+
+    /**
+     * 批量工单编号查询
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/findShopOrderList")
+    public R findShopOrderList(Map paramMap){
+        QueryWrapper<ShopOrder> wrapper = new QueryWrapper<>();
+        wrapper.select("SHOP_ORDER");
+        List<ShopOrder> result = shopOrderService.list();
+        ArrayList<Map<String,String>> List = new ArrayList<>();
+        for (int i = 0; i < result.size(); i++) {
+                HashMap<String, String> map = new HashMap<>();
+                map.put("shopOrderId",String.valueOf(i));
+                map.put("shopOrder",String.valueOf(result.get(i).getShopOrder()));
+                List.add(map);
+            }
+       return R.ok(List);
+    }
+
 }