From a6b9e54572459649d83d09361f17a4b83d52f8dd Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sun, 12 May 2024 15:26:32 +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=E5=B1=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 2 +- .../util/impl/InBoxManageServiceImpl.java | 40 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 4bcee8deb..62836f889 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -149,7 +149,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_name", SecurityUtils.getCurrentUsername()); json.put("create_time", DateUtil.now()); json.put("priority", "1"); - json.put("acs_task_type", "7"); + json.put("acs_task_type", "6"); json.put("request_param", form.getString("request_param")); WQLObject.getWQLObject("SCH_BASE_Task").insert(json); return json.getString("task_id"); 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 b140f1f62..3ea681570 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 @@ -155,24 +155,22 @@ public class InBoxManageServiceImpl implements InBoxManageService { new QueryWrapper().lambda() .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no")) ); - - + if (boxDao == null) { + throw new BadRequestException("木箱不存在!"); + } JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'") .uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonVehicle)) { - throw new BadRequestException("载具不存在!"); - } - - JSONObject jsonVeExt = new JSONObject(); - jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); - jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id")); - jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code")); - jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type")); - jsonVeExt.put("pcsn", whereJson.getString("box_no")); - jsonVeExt.put("device_uuid", IdUtil.getLongId()); - veExtTab.insert(jsonVeExt); - + // if (ObjectUtil.isEmpty(jsonVehicle)) { + // throw new BadRequestException("载具不存在!"); + // } +// JSONObject jsonVeExt = new JSONObject(); +// jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); +// jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id")); +// jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code")); +// jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type")); +// jsonVeExt.put("pcsn", whereJson.getString("box_no")); +// jsonVeExt.put("device_uuid", IdUtil.getLongId()); +// veExtTab.insert(jsonVeExt); // 下发桁架任务 JSONObject taskParam = new JSONObject(); taskParam.put("task_type", "010713"); @@ -181,10 +179,10 @@ public class InBoxManageServiceImpl implements InBoxManageService { taskParam.put("vehicle_code", whereJson.getString("vehicle_code")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); JSONObject param = new JSONObject(); - param.put("layer",whereJson.getString("layer")); - param.put("box_length",boxDao.getBox_length()); - param.put("box_width",boxDao.getBox_width()); - param.put("box_high",boxDao.getBox_high()); + param.put("layer", whereJson.getString("layer")); + param.put("box_length", boxDao.getBox_length()); + param.put("box_width", boxDao.getBox_width()); + param.put("box_high", boxDao.getBox_high()); param.put("vehicle_type", boxDao.getVehicle_type()); param.put("box_no", whereJson.getString("box_no")); taskParam.put("request_param", param.toString()); @@ -248,7 +246,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { * box_length：木箱长度 * box_width：木箱宽度 * box_high：木箱高度 - * } + * } * @return JSONObject ： 仓位对象 */ public JSONObject getStruct(JSONObject jsonParam) {