From 81bfb2b213eb246436711ce820fb82bf33ab0f84 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 11 Jun 2025 14:00:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=A9=BA=E6=9C=A8=E7=AE=B1?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E6=89=98=E7=9B=98=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E6=A0=A1=E9=AA=8C=EF=BC=9B=E5=88=86=E5=88=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A5=97=E8=BD=B4=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=EF=BC=9B=E7=83=98=E7=AE=B1?= =?UTF-8?q?=E5=86=B7=E5=8D=B4=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/auto/AutoCallAirShaftTask.java | 7 ++++++- .../util/impl/InBoxManageServiceImpl.java | 17 +++++++++++++++-- .../org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql | 12 ++++++------ .../org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql | 8 ++++---- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 5889dfe85..d93af1908 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -104,6 +104,8 @@ public class AutoCallAirShaftTask extends Prun { public final static String USE_XN = "USE_XN"; public String stepStr = ""; public List stepErrorInfo = new ArrayList<>(); + private static final DateTimeFormatter TIME_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); /** * hint: 目前只是考虑了上区域 @@ -152,7 +154,10 @@ public class AutoCallAirShaftTask extends Prun { if (ObjectUtil.isNotEmpty(useXn) && "1".equals(useXn.getValue())) { planAll = slittingproductionplanService.getAllCutPlan2(integer); } else { - planAll = slittingproductionplanService.getAllCutPlan(integer); + planAll = slittingproductionplanService.getAllCutPlan(integer).stream() + .sorted(Comparator.comparing( + dto -> LocalDateTime.parse(dto.getStart_time(), TIME_FORMATTER) + )).collect(Collectors.toList()); } // 过滤 String value = paramObj.getValue(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 553d0cae8..41bcb4423 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -115,12 +115,25 @@ public class InBoxManageServiceImpl implements InBoxManageService { .eq("is_delete", "0") .orderByDesc("task_id") .last("limit 1")); + String vehicleCode2 = one.getVehicle_code2(); if (one!=null){ - String vehicleCode2 = one.getVehicle_code2(); if (whereJson.getString("vehicle_code").equals(vehicleCode2)){ throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code()); - }; + } } + + //查询托盘重量 + JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicleCode2 + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(vehicle_ext)) { + throw new BadRequestException("未查询到托盘的扩展信息"); + }else { + //判断托盘重量是否为空或小于等于0 + String qty = vehicle_ext.getString("qty"); + if (StrUtil.isEmpty(qty) || Integer.parseInt(qty) <= 0){ + throw new BadRequestException("托盘【"+vehicleCode2+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量！"); + } + } + //查询仓库是否存在相同木箱 JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + boxNo + "'").getResultJSONArray(0); if (stIvtStructattr != null && stIvtStructattr.size() > 0) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index ecda2dc86..5dbf8ea89 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -63,19 +63,19 @@ WHERE cool.product_area in 输入.in_area_id OPTION 输入.point_code <> "" - point_code LIKE 输入.point_code + cool.point_code LIKE 输入.point_code ENDOPTION OPTION 输入.container_name <> "" - container_name LIKE 输入.container_name + cool.container_name LIKE 输入.container_name ENDOPTION OPTION 输入.full_point_status <> "" - full_point_status = 输入.full_point_status + cool.full_point_status = 输入.full_point_status ENDOPTION OPTION 输入.empty_point_status <> "" - empty_point_status = 输入.empty_point_status + cool.empty_point_status = 输入.empty_point_status ENDOPTION OPTION 输入.cool_ivt_status <> "" - cool_ivt_status = 输入.cool_ivt_status + cool.cool_ivt_status = 输入.cool_ivt_status ENDOPTION OPTION 输入.product_area <> "" cool.product_area = 输入.product_area @@ -84,7 +84,7 @@ is_used = 输入.is_used ENDOPTION OPTION 输入.point_location <> "" - point_location = 输入.point_location + cool.point_location = 输入.point_location ENDOPTION OPTION 输入.begin_time <> "" instorage_time >= 输入.begin_time diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql index 66242f97f..2967abff2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql @@ -61,16 +61,16 @@ WHERE hot.product_area in 输入.in_area_id OPTION 输入.point_location <> "" - point_location = 输入.point_location + hot.point_location = 输入.point_location ENDOPTION OPTION 输入.point_code <> "" - point_code LIKE 输入.point_code + hot.point_code LIKE 输入.point_code ENDOPTION OPTION 输入.point_status <> "" - point_status = 输入.point_status + hot.point_status = 输入.point_status ENDOPTION OPTION 输入.product_area <> "" - product_area = 输入.product_area + hot.product_area = 输入.product_area ENDOPTION OPTION 输入.is_used <> "" is_used = 输入.is_used