From 5bc95cc91e6f149e870c56eed860a12ffc2b10a7 Mon Sep 17 00:00:00 2001
From: zhengxuming <zhengxuming>
Date: Mon, 11 Aug 2025 11:19:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=99=AE=E9=80=9A=E7=A7=BB=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E6=99=AE=E9=80=9A=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StructattrServiceImpl.java   |  1 +
 .../service/util/tasks/StOutTask.java         | 19 +++++++++++++++++++
 .../service/impl/StIvtMoveinvServiceImpl.java |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
index 0d3940d..52304f1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
@@ -410,6 +410,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         //如果是整出
         if (!changeDto.getInBound()) {
             wrapper.set("storagevehicle_code", null);
+            wrapper.set("occupancy_state", "1");
         }
         this.update(wrapper);
         List<GroupPlate> groupPlates = iMdPbGroupplateService.list(new QueryWrapper<GroupPlate>()
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
index 8d8d5b4..0b2c64a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
@@ -4,12 +4,15 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
+import org.nl.wms.sch_manage.service.ISchBasePointService;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
+import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
@@ -41,6 +44,12 @@ public class StOutTask extends AbstractTask {
     @Resource
     private IOStorInvDisMapper ioStorInvDisMapper;
 
+    /**
+     * 点位服务
+     */
+    @Autowired
+    private ISchBasePointService iSchBasePointService;
+
     @Override
     public String create(JSONObject json) {
         SchBaseTask task = new SchBaseTask();
@@ -136,6 +145,16 @@ public class StOutTask extends AbstractTask {
         taskObj.setRemark("已完成");
         taskService.updateById(taskObj);
         outBillService.taskFinish(taskObj);
+
+        // 更新终点
+        iSchBasePointService.update(
+                new UpdateWrapper<SchBasePoint>().lambda()
+                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
+                        .set(SchBasePoint::getIng_task_code, null)
+                        .set(SchBasePoint::getPoint_status,"3")
+                        .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code())
+                        .set(SchBasePoint::getIos_id, null)
+        );
     }
 
     @Transactional(rollbackFor = Exception.class)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
index aa53906..95ac12d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
@@ -229,6 +229,7 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
         iStructattrService.update(
                 new UpdateWrapper<Structattr>().lambda()
                         .eq(Structattr::getStruct_code, dtlDao.getTurnout_struct_code())
+                        .set(Structattr::getOccupancy_state,"1")
                         .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
                         .set(Structattr::getStoragevehicle_code, null)
         );
@@ -237,6 +238,7 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
                 new UpdateWrapper<Structattr>().lambda()
                         .eq(Structattr::getStruct_code, dtlDao.getTurnin_struct_code())
                         .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
+                        .set(Structattr::getOccupancy_state,"3")
                         .set(Structattr::getStoragevehicle_code, dtlDao.getStoragevehicle_code())
         );