From a8239e083b96b9c03d6247af441283e2d07733ed Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 20 Mar 2025 18:48:05 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=89=98=E7=9B=98=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iostorInv/util/impl/InBoxManageServiceImpl.java | 9 +++++++++ .../src/main/resources/config/application.yml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) 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 714f596c9..fb6b94d1c 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 @@ -109,6 +109,15 @@ public class InBoxManageServiceImpl implements InBoxManageService { if (count > 0) { throw new BadRequestException("当前木箱入库任务已存在" + boxNo); } + SchBaseTask one = ischBaseTaskService.getOne(new QueryWrapper() + .eq("task_type", "010702") + .eq("is_delete", "0") + .orderByDesc("task_id") + .last("limit 1")); + String vehicleCode2 = one.getVehicle_code2(); + if (whereJson.getString("vehicle_code").equals(vehicleCode2)){ + throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code()); + }; //查询仓库是否存在相同木箱 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/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index a9fc87884..a435e1108 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: