fix: 装箱点位管理

nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java

@@ -52,6 +52,8 @@ public interface ErrorCodeConstants {
 
     // ========== 装箱区点位库存 ==========
     ErrorCode PACKAGE_POINT_NOT_EXISTS = new ErrorCode(200001, "装箱区点位库存不存在");
+    ErrorCode PACKAGE_POINT_TASK_QUERY_FAILED = new ErrorCode(200002, "查询点位关联任务失败，请稍后重试");
+    ErrorCode PACKAGE_POINT_HAS_UNFINISHED_TASK = new ErrorCode(200003, "选中点位存在未完成任务，无法解锁");
 
     // ========== 子卷包装关系 ==========
     ErrorCode SUB_PACKAGE_RELATION_NOT_EXISTS = new ErrorCode(300001, "子卷包装关系不存在");

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/packagepoint/PackagePointController.java

@@ -54,6 +54,15 @@ public class PackagePointController {
         return success(true);
     }
 
+    @PutMapping("/unlock-list")
+    @Operation(summary = "批量解锁装箱区点位")
+    @PreAuthorize("@ss.hasPermission('lms:package-point:update')")
+    public CommonResult<Boolean> unlockPackagePointList(
+            @RequestBody @NotEmpty List<@NotNull Long> ids) {
+        packagePointService.unlockPackagePointList(ids);
+        return success(true);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除装箱区点位库存")
     @Parameter(name = "id", description = "编号", required = true)

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/packagepoint/PackagePointMapper.java

@@ -60,6 +60,22 @@ public interface PackagePointMapper extends BaseMapperX<PackagePointDO> {
      */
     int unlockPoint(@Param("pointId") Long pointId, @Param("pointStatus") String pointStatus);
 
+    /**
+     * 批量解锁点位
+     *
+     * @param ids 点位标识列表
+     * @return 更新行数
+     */
+    int unlockPointList(@Param("ids") List<Long> ids);
+
+    /**
+     * 根据点位标识查询点位编码
+     *
+     * @param ids 点位标识列表
+     * @return 点位编码列表
+     */
+    List<String> selectPointCodeListByIds(@Param("ids") List<Long> ids);
+
     default PageResult<PackagePointDO> selectPage(PackagePointPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PackagePointDO>()
                 .eqIfPresent(PackagePointDO::getPointType, reqVO.getPointType())

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/job/box/BoxAutoJob.java

@@ -54,4 +54,20 @@ public class BoxAutoJob {
         XxlJobHelper.handleSuccess(msg);
         log.info(msg);
     }
+    /**
+     * 待检区->装箱区定时器
+     */
+    @XxlJob("autoSendPackageAgvTaskJob")
+    @TenantJob
+    public void autoSendPackageAgvTaskJob() {
+        log.info("待检区送卷到装箱区任务创建开始.....");
+        XxlJobHelper.log("待检区送卷到装箱区任务创建开始");
+
+        packageBoxBusinessService.autoSendPackageAgvTaskJob();
+
+        String msg = "待检区送卷到装箱区任务创建结束";
+        XxlJobHelper.log(msg);
+        XxlJobHelper.handleSuccess(msg);
+        log.info(msg);
+    }
 }

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/packagepoint/PackageBoxBusinessService.java

@@ -16,4 +16,9 @@ public interface PackageBoxBusinessService {
      * 自动创建子卷下线补充空架子任务
      */
     void autoSubRollDownCallEmpty();
+
+    /**
+     * 待检区->装箱区定时器
+     */
+    void autoSendPackageAgvTaskJob();
 }

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/packagepoint/PackageBoxBusinessServiceImpl.java

@@ -130,6 +130,18 @@ public class PackageBoxBusinessServiceImpl implements PackageBoxBusinessService
         createPackingToInspectionTask(packingSourceIterator, inspectionEmptyPointList.iterator());
     }
 
+    @Override
+    public void autoSendPackageAgvTaskJob() {
+        // 查找符合的任务：任务状态：10，taskType = 010603,
+
+        // 查找对应装箱区的空位（表：lms_package_point）：没锁、状态是空位、点位类型是装箱点，block = 任务中的request_param:({"block": "1"})的block（1/2代表第一块或者第二块的任务）的值；
+
+        // 补齐任务，将任务的pointCode2设置找到的装箱区的站点,任务状态设置成40
+
+        // 终点点位上锁
+
+    }
+
     /**
      * 创建子卷下线送待检区运输任务
      *

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/packagepoint/PackagePointService.java

@@ -29,6 +29,13 @@ public interface PackagePointService {
      */
     void updatePackagePoint(@Valid PackagePointSaveReqVO updateReqVO);
 
+    /**
+     * 批量解锁装箱区点位
+     *
+     * @param ids 点位标识列表
+     */
+    void unlockPackagePointList(List<Long> ids);
+
     /**
      * 删除装箱区点位库存
      *

nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/packagepoint/PackagePointServiceImpl.java

@@ -1,11 +1,14 @@
 package cn.code.nl.module.lms.service.packagepoint;
 
+import cn.code.nl.framework.common.pojo.CommonResult;
 import cn.code.nl.framework.common.pojo.PageResult;
 import cn.code.nl.framework.common.util.object.BeanUtils;
 import cn.code.nl.module.lms.controller.admin.packagepoint.vo.PackagePointPageReqVO;
 import cn.code.nl.module.lms.controller.admin.packagepoint.vo.PackagePointSaveReqVO;
 import cn.code.nl.module.lms.dal.dataobject.packagepoint.PackagePointDO;
 import cn.code.nl.module.lms.dal.mysql.packagepoint.PackagePointMapper;
+import cn.code.nl.module.task.api.TransportTaskApi;
+import cn.code.nl.module.task.dto.UnfinishedTaskPointReqDTO;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +16,9 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 
 import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.code.nl.module.lms.enums.ErrorCodeConstants.PACKAGE_POINT_HAS_UNFINISHED_TASK;
 import static cn.code.nl.module.lms.enums.ErrorCodeConstants.PACKAGE_POINT_NOT_EXISTS;
+import static cn.code.nl.module.lms.enums.ErrorCodeConstants.PACKAGE_POINT_TASK_QUERY_FAILED;
 
 /**
  * 装箱区点位库存 Service 实现类
@@ -27,6 +32,9 @@ public class PackagePointServiceImpl implements PackagePointService {
     @Resource
     private PackagePointMapper packagePointMapper;
 
+    @Resource
+    private TransportTaskApi transportTaskApi;
+
     @Override
     public Long createPackagePoint(PackagePointSaveReqVO createReqVO) {
         // 插入
@@ -46,6 +54,21 @@ public class PackagePointServiceImpl implements PackagePointService {
         packagePointMapper.updateById(updateObj);
     }
 
+    @Override
+    public void unlockPackagePointList(List<Long> ids) {
+        List<String> pointCodes = packagePointMapper.selectPointCodeListByIds(ids);
+        UnfinishedTaskPointReqDTO reqDTO = new UnfinishedTaskPointReqDTO();
+        reqDTO.setPointCodes(pointCodes);
+        CommonResult<Boolean> result = transportTaskApi.hasUnfinishedByPointCodes(reqDTO);
+        if (result.isError()) {
+            throw exception(PACKAGE_POINT_TASK_QUERY_FAILED);
+        }
+        if (Boolean.TRUE.equals(result.getData())) {
+            throw exception(PACKAGE_POINT_HAS_UNFINISHED_TASK);
+        }
+        packagePointMapper.unlockPointList(ids);
+    }
+
     @Override
     public void deletePackagePoint(Long id) {
         // 校验存在

nl-module-lms/nl-module-lms-server/src/main/resources/mapper/packagepoint/PackagePointMapper.xml

@@ -36,4 +36,24 @@
           AND deleted = b'0'
     </update>
 
+    <update id="unlockPointList">
+        UPDATE lms_package_point
+        SET lock_status = '0'
+        WHERE point_id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+          AND deleted = b'0'
+    </update>
+
+    <select id="selectPointCodeListByIds" resultType="string">
+        SELECT point_code
+        FROM lms_package_point
+        WHERE point_id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+          AND deleted = b'0'
+    </select>
+
 </mapper>