diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 20e4eb4a..3804c024 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -56,8 +56,8 @@ public enum AcsTaskEnum { ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), - ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("3","诺宝双入-双任务"), - ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("4","诺宝单入-单任务"), + ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), + ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), ACS_TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"), ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"), ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java index 03a9fb03..fa14fc08 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java @@ -163,14 +163,17 @@ public class AgvInstService { //3.agv根据对应载具列表行进扫码匹配：匹配到对应物料则创建点对点任务 public void empMatter(JSONObject task){ //参数 - String startPoint = task.getString("cacheLine"); + String startPoint = task.getString("point_code1"); String cacheVehile = getCacheVehile(startPoint, task.getString("material_id")); if (StringUtils.isBlank(cacheVehile)) { throw new BadRequestException("缓存线："+startPoint+"没有物料"+task.getString("material_id")+"对应可用载具"); } //判断当前物料载具已经任务分配数量：如果>物料已经分配任务。说明满了，不允许再分配 - List allocateTask = taskService.list(new QueryWrapper().eq("point_code1", startPoint).eq("material_id", task.getString("material_id")).lt("task_status", StatusEnum.TASK_FINISH.getCode())); - if (allocateTask.size()>=cacheVehile.split(",").length){ + List allocateTask = taskService.list(new QueryWrapper() + .eq("point_code1", startPoint) + .eq("material_id", task.getString("material_id")) + .in("task_status", "4","5","6")); + if (allocateTask.size()>cacheVehile.split(",").length){ log.error("callMatter 缓存线:{}上含有物料:{}的载具分配完，任务id:{}",startPoint,task.getString("material_id"),allocateTask.stream().map(SchBaseTask::getTask_id).collect(Collectors.joining(","))); throw new BadRequestException(String.format("缓存线%s上含物料%s的载具已分配完",startPoint,task.getString("material_id"))); } @@ -191,7 +194,7 @@ public class AgvInstService { if (StringUtils.isNotEmpty(cacheLine)){ int count = taskService.count(new QueryWrapper().eq("point_code2", cacheLine).lt("task_status", StatusEnum.TASK_FINISH.getCode())); String status = StringUtils.isBlank(materialId) ? StatusEnum.CACHE_VEL_EMT.getCode() : StatusEnum.CACHE_VEL_FULL.getCode(); - List vehicle = cachelineVehicleService.getCachelineVehicle(MapOf.of("vehicle_status", status, "material_id", materialId)); + List vehicle = cachelineVehicleService.getCachelineVehicle(MapOf.of("vehicle_status", status, "material_id", materialId, "cacheLine",cacheLine)); if (vehicle.size()>0){ if (vehicle.size()>count){ return vehicle.stream().map(SchCachelineVehicle::getVehicle_code).collect(Collectors.joining(",")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java index 60d4bfa6..caf1722d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.jsonwebtoken.lang.Assert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -670,15 +671,18 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { String device_code = param.getString("wcsdevice_code"); //载具编码 String vehicle_code = param.getString("vehicle_code"); + if (StringUtils.isEmpty(vehicle_code)){ + throw new BadRequestException("载具号不能为空"); + } //缓存线位置编码 // 封装给acs的数据 JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); // 1 扫码异常-入箱扫码 2 出箱扫码 jsonObject.put("type", type); -// jsonObject.put("position_code", position_code); jsonObject.put("device_code", device_code); jsonObject.put("vehicle_code", vehicle_code); + vehilematerialService.remove(new QueryWrapper().eq("vehicle_code",vehicle_code)); try { return RestBusinessTemplate.execute(() -> AcsUtil.notifyAcs("api/wms/issuedBarcode", jsonObject)); } catch (NullPointerException e) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java index f1403524..fb325516 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java @@ -97,8 +97,8 @@ public class SpeEmpTask extends AbstractAcsTask { throw new BadRequestException(String.format("设备%s存在未完成任务", param.getString("device_code"))); } - JSONObject form = new JSONObject(MapOf.of("start_point_code","", - "next_point_code",param.getString("device_code"),"return_point_code", "","vehicle_code", + JSONObject form = new JSONObject(MapOf.of("start_point_code",cahceLine, + "next_point_code",param.getString("device_code"),"return_point_code", cahceLine,"vehicle_code", "","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id())); String taskId = IdUtil.getSnowflake(1, 1).nextId() + ""; JSONObject task = packageParam(form, taskId); @@ -143,7 +143,7 @@ public class SpeEmpTask extends AbstractAcsTask { task.put("task_name", AcsTaskEnum.TASK_CACHELINE_OUT.getDesc()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("task_type", form.getString("type")); - task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode()); + task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); task.put("task_status", TaskStatusEnum.CREATED.getCode()); task.put("point_code1", form.getString("start_point_code")); task.put("point_code2", form.getString("next_point_code")); @@ -216,7 +216,8 @@ public class SpeEmpTask extends AbstractAcsTask { ArrayList Merge = new ArrayList<>(); if (!CollectionUtils.isEmpty(array)){ String pointCollect = array.stream().map(a->a.getPoint_code1() + "','" + a.getPoint_code2()).collect(Collectors.joining("','")); - List> needMergeCollect = basePointService.getAllPointRegin(pointCollect); + List> needMergeCollect = new ArrayList<>(); + //basePointService.getAllPointRegin("'"+pointCollect+"'"); //区域编号对应point_code pointRegionCollent Map>> pointRegionCollent = needMergeCollect.stream().collect(Collectors.groupingBy(o -> o.get("point_code"))); Set mergePointCollent = needMergeCollect.stream().map(item -> item.get("point_code")).collect(Collectors.toSet()); @@ -291,6 +292,17 @@ public class SpeEmpTask extends AbstractAcsTask { if (tag){task.setIs_send(true);tag = false;}else {task.setIs_send(false); } } } + if (value.size() == 1){ + for (SchBaseTask task : value) { + if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK.getCode())){ + task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK.getCode()); + } + if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode())){ + task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); + } + task.setIs_send(true); + } + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml index 25a5a89f..49637bba 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml @@ -31,7 +31,7 @@ sch_base_point.point_type = '4' and pdm_bi_device.is_used = true and workprocedure_id = #{workprocedure_id} - and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null ) + and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '') and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml index d1c1dd38..bdbeae95 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml @@ -10,7 +10,8 @@ sch_cacheline_vehilematerial v LEFT JOIN sch_cacheline_position p ON p.vehicle_code = v.vehicle_code WHERE p.vehicle_code ]]> '' and - v.vehicle_status = #{vehicle_status} + v.vehicle_status = #{vehicle_status} and + p.cacheLine_code = #{cacheLine} and v.material_id = #{material_id} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml index 30e7214c..53367d6c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml @@ -114,10 +114,10 @@ FROM sch_base_region LEFT JOIN sch_base_point ON sch_base_region.region_code = sch_base_point.region_code - LEFT JOIN sch_base_point b ON sch_base_region.region_code = b.region_code AND b.point_code IN ( #{points} ) + LEFT JOIN sch_base_point b ON sch_base_region.region_code = b.region_code AND b.point_code IN ( ${points} ) WHERE sch_base_region.is_merge = '1' - AND sch_base_point.point_code IN ( #{points} ) + AND sch_base_point.point_code IN ( ${points} ) GROUP BY sch_base_point.point_code diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue index 115daaf6..7b58e463 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue @@ -149,9 +149,9 @@ @selection-change="crud.selectionChangeHandler" > + -