From 226507c7840240ea0937a88cb24c77d1ab0b32f2 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 8 Aug 2024 17:59:45 +0800 Subject: [PATCH] =?UTF-8?q?add:sorting=E7=82=B9=E4=BD=8D=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/sorting/service/impl/SortingServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java index fd17b0a..b6ede49 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java @@ -3,12 +3,14 @@ package org.nl.wms.ext.sorting.service.impl; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.nl.common.enums.region.RegionEnum; import org.nl.config.IdUtil; import org.nl.config.MapOf; import org.nl.wms.ext.sorting.enums.SortingEnum; import org.nl.wms.ext.sorting.service.SortingService; import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.dto.PointMaterialInfo; import org.nl.wms.sch.task_manage.task.tasks.sorting.SortingCMTTask; import org.nl.wms.sch.task_manage.task.tasks.sorting.SortingCNTTask; @@ -59,6 +61,9 @@ public class SortingServiceImpl implements SortingService { //托盘上的堆垛信息 JSONArray jsonArray = JSONUtil.parseArray(jsonObject.get("pallet_detail")); // TODO:呼叫空托 + iSchBasePointService.update(new UpdateWrapper() + .set("is_lock",true) + .eq("point_code",pointCode)); JSONObject taskParam = new JSONObject(MapOf.of("task_code",task_code,"job_name",jobname,"device_code",pointCode,"requestNo" , "sorting_"+IdUtil.getStringId(),"ext_data",jsonObject,"vehicle_code",vehicle_code,"ext_data",jsonObject)); if(SortingEnum.TASK_TYPE_ONE.getValue().equals(task_type) && SortingEnum.IS_EMPTY.getValue().equals(is_empty)){