From 9c04f675e2e6787d75e254b6a8ab4453832ea603 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 18 Jun 2024 15:55:34 +0800
Subject: [PATCH] no message

---
 .../youchain/basicdata/service/impl/PointServiceImpl.java | 2 +-
 .../youchain/basicdata/service/impl/StockServiceImpl.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
index c7b3d89..b73ba15 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
@@ -150,7 +150,7 @@ public class PointServiceImpl implements PointService {
             map.put("描述", point.getDescription());
             map.put("区域编码", point.getBeatCode());
             map.put("物料编码", point.getItemCode());
-            map.put("库区名称", .getName());
+            map.put("库区名称", point.getArea().getName());
             map.put("是否启用", point.getEnabled());
             map.put("仓库名称", point.getDept().getName());
             map.put("坐标X", point.getPosX());
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 39b79c4..576f52e 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
@@ -215,11 +215,11 @@ public class StockServiceImpl implements StockService {
     public void containerIn(String containerCode, String position, String itemCode) {
         Stock stock = validateStock(containerCode);//验证容器
         Point point = validateSrcPoint(position);//验证点位
-        if (!isRestrictedArea(.getCode())) {
+        if (!isRestrictedArea(point.getArea().getCode())) {
             throw new RuntimeException(point.getCode() + "点位不能入场!");
         }
 
-        switch (.getCode()) {
+        switch (point.getArea().getCode()) {
             case AreaNameDic.XJQ:
             case AreaNameDic.DJQ:
                 if (StringUtils.isEmpty(itemCode)) {
@@ -288,7 +288,7 @@ public class StockServiceImpl implements StockService {
         validateStockStatus(stock);//验证容器状态
         validateStockAndItem(stock, item);//验证容器类型和物料类型是否匹配
         Point srcPoint = validateSrcPoint(pointCode);//验证点位
-        String srcPointAreaName = src.getCode();
+        String srcPointAreaName = srcPoint.getArea().getCode();
         if (!isValidMCArea(srcPointAreaName)) {
             throw new RuntimeException(srcPoint.getCode() + "为" + srcPointAreaName + "不能入库!");
         }
@@ -439,7 +439,7 @@ public class StockServiceImpl implements StockService {
 
     private void handleFullContainerCall(String itemCode, Point endPoint) {
         Item item = validateItem(itemCode);//验证物料
-        String endPointAreaName = end.getCode();
+        String endPointAreaName = endPoint.getArea().getCode();
         //只允许叫料区叫满车
         if (!isValidMCJLArea(endPointAreaName)) {
             throw new RuntimeException(endPoint.getCode() + "点位不能叫满车!");