出库单据

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.job.mydojob.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.api.service.IToWcsService;
 import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
@@ -418,12 +419,14 @@ public class MydoJobServiceImpl implements IMydoJobService {
             mydoJobMapper.pointOut(map);
             iToWcsService.pushOutMydoJob();
             String result = map.get("v_result").toString();
-            if ("10".equals(result)) {
-                msg = "操作成功！";
-            } else {
-                msg = map.get("v_resultmsg").toString();
+            if (!"10".equals(result)) {
+                Stringbuilder += stockId + msg + "<br/>";
             }
-            Stringbuilder += stockId + msg + "<br/>";
+
+        }
+
+        if (!StrUtil.isEmpty(Stringbuilder)) {
+            return AjaxResult.warn(Stringbuilder);
         }
 
         return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java

@@ -55,7 +55,6 @@ public class BasStockServiceImpl implements IBasStockService
      * @return 库存信息
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
     public List<BasStock> selectBasStockList(BasStock basStock)
     {
         return basStockMapper.selectBasStockList(basStock);

ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml

@@ -108,15 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null  and orderId != ''"> and bs.order_id = #{orderId}</if>
             <if test="productId != null  and productId != ''"> and bs.product_id = #{productId}</if>
             <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
-            <if test="typeData != null and typeData.size()>0">
-                and bw.warehouse_type in
-                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
+
         </where>
     </select>