From 497e47beab2576d1268df7a8ddaf56dad7adee00 Mon Sep 17 00:00:00 2001 From: yanps Date: Tue, 3 Sep 2024 17:19:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=87=E7=A8=8B=E4=B8=AD=E9=81=87=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/enums/VehicleTypeEnum.java | 2 +- .../MobileAuthorizationController.java | 2 +- .../service/secutiry/dto/AuthUserDto.java | 2 +- .../impl/WmsToConnectorServiceImpl.java | 14 +- .../wms/ext/fab/service/dto/SendMaterVo.java | 2 + .../ext/fab/service/dto/SendVehicleVo.java | 4 + .../ext/fab/service/dto/SendVehiclesVo.java | 2 +- .../ext/fab/service/impl/FabServiceImpl.java | 2 + .../service/impl/HandheldServiceImpl.java | 185 ++++++++++-------- .../point/service/ISchBasePointService.java | 2 +- .../service/dao/mapper/SchBasePointMapper.xml | 2 +- .../service/impl/SchBasePointServiceImpl.java | 19 +- .../service/impl/SchBaseTaskServiceImpl.java | 29 +-- .../nl/wms/sch/task_manage/AbstractTask.java | 1 + .../task/tasks/handheld/MtTask.java | 2 +- .../task/tasks/handheld/ToStoreHouseTask.java | 9 +- .../tasks/pcoperation/PcOperationSMTTask.java | 11 +- .../tasks/pcoperation/ProcessingSMTTask.java | 1 + .../vehicle/service/dao/BmVehicleInfo.java | 1 + .../impl/BmVehicleInfoServiceImpl.java | 44 +++-- .../src/views/wms/sch/point/index.vue | 63 +++++- .../src/views/wms/sch/vehicle/index.vue | 88 +++------ 22 files changed, 282 insertions(+), 205 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/VehicleTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/VehicleTypeEnum.java index b1e3426..d99773b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/VehicleTypeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/VehicleTypeEnum.java @@ -11,7 +11,7 @@ import lombok.Getter; @AllArgsConstructor public enum VehicleTypeEnum { - TRAY("T001","钢托盘"), + TRAY("G01","钢托盘"), FRAME_R01("R01","料框 1230mm*840mm*990mm"), FRAME_R02("R02","料框 1230mm*840mm*450mm"), RACKS_S04("S04","料架 1230mm*840mm*1670mm"), diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index 5a62b0d..14d3b65 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -123,7 +123,7 @@ public class MobileAuthorizationController { @Log("PC登出") public ResponseEntity loginOut(@Validated @RequestBody AuthUserDto authUser) { // 密码解密 - 前端的加密规则: encrypt（根据实际更改） - redisUtils.del("mobile:" + authUser.getDevice()); + redisUtils.del("mobile:" + authUser.getDevice_code()); return new ResponseEntity(TableDataInfo.build(), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java index f39a853..b3a3432 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java @@ -36,5 +36,5 @@ public class AuthUserDto { private String uuid = ""; - private String device ; + private String device_code ; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/connector/service/impl/WmsToConnectorServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/connector/service/impl/WmsToConnectorServiceImpl.java index f8a00f0..d983259 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/connector/service/impl/WmsToConnectorServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/connector/service/impl/WmsToConnectorServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.wms.ext.connector.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; @@ -53,13 +54,16 @@ public class WmsToConnectorServiceImpl implements WmsToConnectorService { return jsonObject; } else if (ObjectUtil.isNotEmpty(isInvokeConnector) && GeneralDefinition.NO.equals(isInvokeConnector.getValue())) { JSONObject jsonObject = new JSONObject(); - JSONObject jsonObject1 = new JSONObject(); JSONArray objects = new JSONArray(); jsonObject.put("status",200); - jsonObject1.put("due_date",""); - jsonObject1.put("next_region_code",""); - jsonObject1.put("order_code",""); - objects.add(jsonObject1); + JSONArray materials = json.getJSONArray("materials"); + materials.forEach(material -> { + String replace = StrUtil.replace(StrUtil.toString(material), "=", ":"); + JSONObject jsonObject1 = JSONObject.parseObject(replace); + jsonObject1.put("due_date"," "); + jsonObject1.put("next_region_code",""); + objects.add(jsonObject1); + }); jsonObject.put("data",objects); return jsonObject; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java index fafb1f7..ae35c5d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendMaterVo.java @@ -49,4 +49,6 @@ public class SendMaterVo { public String due_date; + List mater; + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehicleVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehicleVo.java index 66a221e..500790b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehicleVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehicleVo.java @@ -23,6 +23,10 @@ public class SendVehicleVo { * 订单号 */ private String order_code; + /** + * 交期时间 + */ + private String due_date; /** * 物料信息 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehiclesVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehiclesVo.java index dad2cc5..c80fa21 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehiclesVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/dto/SendVehiclesVo.java @@ -18,6 +18,6 @@ public class SendVehiclesVo { /** * 物料信息 */ - List sendVehicleVoList; + List mater; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java index 2eee800..7bc7233 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/service/impl/FabServiceImpl.java @@ -25,6 +25,7 @@ import org.nl.wms.sch.task_manage.task.tasks.pcoperation.PcOperationSMTTask; import org.nl.wms.sch.task_manage.task.tasks.pcoperation.PcOperationSNTTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -77,6 +78,7 @@ public class FabServiceImpl { } } + @Transactional(rollbackFor = Exception.class) public void createAgvTask(JSONObject form, String type) { JSONObject param = new JSONObject(); switch (type) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java index 7864be2..035e77e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import nl.basjes.shaded.org.springframework.util.Assert; +import org.nl.common.enums.GoodsEnum; import org.nl.common.enums.VehicleTypeEnum; import org.nl.common.enums.region.RegionEnum; import org.nl.common.exception.BadRequestException; @@ -31,6 +32,7 @@ import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.task.TaskFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -67,7 +69,7 @@ public class HandheldServiceImpl implements HandheldService { String vehicle = param.getString("vehicle_list"); String device_code = param.getString("device_code"); String[] vehicle_list = null; - if(vehicle.contains(",")){ + if (vehicle.contains(",")) { vehicle_list = vehicle.split(","); } if (vehicle_list.length != 2 && vehicle_list.length != 4) { @@ -93,83 +95,99 @@ public class HandheldServiceImpl implements HandheldService { } @Override + @Transactional(rollbackFor = Exception.class) public void cageBlankingTask(JSONObject param) { Assert.noNullElements(new Object[]{param.getString("device_code"), param.getString("vehicle_code")}, "当前点位或目的地不能为空!"); - JSONArray materials = param.getJSONArray("material"); + String region_code = param.getString("region_code"); String device_code = param.getString("device_code"); String vehicle_code = param.getString("vehicle_code"); - /*String material_qty = param.getString("material_qty"); - String material_code = param.getString("material_code");*/ - String region_code = param.getString("region_code"); - /*String order_code = param.getString("order_code");*/ - SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(device_code); - if (ObjectUtil.isEmpty(schBasePoint)) throw new BadRequestException("设备点位不存在!"); - JSONObject json = new JSONObject(); - JSONArray jsonArray = new JSONArray(); - HashMap map = new HashMap<>(); - materials.stream().forEach(material2 -> { - String replace = StrUtil.replace(StrUtil.toString(material2), "=", ":"); - JSONObject jsonObject = JSONObject.parseObject(replace); - map.put("order_code", jsonObject.getString("order_code")); - map.put("qty", jsonObject.getString("material_qty")); - jsonArray.add(map); - }); - json.put("vehicle_code", vehicle_code); - json.put("region_code", region_code); - json.put("materials", jsonArray); - JSONObject json1 = wmsToConnectorService.applyRegionAndDueDate(json); - if (ObjectUtil.isNotEmpty(json1) && json1.getInteger("status") == 200) { - JSONArray date = json1.getJSONArray("data"); - date.stream().forEach(date1 -> { - JSONObject json2 = JSONObject.parseObject(StrUtil.toString(date1)); - materials.stream().forEach(material -> { - String replace = StrUtil.replace(StrUtil.toString(material), "=", ":"); - JSONObject jsonObject = JSONObject.parseObject(replace); - if (jsonObject.getString("order_code").equals(json2.getString("order_code"))) { - jsonObject.put("due_date", json2.getString("due_date")); - jsonObject.put("region_code", json2.getString("next_region_code")); - } - }); - }); - region_code = JSONObject.parseObject(StrUtil.toString(date.get(0))).getString("region_code"); - } else if (ObjectUtil.isNotEmpty(json1)) { - throw new BadRequestException(json1.getString("msg")); - } - param.put("material", materials); - if (!param.getString("region_code").equals(RegionEnum.NBJG.getRegion_code())) { - Assert.noNullElements(param.getJSONArray("material"), "参数不能为空!"); - } AbstractTask connectorTask = taskFactory.getTask("BLANKINGTask"); - JSONObject jo = new JSONObject(); - jo.put("device_code", device_code); - if (RegionEnum.NBJG.getRegion_code().equals(region_code) || RegionEnum.WXJG.getRegion_code().equals(region_code)) { + if (StrUtil.isNotEmpty(region_code) && (RegionEnum.NBJG.getRegion_code().equals(region_code) + || RegionEnum.WXJG.getRegion_code().equals(region_code))) { + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); jo.put("config_code", "ProcessingSMTTask"); + jo.put("create_mode", GeneralDefinition.AUTO_CREATION); + jo.put("vehicle_code", vehicle_code); + jo.put("region_code", region_code); + param.put("target_region_code", region_code); + jo.put("ext_data", param); + connectorTask.apply(jo); + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getPoint_code, device_code) + .set(SchBasePoint::getPoint_status, GoodsEnum.OUT_OF_STOCK.getValue()) + .set(SchBasePoint::getIs_lock, true) + .set(SchBasePoint::getVehicle_code, null)); } else { + Assert.noNullElements(param.getJSONArray("material"), "参数不能为空!"); + JSONArray materials = param.getJSONArray("material"); + SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(device_code); + if (ObjectUtil.isEmpty(schBasePoint)) throw new BadRequestException("设备点位不存在!"); + JSONObject json = new JSONObject(); + JSONArray jsonArray = new JSONArray(); + HashMap map = new HashMap<>(); + materials.stream().forEach(material2 -> { + boolean material_code = ObjectUtil.isEmpty(((LinkedHashMap) material2).get("material_code")); + if (material_code) { + ((LinkedHashMap) material2).remove("material_code"); + } + String replace = StrUtil.replace(StrUtil.toString(material2), "=", ":"); + JSONObject jsonObject = JSONObject.parseObject(replace); + map.put("order_code", jsonObject.getString("order_code")); + map.put("qty", jsonObject.getString("material_qty")); + jsonArray.add(map); + }); + json.put("vehicle_code", vehicle_code); + json.put("region_code", region_code); + json.put("materials", jsonArray); + JSONObject json1 = wmsToConnectorService.applyRegionAndDueDate(json); + if (ObjectUtil.isNotEmpty(json1) && json1.getInteger("status") == 200) { + JSONArray date = json1.getJSONArray("data"); + date.stream().forEach(date1 -> { + JSONObject json2 = JSONObject.parseObject(StrUtil.toString(date1)); + materials.stream().forEach(material -> { + String replace = StrUtil.replace(StrUtil.toString(material), "=", ":"); + JSONObject jsonObject = JSONObject.parseObject(replace); + if (jsonObject.getString("order_code").equals(json2.getString("order_code"))) { + jsonObject.put("due_date", json2.getString("due_date")); + jsonObject.put("region_code", json2.getString("next_region_code")); + } + }); + }); + region_code = JSONObject.parseObject(StrUtil.toString(date.get(0))).getString("region_code"); + } else if (ObjectUtil.isNotEmpty(json1)) { + throw new BadRequestException(json1.getString("msg")); + } + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); jo.put("config_code", "BLANKINGTask"); + jo.put("create_mode", GeneralDefinition.AUTO_CREATION); + jo.put("vehicle_code", vehicle_code); + jo.put("region_code", region_code); + jo.put("ext_data", param); + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getPoint_code, device_code) + .set(SchBasePoint::getIs_lock, true) + .set(SchBasePoint::getPoint_status, GoodsEnum.OUT_OF_STOCK.getValue()) + .set(SchBasePoint::getVehicle_code, null)); + connectorTask.apply(jo); + iSchBaseVehiclematerialgroupService.remove(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) + .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)); + materials.stream().forEach(material -> { + String replace = StrUtil.replace(StrUtil.toString(material), "=", ":"); + JSONObject jsonObject = JSONObject.parseObject(replace); + SchBaseVehiclematerialgroup schBaseVehiclematerialgroup = new SchBaseVehiclematerialgroup(); + schBaseVehiclematerialgroup.setVehicle_code(vehicle_code); + schBaseVehiclematerialgroup.setMaterial_qty(jsonObject.getInteger("material_qty")); + schBaseVehiclematerialgroup.setMaterial_code(jsonObject.getString("material_code")); + schBaseVehiclematerialgroup.setOrder_code(jsonObject.getString("order_code")); + schBaseVehiclematerialgroup.setDue_date(jsonObject.getString("due_date")); + schBaseVehiclematerialgroup.setRegion_code(jsonObject.getString("region_code")); + iSchBaseVehiclematerialgroupService.create(schBaseVehiclematerialgroup); + }); + } - jo.put("create_mode", GeneralDefinition.AUTO_CREATION); - jo.put("vehicle_code", vehicle_code); - jo.put("region_code", region_code); - jo.put("ext_data", param); - connectorTask.apply(jo); - iSchBaseVehiclematerialgroupService.remove(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) - .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)); - materials.stream().forEach(material -> { - String replace = StrUtil.replace(StrUtil.toString(material), "=", ":"); - JSONObject jsonObject = JSONObject.parseObject(replace); - SchBaseVehiclematerialgroup schBaseVehiclematerialgroup = new SchBaseVehiclematerialgroup(); - schBaseVehiclematerialgroup.setVehicle_code(vehicle_code); - schBaseVehiclematerialgroup.setMaterial_qty(jsonObject.getInteger("material_qty")); - schBaseVehiclematerialgroup.setMaterial_code(jsonObject.getString("material_code")); - schBaseVehiclematerialgroup.setOrder_code(jsonObject.getString("order_code")); - schBaseVehiclematerialgroup.setDue_date(jsonObject.getString("due_date")); - schBaseVehiclematerialgroup.setRegion_code(jsonObject.getString("region_code")); - iSchBaseVehiclematerialgroupService.create(schBaseVehiclematerialgroup); - }); - iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) - .eq(SchBasePoint::getPoint_code, device_code) - .set(SchBasePoint::getIs_lock, true)); } @Override @@ -181,20 +199,17 @@ public class HandheldServiceImpl implements HandheldService { .eq(SchBaseRegion::getRegion_code, region_code)); if (ObjectUtil.isEmpty(schBaseRegion)) throw new BadRequestException("该区域不存在!"); List pointCodes = iSchBasePointService.getByRegionCode(region_code); - boolean is_executing = iSchBaseTaskService.selectByPointCodeAndStatus(pointCodes); - if (is_executing) { - return "当前区域有任务正在执行，请等待任务执行完在锁定!"; - } - iSchBaseTaskService.selectByPointCodeAndTaskStatus(pointCodes); if (StrUtil.equals(status, "0")) { iSchBasePointService.releasePoint(region_code); iSchBaseTaskService.updateTaskStatusByPointCode(pointCodes); } else if (StrUtil.equals(status, "1")) { + boolean is_executing = iSchBaseTaskService.selectByPointCodeAndStatus(pointCodes); + if (is_executing) { + throw new BadRequestException("该区域有任务正在执行，请等待任务执行完成再锁定!"); + } + iSchBaseTaskService.selectByPointCodeAndTaskStatus(pointCodes); iSchBasePointService.lockPoint(region_code); } - if (CollUtil.isNotEmpty(pointCodes) && pointCodes.size() > 0) { - return "当前区域已存在的任务有" + pointCodes.size() + "个"; - } return "操作成功"; } @@ -215,9 +230,13 @@ public class HandheldServiceImpl implements HandheldService { jo.put("device_code", device_code); jo.put("config_code", "TOSTOREHOUSETask"); jo.put("create_mode", GeneralDefinition.AUTO_CREATION); - jo.put("vehicle_code", vehicle_type); + jo.put("vehicle_type", vehicle_type); jo.put("ext_data", param); connectorTask.apply(jo); + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getPoint_code, device_code) + .set(SchBasePoint::getIs_lock, true) + .set(SchBasePoint::getPoint_status, GoodsEnum.EMPTY_PALLETS.getValue())); } @Override @@ -248,7 +267,7 @@ public class HandheldServiceImpl implements HandheldService { @Override public void materialTransfer(JSONObject param) { Assert.noNullElements(new Object[]{param.getString("device_code"), param.getString("vehicle_code")}, "参数不能为空!"); - // String vehicle_code = param.getString("vehicle_code"); + String vehicle_code = param.getString("vehicle_code"); String device_code = param.getString("device_code"); SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(device_code); if (ObjectUtil.isEmpty(schBasePoint)) throw new BadRequestException("设备点位不存在!"); @@ -258,10 +277,14 @@ public class HandheldServiceImpl implements HandheldService { jo.put("device_code", device_code); jo.put("config_code", "MTTask"); jo.put("create_mode", GeneralDefinition.AUTO_CREATION); - /*jo.put("vehicle_code", vehicle_code); - jo.put("vehicle_type", mdBaseVehicle.getVehicle_type());*/ + jo.put("vehicle_code", vehicle_code); jo.put("ext_data", param); connectorTask.apply(jo); + iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class) + .eq(SchBasePoint::getPoint_code, device_code) + .set(SchBasePoint::getIs_lock, true) + .set(SchBasePoint::getPoint_status, GoodsEnum.OUT_OF_STOCK.getValue()) + .set(SchBasePoint::getVehicle_code, null)); } @Override @@ -333,7 +356,7 @@ public class HandheldServiceImpl implements HandheldService { public JSONObject deviceInLogin(JSONObject json) { Assert.notNull(json.getString("device_code"), "登录参数不能为空"); - if(StrUtil.isNotEmpty(json.getString("device_code"))){ + if (StrUtil.isNotEmpty(json.getString("device_code"))) { Object regin_code = redisUtils.get("mobile:" + json.getString("device_code")); if (regin_code != null) { throw new BadRequestException("当前设备工序已经登陆,无法继续选择"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java index fa6eef6..ba83a3c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java @@ -142,7 +142,7 @@ public interface ISchBasePointService extends IService { * @param vehicle_type * @return */ - SchBasePoint selectByVehicleQty(String config_code, String vehicle_type); + SchBasePoint selectByVehicleQty(String vehicle_type); /** * 根据载具类型查询点位 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index d36a216..50255e9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -48,7 +48,7 @@