|
@ -3,12 +3,14 @@ package org.nl.wms.ext.sorting.service.impl; |
|
|
import cn.hutool.json.JSONArray; |
|
|
import cn.hutool.json.JSONArray; |
|
|
import cn.hutool.json.JSONUtil; |
|
|
import cn.hutool.json.JSONUtil; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
import org.nl.common.enums.region.RegionEnum; |
|
|
import org.nl.common.enums.region.RegionEnum; |
|
|
import org.nl.config.IdUtil; |
|
|
import org.nl.config.IdUtil; |
|
|
import org.nl.config.MapOf; |
|
|
import org.nl.config.MapOf; |
|
|
import org.nl.wms.ext.sorting.enums.SortingEnum; |
|
|
import org.nl.wms.ext.sorting.enums.SortingEnum; |
|
|
import org.nl.wms.ext.sorting.service.SortingService; |
|
|
import org.nl.wms.ext.sorting.service.SortingService; |
|
|
import org.nl.wms.sch.point.service.ISchBasePointService; |
|
|
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.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.SortingCMTTask; |
|
|
import org.nl.wms.sch.task_manage.task.tasks.sorting.SortingCNTTask; |
|
|
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")); |
|
|
JSONArray jsonArray = JSONUtil.parseArray(jsonObject.get("pallet_detail")); |
|
|
// TODO:呼叫空托
|
|
|
// TODO:呼叫空托
|
|
|
|
|
|
iSchBasePointService.update(new UpdateWrapper<SchBasePoint>() |
|
|
|
|
|
.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" |
|
|
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)); |
|
|
, "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)){ |
|
|
if(SortingEnum.TASK_TYPE_ONE.getValue().equals(task_type) && SortingEnum.IS_EMPTY.getValue().equals(is_empty)){ |
|
|