From 957af8db2bc1a06af5f826529f255fd095371e0a Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Tue, 4 Nov 2025 15:41:39 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StructattrServiceImpl.java | 9 ++- .../strategyConfig/dao/StStrategyConfig.java | 2 +- .../impl/base/EmptyVehicleOutHandler.java | 62 +++++++++++++++++++ .../service/impl/MesToWmsServiceImpl.java | 2 +- .../service/impl/PdaIosInServiceImpl.java | 16 ++++- .../dao/mapper/SchBasePointMapper.java | 3 +- .../service/dao/mapper/SchBasePointMapper.xml | 2 +- .../service/util/tasks/PdaPointTask.java | 2 +- .../service/util/tasks/StInTask.java | 2 +- .../service/util/tasks/StOutTask.java | 2 +- .../service/util/tasks/VehicleInTask.java | 2 +- .../service/util/tasks/VehicleOutTask.java | 5 +- .../util/tasks/zw/DownEmptyUpFullTask.java | 14 ++--- .../service/util/tasks/zw/InBillTask.java | 2 +- .../util/tasks/zw/SeparateMaterialTask.java | 3 +- .../service/dept/impl/SysDeptServiceImpl.java | 2 +- .../service/menu/impl/SysMenuServiceImpl.java | 2 +- .../user/impl/ISysUserServiceImpl.java | 2 +- .../service/impl/OutBillServiceImpl.java | 2 +- 19 files changed, 108 insertions(+), 28 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/EmptyVehicleOutHandler.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 00a92b9..89115c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -34,6 +34,8 @@ import org.nl.wms.basedata_manage.service.dto.StructattrChangeDto; import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService; import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy; import org.nl.wms.decision_manage.service.strategyConfig.decisioner.Decisioner; +import org.nl.wms.decision_manage.service.strategyConfig.decisioner.impl.base.EmptyVehicleOutHandler; +import org.nl.wms.decision_manage.service.strategyConfig.enums.StragegyTypeEnum; import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.record.service.IStIvtStructivtflowService; @@ -354,7 +356,12 @@ public class StructattrServiceImpl extends ServiceImpl { + + /** + * 出入库明细服务 + */ + @Autowired + private IStructattrService iStructattrService; + + @Override + public List handler(List list, JSONObject param) { + //查新空托盘 + //当前条件只有id，批次 + log.info("---------执行空托盘出库分配规则---------"); + BigDecimal planQty = param.getBigDecimal("qty"); + List vechielDtos = + iStructattrService.collectVechicleNoGroup(MapOf.of( + "stor_code", param.getString("stor_code") + , "sect_code", param.getString("sect_code") + , "is_lock", "false" + , "occupancy_state", "2" + , "order_by", "ivt.update_time asc")); + if (ObjectUtils.isEmpty(vechielDtos)) { + throw new BadRequestException("库存分配失败，失败原因：没有空托盘"); + } + + List divStruct = new ArrayList<>(); + for (StructattrVechielDto vechielDto : vechielDtos) { + StrategyStructMaterialVO materialVO = new StrategyStructMaterialVO(); + BeanUtils.copyProperties(vechielDto, materialVO); + divStruct.add(materialVO); + } + return divStruct; + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index 73739ae..84ae581 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -530,7 +530,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { param.put("material_code", materDao.getMaterial_code()); param.put("pcsn", groupPlate.getPcsn()); param.put("qty", dto.getQty()); - param.put("qty_unit_name", dto.getQty_unit_name()); + param.put("qty_unit_name", groupPlate.getQty_unit_name()); param.put("stor_id", sectattr.getStor_id()); param.put("supp_code", groupPlate.getSupp_code()); param.put("supp_name", groupPlate.getSupp_name()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index b22d868..f75ab7d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -335,7 +335,9 @@ public class PdaIosInServiceImpl implements PdaIosInService { if (StringUtils.isNotBlank(whereJson.getString("search"))) { materialQuery.setSearch(whereJson.getString("search").trim().toUpperCase()); } - Page mapPage = iMdMeMaterialbaseService.pageMaps(pageQuery.build(), materialQuery.build()); + + materialQuery.setIs_used("1"); + Page mapPage = iMdMeMaterialbaseService.pageMaps(pageQuery.build(), materialQuery.build().orderByAsc("material_code")); return PdaResponse.build(mapPage); } @@ -707,12 +709,20 @@ public class PdaIosInServiceImpl implements PdaIosInService { if (vehicleDao.getStoragevehicle_name().contains("托盘")) { String materialCode = StatusEnum.VEHICLE_TYPE.code("空托盘"); - whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode, false).getMaterial_id()); + MdMeMaterialbase mdMeMaterialbase = iMdMeMaterialbaseService.getByCode(materialCode, false); + if(null == mdMeMaterialbase){ + throw new BadRequestException("请先维护物料编码=【"+StatusEnum.VEHICLE_TYPE.code("空托盘")+"】的空托盘物料"); + } + whereJson.put("material_id", mdMeMaterialbase.getMaterial_id()); whereJson.put("material_code", materialCode); whereJson.put("pcsn", "空托盘入库"); } else { String materialCode = StatusEnum.VEHICLE_TYPE.code("空料桶"); - whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode, false).getMaterial_id()); + MdMeMaterialbase mdMeMaterialbase = iMdMeMaterialbaseService.getByCode(materialCode, false); + if(null == mdMeMaterialbase){ + throw new BadRequestException("请先维护物料编码=【"+StatusEnum.VEHICLE_TYPE.code("空料桶")+"】的空料桶物料"); + } + whereJson.put("material_id", mdMeMaterialbase.getMaterial_id()); whereJson.put("material_code", materialCode); whereJson.put("pcsn", "空料桶入库"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java index 337a2bf..a9f2788 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java @@ -2,6 +2,7 @@ package org.nl.wms.sch_manage.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dto.SchBasePointQuery; @@ -50,7 +51,7 @@ public interface SchBasePointMapper extends BaseMapper { * @param pages 参数 * @return IPage */ - IPage selectPageLeftJoin(IPage pages, SchBasePointQuery whereJson); + IPage selectPageLeftJoin(IPage pages, @Param("whereJson")SchBasePointQuery whereJson); SchBasePoint getNotTaskByRegionAndType(String regionCode, String type); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml index b7260bf..0903305 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml @@ -40,7 +40,7 @@ FROM `sch_base_point` p - + p.workshop_code = #{whereJson.workshop_code} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index 9baff47..3681b12 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.sch_manage.enums.TaskStatus; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java index 3fd5eca..ea025d5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java index b3f0118..14e10a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.sch_manage.enums.TaskStatus; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index 3234d54..3c9f806 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -10,7 +10,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.ext_manage.service.WmsToMesService; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java index edc2341..ed320a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.Structattr; @@ -191,8 +191,9 @@ public class VehicleOutTask extends AbstractTask { new UpdateWrapper().lambda() .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) - .set(SchBasePoint::getIng_task_code,null) + .set(SchBasePoint::getIng_task_code,null) .set(SchBasePoint::getIos_id, null) + .set(SchBasePoint::getVehicle_qty, 1) .set(SchBasePoint::getPoint_status,"2")); //删除组盘表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index 8d88b32..9694d7f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -225,6 +225,13 @@ public class DownEmptyUpFullTask extends AbstractTask { } + + List groupPlates = iMdPbGroupplateService.list(new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); + + outBillService.taskFinish(taskObj); + //点位2 pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, null) @@ -236,11 +243,6 @@ public class DownEmptyUpFullTask extends AbstractTask { .set(SchBasePoint::getIng_task_code,null) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())); - List groupPlates = iMdPbGroupplateService.list(new QueryWrapper().lambda() - .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) - .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); - - boolean groupPlatesNotEmpty = CollectionUtils.isNotEmpty(groupPlates); String groupId = null; if(groupPlatesNotEmpty){ @@ -281,8 +283,6 @@ public class DownEmptyUpFullTask extends AbstractTask { // //删除 // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); - - outBillService.taskFinish(taskObj); // iMdPbGroupplateService.update(new LambdaUpdateWrapper<>(GroupPlate.class) // .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库")) // .eq(GroupPlate::getStoragevehicle_code,taskObj.getVehicle_code())); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java index 122bed3..1056639 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java @@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.Structattr; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index c17b250..4dd80c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -180,6 +180,7 @@ public class SeparateMaterialTask extends AbstractTask { .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); + outBillService.taskFinish(taskObj); boolean groupPlatesNotEmpty = CollectionUtils.isNotEmpty(groupPlates); String groupId = null; @@ -211,8 +212,6 @@ public class SeparateMaterialTask extends AbstractTask { // .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库")) // .eq(GroupPlate::getStoragevehicle_code,taskObj.getVehicle_code())); - outBillService.taskFinish(taskObj); - // //删除 // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java index 1a6cda7..e9059d7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java @@ -13,7 +13,7 @@ import org.nl.common.domain.vo.DeptVo; import org.nl.config.language.LangProcess; import org.nl.wms.system_manage.service.dept.dto.DeptTree; import org.nl.common.utils.CopyUtil; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.system_manage.service.dept.ISysDeptService; import org.nl.wms.system_manage.service.dept.dao.SysDept; import org.nl.wms.system_manage.service.dept.dao.mapper.SysDeptMapper; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java index d0a81ec..e5daab3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java @@ -19,7 +19,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.common.domain.vo.MenuMetaVo; import org.nl.common.domain.vo.MenuVo; import org.nl.common.utils.CopyUtil; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.config.language.LangProcess; import org.nl.wms.system_manage.service.dict.dao.Dict; import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java index 754c703..702f12a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java @@ -19,7 +19,7 @@ import org.nl.common.utils.dto.CurrentUser; import org.nl.config.FileProperties; import org.nl.common.utils.FileUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.wms.system_manage.service.dept.ISysDeptService; import org.nl.wms.system_manage.service.role.ISysRoleService; import org.nl.wms.system_manage.service.secutiry.dto.AuthUserDto; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 36adedc..8708b93 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -16,7 +16,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.IdUtil;; +import org.nl.common.utils.IdUtil; import org.nl.config.SpringContextHolder; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IBsrealStorattrService;