From 6f3a02a55bc5a2cdaee9d2cc48a3e206684cc698 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Wed, 12 Mar 2025 11:22:55 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E5=BA=9F=E7=AE=94?= =?UTF-8?q?=E8=80=B3=E6=B3=A2=EF=BC=8C=E8=BD=BD=E5=85=B7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/SlitterPdaServiceImpl.java | 11 ++++++++++- .../st/service/impl/OtherPdaServiceImpl.java | 6 +++++- .../hot/service/IstIvtHotpointivtService.java | 3 +++ .../impl/StIvtHotpointivtServiceImpl.java | 10 ++++++++++ .../nl/wms/quartz/AutoQueryDeviceStatus.java | 2 ++ .../nl/wms/quartz/AutoSendWasteFoilAGVTask.java | 2 +- .../service/dao/mapper/SchBasePointMapper.xml | 2 +- .../service/impl/SchBasePointServiceImpl.java | 5 ++--- .../task_manage/tasks/hot/InHotTrussTask.java | 5 +++-- .../tasks/slitter/SlitterUpTrussTask.java | 17 ++++++++++++++++- .../main/java/org/nl/wms/util/PointUtils.java | 1 - 11 files changed, 53 insertions(+), 11 deletions(-) diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java index e68fff07b..32101d440 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java @@ -84,7 +84,16 @@ public class SlitterPdaServiceImpl implements SlitterPdaService { @Override public JSONObject queryOrderInfo(JSONObject param) { JSONObject result = new JSONObject(); - result.put("data", rawfoilworkorderService.getAllUsedRawPlanOnZc()); + String type = param.getString("type"); + List allUsedRawPlanOnZc = rawfoilworkorderService.getAllUsedRawPlanOnZc(); + if ("1".equals(type)){ + List a1Hxhc = allUsedRawPlanOnZc.stream().filter(item -> item.getZc_point().contains("A1_HXHC")).collect(Collectors.toList()); + result.put("data", a1Hxhc); + + } else { + result.put("data", allUsedRawPlanOnZc); + } + result.put("message", "操作成功！"); return result; } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java index a19886175..d3b5404e7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java @@ -71,6 +71,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { // point_code String pointCode = param.getString("point_code"); String startPoint = param.getString("start_point"); + String vehicle_type = param.getString("vehicle_type"); List schBaseTasks = taskService.checkHaveTask(pointCode); if (schBaseTasks.size() > 0) { throw new BadRequestException("点位[" + pointCode + "]已经存在任务！"); @@ -82,6 +83,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { taskParam.put("config_code", "SendWasteFoilAGVTask"); taskParam.put("create_mode", GeneralDefinition.PDA_CREATION); taskParam.put("task_status", TaskStatus.SURE_END.getCode()); + taskParam.put("vehicle_type", vehicle_type); //起点不为空就是漏斗复位任务 if (StrUtil.isNotEmpty(startPoint)){ taskParam.put("point_code1", startPoint); @@ -102,6 +104,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { String flag = param.getString("flag"); // 判断是否能够搬运 String pointCode = param.getString("point_code"); + String vehicle_type = param.getString("vehicle_type"); SchBaseTask task = checkTask(pointCode); JSONObject upTaskRequestObj = JSONObject.parseObject(task.getRequest_param()); @@ -112,7 +115,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { // 最后一条任务, 创建去终点的任务 // 获取一个废箔位置 List fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB", - "1", "1", null, null); + "1", "1", vehicle_type, null); if (CollectionUtil.isEmpty(fbPoints)) { throw new BadRequestException("找不到废箔点位，请稍后再试!"); } @@ -126,6 +129,7 @@ public class OtherPdaServiceImpl implements OtherPdaService { taskParam.put("index_task", upTaskRequestObj.getInteger("index_task") + 1); taskParam.put("carNo", task.getCar_no()); taskParam.put("task_status", TaskStatus.START_AND_POINT.getCode()); + taskParam.put("vehicle_type", vehicle_type); sendWasteFoilAGVTask.createTask(taskParam); } else { // 获取其中一条任务设置起点 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java index 6db7bade1..1059c14f2 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java @@ -85,6 +85,9 @@ public interface IstIvtHotpointivtService extends IService { */ StIvtHotpointivt getPointByCode(String pointCode, boolean flag); + + StIvtHotpointivt getNoUsedPointByCode(String pointCode, boolean flag); + /** * 获取需要烘烤的点位 * @return / diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java index 0ae0b8b89..027d6bb37 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java @@ -148,6 +148,16 @@ public class StIvtHotpointivtServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); + lam.eq(StIvtHotpointivt::getPoint_code, pointCode) + .eq(flag, StIvtHotpointivt::getIs_used, "0"); + return getOne(lam); + } + + @Override public List getNeedBakingPoint() { return stIvtHotpointivtMapper.getNeedBakingPoint(); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java index 723891271..5f26421a2 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoQueryDeviceStatus.java @@ -83,10 +83,12 @@ public class AutoQueryDeviceStatus { String last_time = countdown_house + "小时" + countdown_min + "分钟"; redisUtils.hset(device_code, "temperature","0"); redisUtils.hset(device_code, "last_time", last_time); + redisUtils.hset(device_code, "is_off", "1"); }else { String last_time = countdown_house + "小时" + countdown_min + "分钟"; redisUtils.hset(device_code, "temperature", row.getString("temperature")); redisUtils.hset(device_code, "last_time", last_time); + redisUtils.hset(device_code, "is_off", "0"); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java index 42f8b3dc9..20be4c8ec 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoSendWasteFoilAGVTask.java @@ -40,7 +40,7 @@ public class AutoSendWasteFoilAGVTask { SchBaseTask task = waitTaskFilter.get(0); // 查找废箔起点 List fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB", - "1", "2", null, null); + "1", "2", task.getVehicle_type(), null); if (CollectionUtil.isEmpty(fbPoints)) { log.error("找不到废箔点位 - {}", task); return; diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index 7ba9af300..7c83649fe 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -64,7 +64,7 @@ AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' AND (t.point_code1 = p.point_code OR t.point_code2 = p.point_code OR t.point_code3 = p.point_code OR t.point_code4 = p.point_code)) - ORDER BY p.update_time + ORDER BY p.update_time DESC