From 247ee06b6286f92c82fe1b55fe5b4a0612ef6b3b Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Sun, 7 Jul 2024 22:27:06 +0800
Subject: [PATCH] no message

---
 .../basicdata/service/impl/StockServiceImpl.java  | 15 ++++-----------
 .../com/youchain/utils/StockTypeToAreaMap.java    |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
index 4ca9829..e88a4c5 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
@@ -330,9 +330,6 @@ public class StockServiceImpl implements StockService {
         String firstItemCode = barCodeVos.iterator().next().getItemCode();
         Item item = validateItem(firstItemCode);
 
-        /**验证容器类型和物料类型是否匹配*/
-        validateStockAndItem(stock, item);
-
         /*容器类型：小件入库则入小件缓存区、大件入库则入大件缓存区*/
         validateStockType(stock.getStockType());
 
@@ -347,7 +344,7 @@ public class StockServiceImpl implements StockService {
 
 
         /**验证终点点位*/
-        String areaCode = stockTypeToAreaMap.getValueByKey(stock.getStockType());
+        String areaCode = stockTypeToAreaMap.getValueByKey(item.getGoodType());
         Point endPoint = validateEndPoint(item, areaCode);
 
         /**创建下发任务*/
@@ -407,7 +404,7 @@ public class StockServiceImpl implements StockService {
     }
 
     private void validateStockType(String stockType) {
-        if (!stockTypeToAreaMap.getStockTypeToAreaMap().containsKey(stockType)) {
+        if (!"托盘".equals(stockType)) {
             throw new RuntimeException(stockType + "容器类型错误!");
         }
     }
@@ -477,7 +474,7 @@ public class StockServiceImpl implements StockService {
 
             taskFuture.join();
         } catch (Exception e) {
-            throw new RuntimeException("创建任务记录失败!", e);
+            throw new RuntimeException("创建任务失败!", e);
         } finally {
             executor.shutdown();
         }
@@ -757,11 +754,7 @@ public class StockServiceImpl implements StockService {
     }
 
     private Point validateEndPoint(Item item, String areaCode) {
-        Double itemHeight = null;
-        if (AreaNameDic.XJQ.equals(areaCode)) {
-            itemHeight = item.getExtendD2();//整托高度
-        }
-        Point endPoint = pointService.findByCode(null, BaseStatus.FREE, BaseStatus.STORAGE, areaCode, null, itemHeight);
+        Point endPoint = pointService.findByCode(null, BaseStatus.FREE, BaseStatus.STORAGE, areaCode, null, null);
         if (endPoint == null) {
             throw new RuntimeException(areaCode + "没有空闲点位!");
         }
diff --git a/youchain-system/src/main/java/com/youchain/utils/StockTypeToAreaMap.java b/youchain-system/src/main/java/com/youchain/utils/StockTypeToAreaMap.java
index 3e76ef7..b185531 100644
--- a/youchain-system/src/main/java/com/youchain/utils/StockTypeToAreaMap.java
+++ b/youchain-system/src/main/java/com/youchain/utils/StockTypeToAreaMap.java
@@ -12,8 +12,8 @@ public class StockTypeToAreaMap {
     static {
         stockTypeToAreaMap = new HashMap<>();
         // 初始化Map
-        stockTypeToAreaMap.put("小件入库", AreaNameDic.XJQ);
-        stockTypeToAreaMap.put("大件入库", AreaNameDic.DJQ);
+        stockTypeToAreaMap.put("小件", AreaNameDic.XJQ);
+        stockTypeToAreaMap.put("大件", AreaNameDic.DJQ);
         // 更多的初始化操作...
     }