手持机部分

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
@@ -49,6 +50,7 @@ public class InStockinServiceImpl implements IInStockinService
      * @return 入库单据
      */
     @Override
+    @DataScope(warehouseAlias = "is2")
     public List<InStockin> selectInStockinList(InStockin inStockin)
     {
         return inStockinMapper.selectInStockinList(inStockin);

ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java

@@ -136,7 +136,7 @@ public class PdaController extends BaseController {
     /**
      * 绑定托盘物料
      */
-    @PreAuthorize("@ss.hasAnyPermi('bas:warehouse:list')")
+    @PreAuthorize("@ss.hasPermi('pda:bindTrayMsg:submit')")
     @RequestMapping("/bindTrayMsg")
     @ResponseBody
     public AjaxResult bindTrayMsg(@RequestBody TrayCodeMsg trayCodeMsg) {
@@ -146,6 +146,7 @@ public class PdaController extends BaseController {
     /**
      * 查询托盘已绑定物料
      */
+    @PreAuthorize("@ss.hasPermi('pda:bindMsg:list')")
     @RequestMapping("/bindMsg")
     @ResponseBody
     public AjaxResult bindMsg(String trayCode) {

ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml

@@ -22,8 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
         <include refid="selectBasWarehouseVo"/>
-        where
-         1=1
+        <where>
             <if test="warehouseId != null  and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
             <if test="warehouseNo != null  and warehouseNo != ''">and warehouse_no = #{warehouseNo}</if>
             <if test="projectNo != null  and projectNo != ''">and project_no = #{projectNo}</if>
@@ -47,7 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-        ${params.warehouseDataScope}
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
     </select>
 
     <select id="selectBasWarehouseByWarehouseId" parameterType="String" resultMap="BasWarehouseResult">

ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml

@@ -95,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 where lot_no like concat('%',#{lotNo},'%')
                 )
             </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>