现场代码修改

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

@@ -17,6 +17,7 @@ import com.ruoyi.bas.weightRule.domain.BasCargoSpaceWeightRule;
 import com.ruoyi.bas.weightRule.service.IBasCargoSpaceWeightRuleService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
@@ -24,6 +25,7 @@ import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
 import com.ruoyi.log.domain.RequestLog;
 import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.service.IOutStockoutService;
+import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.service.PdaService;
 import lombok.extern.slf4j.Slf4j;
@@ -85,7 +87,7 @@ public class ToWcsServiceImpl implements IToWcsService {
                     mydoJobParam.setStatus("3");
                     mydoJobParam.setExitId(exitId + "");
                     List<MydoJob> roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
-                    if (CollUtil.isEmpty(roadwayRunningMydoJobs)) {
+                    if (CollUtil.isEmpty(roadwayRunningMydoJobs) || roadwayRunningMydoJobs.size() < 2) {
                         mydoJobParam1.setStatus("1");
                         mydoJobParam1.setRoadwayId(String.valueOf(i));
                         mydoJobParam1.setExitId(exitId + "");
@@ -108,7 +110,7 @@ public class ToWcsServiceImpl implements IToWcsService {
                 mydoJobParam.setRoadwayId(String.valueOf(i));
                 mydoJobParam.setStatus("3");
                 List<MydoJob> roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
-                if (CollUtil.isEmpty(roadwayRunningMydoJobs)) {
+                if (CollUtil.isEmpty(roadwayRunningMydoJobs) || roadwayRunningMydoJobs.size() < 2) {
                     mydoJobParam1.setStatus("1");
                     mydoJobParam1.setRoadwayId(String.valueOf(i));
                     List<MydoJob> roadwayWaitingMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam1);
@@ -220,6 +222,9 @@ public class ToWcsServiceImpl implements IToWcsService {
                 }
             }
             if (ObjUtil.isNull(basCargoSpace)) {
+                if ("1519".equals(basCargoSpaceParam.getCargoHight())){
+                    return AjaxResult.error("没有空货位");
+                }
                 //去除排的条件 再次查询货位
                 basCargoSpaceParam.setThePlatoon(null);
                 basCargoSpaceParam.setRule1(null);

ruoyi-admin/src/main/resources/application.yml

@@ -133,7 +133,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 720
 
 
 

ruoyi-admin/src/main/resources/mapper/search/ViewTraycodeStaticMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
         </where>
+        order by tray_code
     </select>
     
     <select id="selectViewTraycodeStaticByWarehouseId" parameterType="String" resultMap="ViewTraycodeStaticResult">

ruoyi-ui/src/views/stock/management/index.vue

@@ -123,9 +123,9 @@
       <el-table-column label="层" align="center" prop="theFloor"/>
       <el-table-column label="重量" align="center" prop="theType"/>
       <el-table-column label="容量" align="center" prop="theTypeName"/>
-      <el-table-column label="部门" align="center" prop="issDouble">
+      <el-table-column label="部门" align="center" prop="model">
         <template slot-scope="scope">
-          <dict-tag :options="getDeptDictOptions(scope.row)" :value="scope.row.issDouble"/>
+          <dict-tag :options="getDeptDictOptions(scope.row)" :value="scope.row.model"/>
         </template>
       </el-table-column>
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->