增加生成作业 填入任务号

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java

@@ -141,14 +141,13 @@ public class ToWmsServiceImpl implements IToWmsService {
         mydoJob.setCargoSpaceId(cargoSpaceId);
         mydoJob.setInOrOut("1");
         mydoJob.setTrayCode(requestEnter.getTrayCode());
-
-
+        map.put("v_param", "1");
+        mydoJobService.getInTask(map);
+        mydoJob.setTaskNo(map.get("v_serial"));
 //        HashMap<String, String> result = new HashMap<>();
 //        result.put("cargoSpaceId",cargoSpaceId);
-
         return AjaxResult.success(mydoJob);
     }
-
     /**
      * requestEnterByTrayCode -> 入库货位分配
      * 入库任务请求根据托盘码 -> 向子单明细分配入库货位
@@ -157,10 +156,8 @@ public class ToWmsServiceImpl implements IToWmsService {
      * @return
      */
     public String getCargoSpaceByProductInfo(String productId){
-
 //>>>>>>>>>>>>>>获取物料库存信息 -> 有库存 -> 货位（cargospace） -> 存储区组（groupCodingNo） -> 根据groupCoding（由高到低） -> 获取状态1的货位分配
 //>>>>>>>>>>>>>>获取物料库存信息 -> 无库存 -> 遍历存储区组（groupCodingNo） -> 查找全部货位空的区组 -> 根据groupCoding（由高到低） -> 获取状态1的货位分配
-
         try {
             //获取物料的货位集合 - 首先查找已经存放该物料的存储区
             List<BasStock> stocks = basStockService.selectBasStockListByProductId(productId);
@@ -215,7 +212,6 @@ public class ToWmsServiceImpl implements IToWmsService {
         }catch(Exception e){
             log.error("入库子单获取目标货位失败，异常信息:" + e.getMessage());
         }
-
         return null;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java

@@ -45,6 +45,8 @@ public interface MydoJobMapper
 
     public void getInJobId(HashMap<String, String> map);
 
+
+    public void getInTask(HashMap<String, String> map);
     /**
      * 修改任务表
      *

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

@@ -39,6 +39,9 @@ public interface IMydoJobService
 
     public void getInJobId(HashMap<String, String> map);
 
+    public void getInTask(HashMap<String, String> map);
+
+
     /**
      * 新增任务表
      *

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

@@ -123,6 +123,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
         mydoJobMapper.getInJobId(map);
     }
 
+    @Override
+    public void getInTask(HashMap<String, String> map){
+        mydoJobMapper.getInTask(map);
+    }
+
     /**
      * 新增任务表
      *

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -113,6 +113,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ) }
     </select>
 
+    <select id="getInTask" statementType="CALLABLE" parameterType="java.util.Map">
+        { CALL util_serial_task(
+                #{v_param,jdbcType=VARCHAR,mode=IN},
+                #{v_serial,mode=OUT,jdbcType=VARCHAR}
+               ) }
+    </select>
+
     <insert id="insertMydoJob">
         insert into mydo_job
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-ui/src/permission.js

@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken } from '@//auth'
 import { isPathMatch } from '@/utils/validate'
 import { isRelogin } from '@/utils/request'