From 34def7f32a468121246e170b242b50b4644f8af0 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sat, 11 May 2024 22:09:26 +0800 Subject: [PATCH 1/2] =?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 --- .../service/impl/VehicleTwoServiceImpl.java | 2 -- .../nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 11 +++++++-- .../util/impl/InBoxManageServiceImpl.java | 8 +++---- .../acs/service/impl/AcsToWmsServiceImpl.java | 23 +++---------------- .../main/java/org/nl/wms/sch/AcsTaskDto.java | 4 ++++ lms/nladmin-ui/.env.development | 5 ++-- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java index 504d0e3bd..451d34124 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java @@ -42,10 +42,8 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { public JSONObject boxIn(JSONObject whereJson) { // 调用接口 inBoxManageService.boxBinVehicle(whereJson); - JSONObject result = new JSONObject(); result.put("message", "入库成功!"); - return result; } 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 bb214754a..e53201fe1 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 二期入木箱行架任务类 @@ -38,7 +40,6 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) @@ -50,6 +51,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .interaction_json(JSONObject.parseObject(json.getString("request_param"))) .remark(json.getString("remark")) .build(); resultList.add(dto); @@ -143,7 +145,12 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_time", DateUtil.now()); json.put("priority", "1"); json.put("acs_task_type", "7"); - + if(StringUtils.isNotBlank(form.getString("layer"))) + { + JSONObject layer= new JSONObject(); + layer.put("layer",form.getString("layer")); + json.put("request_param", layer); + } 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 bceda36d7..1eda2d531 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 @@ -151,9 +151,9 @@ public class InBoxManageServiceImpl implements InBoxManageService { JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'") .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVehicle)) { - throw new BadRequestException("载具不存在!"); - } + if (ObjectUtil.isEmpty(jsonVehicle)) { + throw new BadRequestException("载具不存在!"); + } JSONObject jsonVeExt = new JSONObject(); jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); @@ -171,7 +171,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { taskParam.put("next_device_code", "1001"); taskParam.put("vehicle_code", whereJson.getString("box_no")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); - + taskParam.put("layer", whereJson.getString("layer")); TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); taskBean.createTask(taskParam); taskBean.immediateNotifyAcs(null); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index bf32c89f0..536a92415 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1,4 +1,5 @@ package org.nl.wms.ext.acs.service.impl; + import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; @@ -1323,11 +1324,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { WQLObject.getWQLObject("st_ivt_shaftivt").update(rgv_device); //如果套管工位有货且套轴区域无轴，搬运一根轴到穿拔轴机上 - if (rgv_device.getIntValue("have_qzz") == 0){ + if (rgv_device.getIntValue("have_qzz") == 0) { //判断当前穿拔轴机构上是否存在可用的气涨轴 String cbj_qzz = cbz_jo.getString("have_qzz"); //判断是否存在未完成的成品下卷任务 - JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); + JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '" + product_area + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); if ("0".equals(cbj_qzz) && ObjectUtil.isEmpty(container_jo)) { PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); //查询套管工位的库存信息 @@ -1814,46 +1815,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public JSONObject applyTwo(JSONObject whereJson) { log.info("applyTwo请求参数：---------------------------------------------" + whereJson.toString()); JSONObject result = new JSONObject(); - String type = whereJson.getString("type"); RLock lock = redissonClient.getLock("acs_to_wms_two_a:" + type); boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); - try { if (tryLock) { // 基础校验 if (ObjectUtil.isEmpty(whereJson.getString("device_code"))) { throw new BadRequestException("设备不能为空!"); } - if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) { if (ObjectUtil.isEmpty(whereJson.getString("container_type"))) { throw new BadRequestException("载具类型不能为空!"); } - if (ObjectUtil.isEmpty(whereJson.getString("vehicle_code"))) { throw new BadRequestException("载具不能为空!"); } } - // 1-成品入库任务 if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("成品入库任务"))) { - // 调用服务处理 if (ObjectUtil.isEmpty(whereJson.getString("material_barcode"))) { throw new BadRequestException("子卷号不能为空!"); } - inBussManageService.inTask(whereJson); - } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) { - // 2-空盘入库 whereJson.put("vehicle_type", whereJson.getString("container_type")); inVehicleManageService.inVehicle(whereJson); - } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘出库"))) { - // 3-空盘出库 if (ObjectUtil.isEmpty(whereJson.getString("container_type"))) { throw new BadRequestException("载具类型不能为空!"); @@ -1861,28 +1851,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { whereJson.put("vehicle_type", whereJson.getString("container_type")); outVehicleManageService.outVehicle(whereJson); } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("异常处理位"))) { - // 4-空木箱异常处理 if (ObjectUtil.isEmpty(whereJson.getString("material_barcode"))) { throw new BadRequestException("木箱号不能为空!"); } - JSONObject jsonTaskParam = new JSONObject(); jsonTaskParam.put("task_type", "010710"); jsonTaskParam.put("start_device_code", whereJson.getString("device_code")); jsonTaskParam.put("next_device_code", "B1_ERRO"); jsonTaskParam.put("vehicle_code", whereJson.getString("material_barcode")); - TwoBoxExcepTask taskBean = new TwoBoxExcepTask(); taskBean.createTask(jsonTaskParam); } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("木箱入库"))) { - // 5-木箱入库 whereJson.put("box_no", whereJson.getString("material_barcode")); inBoxManageService.inBox(whereJson); } - - result.put("status", HttpStatus.OK.value()); result.put("message", "下发成功!"); log.info("applyTwo返回参数：---------------------------------------------" + result.toString()); @@ -1893,7 +1877,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { lock.unlock(); } } - result.put("status", HttpStatus.BAD_REQUEST.value()); result.put("message", "申请任务超时！" + type); log.info("applyTwo返回参数：---------------------------------------------" + result.toString()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java index 08ad052de..fbcd0967b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java @@ -59,6 +59,10 @@ public class AcsTaskDto { * 扩展参数 */ private String params; + + + + /** * 温度 */ diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development index 809e77ff1..383d102d2 100644 --- a/lms/nladmin-ui/.env.development +++ b/lms/nladmin-ui/.env.development @@ -1,8 +1,9 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8010' -VUE_APP_WS_API = 'ws://localhost:8010' +VUE_APP_BASE_API = 'http://localhost:8011' +VUE_APP_WS_API = 'ws://localhost:8011' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true + From 9eea3bb5ea3b9798547d43a96b26a66b4ab0c81f Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sat, 11 May 2024 22:23:02 +0800 Subject: [PATCH 2/2] =?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 | 23 +++++++------------ .../util/impl/InBoxManageServiceImpl.java | 1 - 2 files changed, 8 insertions(+), 16 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 35c9fd25d..4bcee8deb 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 @@ -36,12 +36,10 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { * 下发给ACS时需要特殊处理 */ JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); - ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - - JSONObject params = json.getJSONObject("params"); + //JSONObject params = json.getJSONObject("params"); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) @@ -53,13 +51,13 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) - .interaction_json(JSONObject.parseObject(json.getString("request_param"))) + .interaction_json(json.getJSONObject("request_param")) .remark(json.getString("remark")) - .layer(json.getString("layer")) - .barcode(params.getString("box_no")) - .height(params.getString("height")) - .width(params.getString("width")) - .length(params.getString("length")) + // .layer(params.getString("layer")) + // .barcode(params.getString("box_no")) + // .height(params.getString("height")) + // .width(params.getString("width")) + // .length(params.getString("length")) .build(); resultList.add(dto); } @@ -152,12 +150,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_time", DateUtil.now()); json.put("priority", "1"); json.put("acs_task_type", "7"); - if(StringUtils.isNotBlank(form.getString("layer"))) - { - JSONObject layer= new JSONObject(); - layer.put("layer",form.getString("layer")); - json.put("request_param", layer); - } + 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 288a48ad8..477c225e9 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 @@ -188,7 +188,6 @@ public class InBoxManageServiceImpl implements InBoxManageService { param.put("vehicle_type", boxDao.getVehicle_type()); param.put("box_no", whereJson.getString("box_no")); taskParam.put("request_param", param.toString()); - TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); taskBean.createTask(taskParam); taskBean.immediateNotifyAcs(null);