出库单据

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);