token加日记，空托出库要求没有库存

xqs
1 parent 12008f99
Showing 2 changed files with 17 additions and 8 deletions
src/main/java/com/huaheng/framework/token/TokenService.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
 package com.huaheng.framework.token;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.google.gson.JsonObject;
+
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.framework.redis.RedisCache;
 import com.huaheng.pc.system.user.domain.User;
@@ -11,8 +8,8 @@ import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import jdk.nashorn.internal.parser.JSONParser;
-import org.springframework.boot.autoconfigure.cache.CacheProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -32,6 +29,9 @@ public class TokenService {
     @Resource
     private RedisCache redisCache;
+
+    private static final Logger log = LoggerFactory.getLogger(TokenService.class);
+
     /**
      * 有效期7天
      */
@@ -42,6 +42,7 @@ public class TokenService {
      */
     private static final String signingKey = "secret";
+
     /**
      * 创建token
      * @param user 用户
@@ -74,6 +75,7 @@ public class TokenService {
         Jws<Claims> jws = Jwts.parser().setSigningKey(signingKey).parseClaimsJws(token);
         Claims claims = jws.getBody();
         Map<String,String> header = jws.getHeader();
-        System.out.println("parse");
+        System.out.println("parse" + header);
+        log.warn("Token："+ header);
     }
 }
@@ -215,12 +215,19 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if(!"empty".equals(loc.getStatus())){
             return AjaxResult.error("源货位非空闲");
         }
+        //检查库存，有库存不给生成任务。
+        LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getWarehouseCode,loc.getWarehouseCode())
+                            .eq(InventoryDetail::getLocationCode, loc.getCode());
+         List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+        if(inventoryDetailList != null || inventoryDetailList.size() > 0){
+            return AjaxResult.error("该容器上有库存，无法空托出库！");
+        }
         //判断托盘是否已经存在任务
         Integer taskCount = taskHeaderService.UncompleteCount(containerCode);
         if (taskCount != null && taskCount.intValue() > 0)  {
             return AjaxResult.error("容器已存在任务");
         }
-
         //生成任务
         TaskHeader taskHeader = new TaskHeader();
         taskHeader.setWarehouseCode(loc.getWarehouseCode());