From 44f7a0abb9a89ed89fd7946178653805e73fbe8b Mon Sep 17 00:00:00 2001
From: Comair <1464848666@qq.com>
Date: Sat, 3 Aug 2024 08:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=85=A5=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8A=E6=94=BE=E7=A0=81=E5=A4=B4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/shkj/wms/third/rcs/RCSUtil.java  | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java b/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java
index e6346ab..b50470a 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java
@@ -602,10 +602,10 @@ public class RCSUtil {
         Result result = new Result();
         result.setCode(200);
         result.setResult(true);
-
+        BasePoint basePoint = null;
         //空治具回库
         if (taskType.equals(TaskTypeEnum.emptyCon.getValue())) {
-            BasePoint basePoint = null;
+
             BusinDataTask fontbusinDataTask = businDataTaskMapper.selectfrontById(businDataTask);
             if (ObjectUtils.isNotEmpty(fontbusinDataTask)) {
                 QueryWrapper<BusinPickup> pickupQueryWrapper = new QueryWrapper<>();
@@ -625,13 +625,24 @@ public class RCSUtil {
                     basePoint = iBasePointService.selectBasePointByPointNo(fromSide);
                 }
             }
+        }
 
-            if (basePoint != null) {
-                basePoint.setIsOccupy("0");
-                iBasePointService.updateById(basePoint);
+        if (taskType.equals(TaskTypeEnum.byhand_in.getValue())) {
+            String fromSide = businDataTask.getFromSide();
+            if (StringUtils.isNotEmpty(fromSide)) {
+                if ("1".equals(bo.getSn()) && "completed".equals(bo.getStatus())) {
+                    log.info("人工入库时，上报时释放码头信息：" + JsonUtil.toJSONString(businDataTask));
+                    basePoint = iBasePointService.selectBasePointByPointNo(fromSide);
+                }
             }
         }
 
+
+        if (basePoint != null) {
+            basePoint.setIsOccupy("0");
+            iBasePointService.updateById(basePoint);
+        }
+
         List<WcsPlcProperty> propertyList = iWcsPlcPropertyService.getWcsPlcPropertyByPlcId(plcId);
         for (WcsPlcProperty wcsPlcProperty : propertyList) {
             /**