From 31b9884281b39ec6fb4db0d4e2bae3f40342c7cc Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Tue, 24 Jun 2025 09:42:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=A5=97=E8=BD=B4=E9=80=BB=E8=BE=91SQL?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index e76ec1a73..0df4f9393 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -553,7 +553,10 @@ public class FeedingServiceImpl implements FeedingService { //查询对应的分切点位是否存在 JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("empty_point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(cut_jo)) { - throw new BadRequestException("请输入或者扫码分切区域的空轴点位！"); + cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(cut_jo)) { + throw new BadRequestException("请输入或者扫码分切区域的空轴点位！"); + } } if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) { throw new BadRequestException("该点位库存状态不存在空轴！"); From c300f9fdb9be791fc2387a0d1db4c168241515b2 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 24 Jun 2025 11:06:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=A5=BC?= =?UTF-8?q?=E8=A1=A5=E7=A9=BA=E8=BD=BD=E5=85=B7/=E9=80=81=E6=BB=A1?= =?UTF-8?q?=E8=BD=B4/=E8=A3=85=E7=AE=B1=E7=A9=BA=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E4=BB=BB=E5=8A=A1=E7=9B=B4=E6=8E=A5=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../first_floor_area/DjqToKzjhcwTask.java | 22 ++++++++++- .../sch/tasks/first_floor_area/MzhcwTask.java | 2 +- .../first_floor_area/SendDjqKzjTask.java | 2 +- .../nl/wms/sch/manage/AbstractAcsTask.java | 38 ++++++------------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java index ec0b144bc..a7801c5aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java @@ -55,6 +55,26 @@ public class DjqToKzjhcwTask extends AbstractAcsTask { private IbstIvtPackageinfoivtService packageinfoivtService; + @Override + public List addTask(SchBaseTask r) { + ArrayList resultList = new ArrayList<>(); + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(r.getTask_id().toString()) + .task_code(r.getTask_code()) + .task_type(r.getAcs_task_type()) + .start_device_code(r.getPoint_code1()) + .next_device_code(r.getPoint_code2()) + .vehicle_code(r.getVehicle_code()) + .priority(r.getPriority()) + .remark(r.getRemark()) + .product_area(r.getProduct_area()) + .agv_action_type(r.getVehicle_code2()) + .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务")) + .interaction_json(JSON.parseObject(r.getRequest_param())) + .build(); + resultList.add(dto); + return resultList; + } @Override public List addTask() { @@ -188,7 +208,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask { taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(null); + this.immediateTaskNotifyAcs(task); } return task.getTask_id(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java index 9bb253166..ca80ab320 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java @@ -336,7 +336,7 @@ public class MzhcwTask extends AbstractAcsTask { taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(task,""); + this.immediateTaskNotifyAcs(task); } return task.getTask_id(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java index 3533872bc..c1b176d42 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java @@ -164,7 +164,7 @@ public class SendDjqKzjTask extends AbstractAcsTask { taskService.save(task); //如果目标点位没有空位先创建不下发 if (isSend) { - this.immediateNotifyAcs(task,""); + this.immediateTaskNotifyAcs(task); } return task.getTask_id(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index b7521127f..4ec78b54f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -37,23 +37,13 @@ public abstract class AbstractAcsTask { return addTask(); } - public List schedule(String taskId) { - return addTask(taskId); - } - - public List schedule(SchBaseTask task) { - return addTask(task); - } - /** * 添加任务进行下发 * * @return */ public abstract List addTask(); - public List addTask(String taskId){ - throw new BadRequestException("当前类没有重写addTask(taskId)方法"); - }; + public List addTask(SchBaseTask task){ throw new BadRequestException("当前类没有重写addTask(taskId)方法"); }; @@ -128,34 +118,28 @@ public abstract class AbstractAcsTask { /** * */ - public JSONObject immediateNotifyAcs(Object task_id) { + public JSONObject immediateNotifyAcs(String task_id) { try { Thread.sleep(1000); }catch (Exception ex){ } - List taskList; - if (ObjectUtil.isEmpty(task_id)){ - taskList = this.schedule(); + List taskList = this.schedule(); + if (ObjectUtil.isNotEmpty(taskList)) { + JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); + if (acsUtil == null){ + return AcsUtil.notifyAcs("api/wms/task", arr); }else { - taskList = this.schedule((String) task_id); - } - if (ObjectUtil.isNotEmpty(taskList)) { - JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - if (acsUtil == null){ - return AcsUtil.notifyAcs("api/wms/task", arr); - }else { - return acsUtil.notifyAcs3("api/wms/task", arr); - } + return acsUtil.notifyAcs3("api/wms/task", arr); } + } return null; - } - public JSONObject immediateNotifyAcs(SchBaseTask task,String taskId) { + public JSONObject immediateTaskNotifyAcs(SchBaseTask task) { if (task==null){ throw new BadRequestException("任务下发参数不能为空"); } - List taskList = this.schedule(task); + List taskList = this.addTask(task); if (ObjectUtil.isNotEmpty(taskList)) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); if (acsUtil == null){ From eba37aa061e371cbac353a8b47c318592d1ee35b Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 24 Jun 2025 11:07:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=A5=BC?= =?UTF-8?q?=E8=A1=A5=E7=A9=BA=E8=BD=BD=E5=85=B7/=E9=80=81=E6=BB=A1?= =?UTF-8?q?=E8=BD=B4/=E8=A3=85=E7=AE=B1=E7=A9=BA=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E4=BB=BB=E5=8A=A1=E7=9B=B4=E6=8E=A5=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java index 39763624f..ecf61e6df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java @@ -182,7 +182,7 @@ public class SendShaftToCacheTask extends AbstractAcsTask { } @Override - public JSONObject immediateNotifyAcs(Object task_id) { + public JSONObject immediateNotifyAcs(String task_id) { try { Thread.sleep(1000); } catch (Exception ex) {