From e8ae62aa4c60e295916272ea58ac602d9f81fc6b Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Thu, 24 Oct 2024 10:40:48 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E8=BD=BD=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=A1=A8=20=E6=B6=89=E5=8F=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VehicleTwoServiceImpl.java | 26 +- .../org/nl/b_lms/sch/tasks/TwoInBoxTask.java | 51 +-- .../nl/b_lms/sch/tasks/TwoMoveBoxTask.java | 2 - .../sch/tasks/TwoOutExceptionalTask.java | 21 +- .../nl/b_lms/sch/tasks/TwoOutHeapTask.java | 19 +- .../impl/StIvtIostorinvOutServiceImpl.java | 54 ++- .../impl/StIvtIostorinvServiceImpl.java | 15 +- .../impl/StIvtIostorinvdtlServiceImpl.java | 97 ++--- .../util/impl/InBoxManageServiceImpl.java | 21 +- .../util/impl/LashManageServiceImpl.java | 42 +- .../util/impl/OutBoxManageServiceImpl.java | 37 +- .../util/impl/OutBussManageServiceImpl.java | 44 ++- .../util/impl/SendOutManageServiceImpl.java | 6 - .../modules/tools/config/MultipartConfig.java | 48 --- .../tools/rest/LocalStorageController.java | 107 ----- .../tools/service/LocalStorageService.java | 98 ----- .../tools/service/dto/LocalStorageDto.java | 43 -- .../dto/LocalStorageQueryCriteria.java | 37 -- .../service/impl/LocalStorageServiceImpl.java | 367 ------------------ .../service/mapstruct/LocalStorageMapper.java | 32 -- .../basedata/master/rest/SalesController.java | 60 --- .../rest/StoragevehicleinfoController.java | 83 ---- .../basedata/master/rest/UnitController.java | 71 ---- .../master/sales/service/SalesService.java | 9 +- .../sales/service/impl/SalesServiceImpl.java | 17 +- .../basedata/master/service/SalesService.java | 74 ---- .../service/StoragevehicleinfoService.java | 84 ---- .../basedata/master/service/UnitService.java | 76 ---- .../basedata/master/service/dto/SalesDto.java | 26 -- .../service/dto/StoragevehicleinfoDto.java | 63 --- .../basedata/master/service/dto/UnitDto.java | 41 -- .../master/service/impl/SalesServiceImpl.java | 131 ------- .../impl/StoragevehicleinfoServiceImpl.java | 271 ------------- .../master/service/impl/UnitServiceImpl.java | 161 -------- .../service/StoragevehicleinfoService.java | 15 +- .../service/dao/Storagevehicleex.java | 4 +- .../impl/StoragevehicleinfoServiceImpl.java | 25 +- .../master/unit/cotroller/UnitController.java | 2 +- .../master/unit/service/UnitService.java | 12 +- .../unit/service/impl/UnitServiceImpl.java | 47 ++- .../basedata/st/rest/StructivtController.java | 8 - .../basedata/st/service/StructivtService.java | 1 - .../st/service/impl/StructivtServiceImpl.java | 8 - .../service/impl/StructattrServiceImpl.java | 12 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 56 +-- .../mes/service/impl/MesToLmsServiceImpl.java | 19 +- .../sap/service/impl/SapToLmsServiceImpl.java | 48 +-- .../mps/service/impl/CasingServiceImpl.java | 18 +- .../mps/service/impl/FeedingServiceImpl.java | 14 +- .../main/java/org/nl/wms/sch/ComPareUtil.java | 16 +- .../nl/wms/sch/manage/AutoSendSalesIvt.java | 16 +- .../impl/RawAssistIStorServiceImpl.java | 17 +- .../service/impl/StorPublicServiceImpl.java | 4 - .../service/impl/ChangeServiceImpl.java | 9 +- .../service/impl/RecutPlanServiceImpl.java | 12 +- .../service/impl/RegionioOutServiceImpl.java | 12 +- .../views/wms/basedata/st/ivt/structivt.js | 9 +- 57 files changed, 411 insertions(+), 2307 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java 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 33e0270..4316a93 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 @@ -1,5 +1,6 @@ package org.nl.b_lms.pda.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -15,9 +16,11 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBoxManageService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBussManageService; -import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InVehicleManageService; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.mes.service.LmsToMesService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,12 +31,6 @@ import org.springframework.transaction.annotation.Transactional; @Slf4j public class VehicleTwoServiceImpl implements VehicleTwoService { - /** - * 入空载具服务 - */ - @Autowired - private InVehicleManageService inVehicleManageService; - /** * 入空木箱服务 */ @@ -52,8 +49,10 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { @Autowired private LmsToMesService lmsToMesService; - - + @Autowired + private StoragevehicleinfoService storagevehicleinfoService; + @Autowired + private StoragevehicleexMapper storagevehicleexMapper; /** * 点位服务 */ @@ -181,7 +180,6 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { @Override @Transactional(rollbackFor = Exception.class) public JSONObject reback(JSONObject whereJson) { - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); String bill_type = whereJson.getString("bill_type"); whereJson.put("material_barcode", whereJson.getString("box_no")); @@ -240,12 +238,14 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { whereJson.put("vehicleType", boxDao1.getVehicle_type()); } // 更新载具对应木箱信息 - JSONObject jsonExt = extTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0); + Storagevehicleex jsonExt = storagevehicleinfoService.getExtByCode(whereJson.getString("vehicle_code")); + if (ObjectUtil.isEmpty(jsonExt)) { throw new BadRequestException("载具不存在!"+whereJson.getString("vehicle_code")); } - jsonExt.put("pcsn", whereJson.getString("box_no")); - extTab.update(jsonExt); + jsonExt.setPcsn(whereJson.getString("box_no")); + jsonExt.setUpdate_time(DateUtil.now()); + storagevehicleexMapper.updateById(jsonExt); inBussManageService.inTask(whereJson); JSONObject result = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java index 1dd21b6..74fbb53 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java @@ -6,13 +6,19 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @@ -31,6 +37,11 @@ public class TwoInBoxTask extends AbstractAcsTask { */ private final String THIS_CLASS = TwoInBoxTask.class.getName(); + @Autowired + StoragevehicleinfoService storagevehicleinfoService; + + @Autowired + StoragevehicleexMapper storagevehicleexMapper; @Override public List addTask() { /* @@ -70,13 +81,9 @@ public class TwoInBoxTask extends AbstractAcsTask { // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - // 载具扩展属性表 - WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); // 任务表 WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0); // 更新任务的参数 @@ -102,28 +109,25 @@ public class TwoInBoxTask extends AbstractAcsTask { jsonAttr.put("storagevehicle_code", jsonTask.getString("vehicle_code")); attrTab.update(jsonAttr); - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + jsonTask.getString("vehicle_code2") + "'") - .uniqueResult(0); + Storagevehicleinfo jsonVehicle = storagevehicleinfoService.getInfoByCode(jsonTask.getString("vehicle_code2")); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在!"); } - JSONObject ext_jo = veExtTab.query("storagevehicle_code = '"+jsonVehicle.getString("storagevehicle_code")+"'").uniqueResult(0); + Storagevehicleex ext_jo = storagevehicleinfoService.getExtByCode(jsonVehicle.getStoragevehicle_code()); if (ObjectUtil.isEmpty(ext_jo)) { - JSONObject jsonVeExt = new JSONObject(); - jsonVeExt.put("storagevehicleext_id", org.nl.common.utils.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", jsonTask.getString("vehicle_code")); - jsonVeExt.put("device_uuid", org.nl.common.utils.IdUtil.getLongId()); - jsonVeExt.put("update_time", DateUtil.now()); - veExtTab.insert(jsonVeExt); + ext_jo = new Storagevehicleex(); + ext_jo.setStoragevehicleext_id( org.nl.common.utils.IdUtil.getLongId()); + ext_jo.setStoragevehicle_id(jsonVehicle.getStoragevehicle_id()); + ext_jo.setStoragevehicle_code(jsonVehicle.getStoragevehicle_code()); + ext_jo.setStoragevehicle_type(jsonVehicle.getStoragevehicle_type()); + ext_jo.setPcsn(jsonTask.getString("vehicle_code")); + ext_jo.setDevice_uuid(org.nl.common.utils.IdUtil.getLongId()); + ext_jo.setUpdate_time(DateUtil.now()); + storagevehicleexMapper.insert(ext_jo); }else { - ext_jo.put("pcsn", jsonTask.getString("vehicle_code")); - ext_jo.put("device_uuid", org.nl.common.utils.IdUtil.getLongId()); - ext_jo.put("update_time", DateUtil.now()); - veExtTab.update(ext_jo); - } } + storagevehicleexMapper.updateById(ext_jo); + } + } // 取消 if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { @@ -141,8 +145,9 @@ public class TwoInBoxTask extends AbstractAcsTask { attrTab.update(jsonAttr); // 删除载具对应木箱记录 - veExtTab.delete("pcsn = '" + jsonTask.getString("vehicle_code") + "'"); - + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonTask.getString("vehicle_code")); + storagevehicleexMapper.delete(lam); } map.put("update_optid", SecurityUtils.getCurrentUserId()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java index 48f7774..00c2c5d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java @@ -69,8 +69,6 @@ public class TwoMoveBoxTask extends AbstractAcsTask { // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); // 载具扩展属性表 - WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); - // 载具扩展属性表 WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); JSONObject taskObj = taskTab.query("task_code = '" + task.getString("task_code") + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java index 5061b75..fa13d0e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java @@ -2,18 +2,21 @@ package org.nl.b_lms.sch.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @@ -31,7 +34,8 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { * 处理类 */ private final String THIS_CLASS = TwoOutExceptionalTask.class.getName(); - + @Autowired + StoragevehicleexMapper storagevehicleexMapper; @Override public List addTask() { /* @@ -73,8 +77,6 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 点位表 WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0); @@ -101,11 +103,12 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { JSONObject jsonDis = disTab.query("iostorinv_id = '" + jsonTask.getString("table_fk") + "' and struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); JSONObject jsonPoint = pointTab.query("region_id = '" + RegionTypeEnum.TWO_OUT01.getId() + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); - + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonTask.getString("vehicle_code")); // 查询木箱对应的载具 - JSONObject jsonVeExt = extTab.query("pcsn = '" + jsonTask.getString("vehicle_code") + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeExt)) { + List jsonVeExts = storagevehicleexMapper.selectList(lam); + + if (jsonVeExts.size() == 0) { throw new BadRequestException("此木箱没有绑定托盘号!"+jsonTask.getString("vehicle_code")); } @@ -114,7 +117,7 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { jsonTaskParam.put("point_code1", jsonTask.getString("point_code2")); jsonTaskParam.put("point_code2", jsonPoint.getString("point_code")); jsonTaskParam.put("vehicle_code", jsonTask.getString("vehicle_code")); - jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); + jsonTaskParam.put("vehicle_code2", jsonVeExts.get(0).getStoragevehicle_code()); jsonTaskParam.put("task_group_id", jsonDis.getString("task_id")); jsonTaskParam.put("is_auto_issue", IOSEnum.IS_SEND.code("否")); jsonTaskParam.put("table_fk", jsonTask.getString("table_fk")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java index 6295818..cdd6c8d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvOutServiceImpl; import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.LashManageServiceImpl; @@ -14,9 +16,12 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +37,8 @@ import java.util.stream.Collectors; @Service public class TwoOutHeapTask extends AbstractAcsTask { private final String THIS_CLASS = TwoOutHeapTask.class.getName(); - + @Autowired + StoragevehicleexMapper storagevehicleexMapper; @Override public List addTask() { /* @@ -217,12 +223,11 @@ public class TwoOutHeapTask extends AbstractAcsTask { // 如果是异常出库口则不需要下发行架任务 if (jsonTask.getString("point_code2").equals(IOSEnum.EXCEP_OUT.code("异常出库口"))) { // 解绑托盘对应关系 - WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); - JSONObject ext_jo = veExtTab.query("pcsn = '" + jsonTask.getString("vehicle_code") + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(ext_jo)) { - ext_jo.put("pcsn", ""); - veExtTab.update(ext_jo); - } + + LambdaUpdateWrapper lam = new LambdaUpdateWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonTask.getString("vehicle_code")); + lam.set(Storagevehicleex::getPcsn,""); + storagevehicleexMapper.update(null,lam); } else { // 下发桁架任务：捆扎 JSONObject jsonParam = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 2f80108..5035c8e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -36,6 +36,8 @@ import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.system.service.param.ISysParamService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.basedata.st.storattr.service.StorattrService; import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -104,12 +106,14 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonLow.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size()==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+jsonLow.getString("storagevehicle_code")); } @@ -1372,7 +1375,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl attrRowList, String iostorinv_id, Consumer allTransactionConsumer) { // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - // 子卷包装关系表 - WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 任务表 WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); JSONObject result = new JSONObject(); @@ -1500,9 +1499,10 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonLow.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() ==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+jsonLow.getString("storagevehicle_code")); } @@ -1512,7 +1512,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,json.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() ==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+json.getString("storagevehicle_code")); } @@ -1626,7 +1625,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,json.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() == 0) { throw new BadRequestException("此木箱没有绑定托盘号!"+json.getString("storagevehicle_code")); } @@ -1758,7 +1756,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl list = (ArrayList) whereJson.get("tableMater"); @@ -540,9 +542,10 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonDis.get("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size()==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+whereJson.get("vehicle_code")); } @@ -552,7 +555,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl materialCodeIn = rows.stream() .map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getString("product_name")) .distinct() - .collect(Collectors.joining("','")); + .collect(Collectors.toList()); - List materList = WQLObject.getWQLObject("md_me_materialbase") - .query("material_code in ('" + materialCodeIn + "')") - .getResultJSONArray(0).toJavaList(JSONObject.class); - - // 查询所有物料对应的计量单位 - String unitIdIn = materList.stream() - .map(row -> row.getString("base_unit_id")) - .distinct() - .collect(Collectors.joining("','")); - - List unitList = WQLObject.getWQLObject("md_pb_measureunit") - .query("measure_unit_id in ('" + unitIdIn + "')") - .getResultJSONArray(0).toJavaList(JSONObject.class); + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.in(Materialbase::getMaterial_code,materialCodeIn); + lam.eq(Materialbase::getIs_delete,"0"); + List materList = materialbaseMapper.selectList(lam); // 明细批量插入集合 ArrayList dtlDaoList = new ArrayList<>(); @@ -86,37 +85,32 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl materDaoList = materList.stream() - .filter(item -> item.getString("material_code").equals(row.getString("product_name"))) + List materDaoList = materList.stream() + .filter(item -> item.getMaterial_code().equals(row.getString("product_name"))) .collect(Collectors.toList()); - if (ObjectUtil.isEmpty(materDaoList)) { throw new BadRequestException("物料："+row.getString("product_name")+"不存在，请检查数据!"); } - JSONObject materDao = materDaoList.get(0); + Materialbase materDao = materDaoList.get(0); // 匹配物料对应的计量单位 - List unitDaoList = unitList.stream() - .filter(item -> item.getString("measure_unit_id").equals(materDao.getString("base_unit_id"))) - .collect(Collectors.toList()); + Unit unitDao = unitMapper.selectById(materDao.getBase_unit_id()); - if (ObjectUtil.isEmpty(unitDaoList)) { + if (ObjectUtil.isEmpty(unitDao)) { throw new BadRequestException("物料："+row.getString("product_name")+"的计量单位不存在，请检查数据!"); } - JSONObject unitDao = unitDaoList.get(0); - StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder() .iostorinvdtl_id(IdUtil.getLongId()) .iostorinv_id(iostorinv_id) .seq_no(BigDecimal.valueOf(i+1)) - .material_id(materDao.getLongValue("material_id")) + .material_id(Long.valueOf(materDao.getMaterial_id())) .pcsn(row.getString("container_name")) .quality_scode(row.getString("quality_scode")) .bill_status(IOSEnum.BILL_STATUS.code("生成")) - .qty_unit_id(unitDao.getLongValue("measure_unit_id")) - .qty_unit_name(unitDao.getString("unit_name")) + .qty_unit_id(unitDao.getMeasure_unit_id()) + .qty_unit_name(unitDao.getUnit_name()) .plan_qty(row.getBigDecimal("plan_qty")) .source_bill_type(row.getString("source_bill_type")) .source_bill_code(row.getString("source_bill_code")) @@ -171,27 +165,6 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl().lambda() .eq(StIvtIostorinvdtl::getIostorinv_id, iostorinv_id) ); - - // 查询所有对应物料集合 - String materialIdIn = rows.stream() - .map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getString("material_id")) - .distinct() - .collect(Collectors.joining("','")); - - List materList = WQLObject.getWQLObject("md_me_materialbase") - .query("material_id in ('" + materialIdIn + "')") - .getResultJSONArray(0).toJavaList(JSONObject.class); - - // 查询所有物料对应的计量单位 - String unitIdIn = materList.stream() - .map(row -> row.getString("base_unit_id")) - .distinct() - .collect(Collectors.joining("','")); - - List unitList = WQLObject.getWQLObject("md_pb_measureunit") - .query("measure_unit_id in ('" + unitIdIn + "')") - .getResultJSONArray(0).toJavaList(JSONObject.class); - // 明细批量插入集合 ArrayList dtlDaoList = new ArrayList<>(); @@ -199,37 +172,27 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl materDaoList = materList.stream() - .filter(item -> item.getString("material_id").equals(row.getString("material_id"))) - .collect(Collectors.toList()); - - if (ObjectUtil.isEmpty(materDaoList)) { + Materialbase materDao = materialbaseMapper.selectById(row.getString("material_id")); + if (ObjectUtil.isEmpty(materDao)) { throw new BadRequestException("物料："+row.getString("product_name")+"不存在，请检查数据!"); } - JSONObject materDao = materDaoList.get(0); - // 匹配物料对应的计量单位 - List unitDaoList = unitList.stream() - .filter(item -> item.getString("measure_unit_id").equals(materDao.getString("base_unit_id"))) - .collect(Collectors.toList()); - - if (ObjectUtil.isEmpty(unitDaoList)) { + Unit unitDao = unitMapper.selectById(materDao.getBase_unit_id()); + if (ObjectUtil.isEmpty(unitDao)) { throw new BadRequestException("物料："+row.getString("product_name")+"的计量单位不存在，请检查数据!"); } - JSONObject unitDao = unitDaoList.get(0); - StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder() .iostorinvdtl_id(IdUtil.getLongId()) .iostorinv_id(iostorinv_id) .seq_no(BigDecimal.valueOf(i+1)) - .material_id(materDao.getLongValue("material_id")) + .material_id(Long.valueOf(materDao.getMaterial_id())) .pcsn(row.getString("pcsn")) .quality_scode(row.getString("quality_scode")) .bill_status(IOSEnum.BILL_STATUS.code("生成")) - .qty_unit_id(unitDao.getLongValue("measure_unit_id")) - .qty_unit_name(unitDao.getString("unit_name")) + .qty_unit_id(unitDao.getMeasure_unit_id()) + .qty_unit_name(unitDao.getUnit_name()) .plan_qty(row.getBigDecimal("plan_qty")) .source_bill_type(row.getString("source_bill_type")) .source_bill_code(row.getString("source_bill_code")) 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 ac3fe57..2e71374 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 @@ -1,12 +1,12 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.service.IschBasePointService; @@ -27,11 +27,12 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.eum.RegionTypeEnum; -import org.nl.wms.pdm.bi.service.SubpackagerelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -88,6 +89,9 @@ public class InBoxManageServiceImpl implements InBoxManageService { @Autowired private InBussManageService inBussManageService; + @Autowired + StoragevehicleexMapper storagevehicleexMapper; + @Override @Transactional(rollbackFor = Exception.class) public void inBox(JSONObject whereJson) { @@ -340,15 +344,10 @@ public class InBoxManageServiceImpl implements InBoxManageService { } // 根据木箱号查询是否有托盘绑定关系，如果有则解绑 - JSONObject jsonExt = WQLObject.getWQLObject("md_pb_storagevehicleext") - .query("pcsn = '" + whereJson.getString("box_no") + "'") - .uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonExt)) { - JSONObject param = new JSONObject(); - param.put("pcsn", ""); - WQLObject.getWQLObject("md_pb_storagevehicleext") - .update(param,"pcsn = '"+whereJson.getString("box_no")+"'"); - } + LambdaUpdateWrapper lam = new LambdaUpdateWrapper(); + lam.eq(Storagevehicleex::getPcsn,whereJson.getString("box_no")); + lam.set(Storagevehicleex::getPcsn, ""); + storagevehicleexMapper.update(null,lam); // 更新子卷包装关系创建人 JSONObject param2 = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index ad3055b..d3a78e2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -5,7 +5,9 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper; @@ -25,6 +27,10 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,7 +81,10 @@ public class LashManageServiceImpl implements LashManageService { * 出入库主表服务 */ private final StIvtIostorinvOutMapper stIvtIostorinvOutMapper; - + @Autowired + StoragevehicleexMapper storagevehicleexMapper; + @Autowired + StoragevehicleinfoService storagevehicleinfoService; @Override @Transactional public void createLashTask(JSONObject whereJson) { @@ -108,12 +117,10 @@ public class LashManageServiceImpl implements LashManageService { } //查询木箱对应的托盘绑定关系，并清除 - WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); - JSONObject ext_jo = veExtTab.query("pcsn = '" + boxDao.getBox_no() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(ext_jo)) { - ext_jo.put("pcsn", ""); - veExtTab.update(ext_jo); - } + LambdaUpdateWrapper lam = new LambdaUpdateWrapper(); + lam.eq(Storagevehicleex::getPcsn, boxDao.getBox_no()); + lam.set(Storagevehicleex::getPcsn,""); + storagevehicleexMapper.update(null,lam); /* * 查看点位是否为空： @@ -224,8 +231,6 @@ public class LashManageServiceImpl implements LashManageService { @Override public void createHeapTask(JSONObject whereJson) { - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); // 比较两行架点位的任务个数 List executeArr = WQLObject.getWQLObject("SCH_BASE_Task") @@ -253,9 +258,10 @@ public class LashManageServiceImpl implements LashManageService { } // 查询木箱对应的载具 - JSONObject jsonVeExt = extTab.query("pcsn = '" + whereJson.getString("vehicle_code") + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeExt)) { + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn, whereJson.getString("vehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() == 0) { throw new BadRequestException("此木箱没有绑定托盘号!" + whereJson.getString("vehicle_code")); } @@ -267,7 +273,7 @@ public class LashManageServiceImpl implements LashManageService { jsonTaskParam.put("task_group_id", whereJson.getString("task_group_id")); jsonTaskParam.put("point_code2", next_device_code); jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code")); - jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); + jsonTaskParam.put("vehicle_code2", jsonVeExts.get(0).getStoragevehicle_code()); jsonTaskParam.put("request_param", whereJson); TwoOutHeapTask bean = SpringContextHolder.getBean(TwoOutHeapTask.class); @@ -277,28 +283,24 @@ public class LashManageServiceImpl implements LashManageService { @Override public JSONObject applyTab(JSONObject whereJson) { - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); - // 任务表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // TODO 贴标流程 JSONObject result = new JSONObject(); String vehicle_code = whereJson.getString("vehicle_code"); //查询托盘对应的载具号 - JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0); + Storagevehicleex vehicle_ext =storagevehicleinfoService.getExtByCode(vehicle_code); if (ObjectUtil.isEmpty(vehicle_ext)) { throw new BadRequestException("未查询到托盘对应的扩展属性"); } - String box_no = vehicle_ext.getString("pcsn"); + String box_no = vehicle_ext.getPcsn(); if (StrUtil.isEmpty(box_no)) { throw new BadRequestException("未查询到托盘绑定了相关木箱！"); } // 查询木箱信息 BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( new QueryWrapper().lambda() - .eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getString("pcsn")) + .eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getPcsn()) ); // 根据木箱料号查询木箱类型信息 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java index 450ed20..1a20546 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java @@ -3,13 +3,13 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.sch.tasks.TwoExcepionalMoveTask; import org.nl.b_lms.sch.tasks.TwoMoveBoxTask; import org.nl.b_lms.sch.tasks.TwoOutBoxTask; -import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; @@ -19,6 +19,8 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,7 +57,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { * 木箱信息服务 */ @Autowired - private IBstIvtBoxinfoService iBstIvtBoxinfoService; + StoragevehicleexMapper storagevehicleexMapper; /** * 任务服务 @@ -76,21 +78,10 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - // 载具扩展属性表 - WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期")); whereJson.put("sect_id", RegionTypeEnum.TWO_BZC01.getId()); - /* // 判断起点点位是否存在 - JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + - IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" + - IOSEnum.IS_NOTANDYES.code("是") + "'") - .uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonPoint)) { - throw new BadRequestException("终点点位不存在或未启用!"); - }*/ JSONObject jsonAttr = getStruct(whereJson); @@ -101,9 +92,10 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { } // 查询木箱对应的托盘号 - JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonAttr.getString("storagevehicle_code") + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeExt)) { + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonAttr.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() ==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code")); } @@ -113,7 +105,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { jsonTaskParam.put("start_device_code", jsonAttr.getString("struct_code")); jsonTaskParam.put("next_device_code", whereJson.getString("device_code")); jsonTaskParam.put("vehicle_code", jsonAttr.getString("storagevehicle_code")); - jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); + jsonTaskParam.put("vehicle_code2", jsonVeExts.get(0).getStoragevehicle_code()); jsonTaskParam.put("task_group_id", jsonAttr.getString("task_group_id")); JSONObject request_param = new JSONObject(); request_param.put("containerType", jsonAttr.getString("storagevehicle_type")); @@ -597,8 +589,6 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { */ private String createBoxMove(JSONObject jsonObject) { WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); // 找一个空的仓位 JSONObject paramIn = new JSONObject(); @@ -624,9 +614,10 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { attrTab.update(jsonAttr); // 查询木箱对应的载具 - JSONObject jsonVeExt = extTab.query("pcsn = '" + jsonObject.getString("storagevehicle_code") + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeExt)) { + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,jsonObject.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() ==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+jsonObject.getString("storagevehicle_code")); } @@ -636,7 +627,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { jsonTaskParam.put("start_device_code", jsonObject.getString("struct_code")); jsonTaskParam.put("next_device_code", jsonAttr.getString("struct_code")); jsonTaskParam.put("vehicle_code", jsonObject.getString("storagevehicle_code")); - jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); + jsonTaskParam.put("vehicle_code2", jsonVeExts.get(0).getStoragevehicle_code()); jsonTaskParam.put("task_group_id", IdUtil.getLongId()); TwoMoveBoxTask taskBan = new TwoMoveBoxTask(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java index ea3a041..5e26f0d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; @@ -23,6 +24,10 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.system.service.param.ISysParamService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.st.inbill.service.StorPublicService; import org.nl.wms.st.instor.movestor.service.HandMoveStorService; @@ -84,13 +89,17 @@ public class OutBussManageServiceImpl implements OutBussManageService { @Autowired private IBstIvtBoxinfoService iBstIvtBoxinfoService; - + @Autowired + private UnitMapper unitMapper; /* * 任务服务 */ @Autowired private IschBaseTaskService ischBaseTaskService; + @Autowired + StoragevehicleexMapper storagevehicleexMapper; + @Override @Transactional public void lockStruct(List param, JSONObject json) { @@ -257,10 +266,7 @@ public class OutBussManageServiceImpl implements OutBussManageService { List resultDisList = new ArrayList<>(); // 查询计量单位 - JSONObject jsonUnit = WQLObject.getWQLObject("md_pb_measureunit") - .query("measure_unit_id = '" + likeBoxList.get(0).getString("qty_unit_id") + "'") - .uniqueResult(0); - + Unit jsonUnit = unitMapper.selectById(likeBoxList.get(0).getString("qty_unit_id")); // 查询子卷包装关系 String pcsn_in = likeBoxList.stream() .map(row -> row.getString("pcsn")) @@ -306,8 +312,8 @@ public class OutBussManageServiceImpl implements OutBussManageService { .storagevehicle_id(jsonIvt.getLongValue("storagevehicle_id")) .storagevehicle_code(jsonIvt.getString("storagevehicle_code")) .is_issued(IOSEnum.IS_NOTANDYES.code("否")) - .qty_unit_id(jsonUnit.getLongValue("measure_unit_id")) - .qty_unit_name(jsonUnit.getString("unit_name")) + .qty_unit_id(jsonUnit.getMeasure_unit_id()) + .qty_unit_name(jsonUnit.getUnit_name()) .plan_qty(jsonIvt.getBigDecimal("canuse_qty")) .real_qty(jsonIvt.getBigDecimal("canuse_qty")) .instorage_time(jsonIvt.getString("instorage_time")) @@ -355,8 +361,6 @@ public class OutBussManageServiceImpl implements OutBussManageService { //物料表 WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); // 获取子卷包装集合 String vehilcle_in = list.stream() @@ -462,9 +466,10 @@ public class OutBussManageServiceImpl implements OutBussManageService { jsonMoveDtl.put("turnin_struct_name", jsonMove.getString("struct_name")); // 查询木箱对应的载具 - JSONObject jsonVeExt = extTab.query("pcsn = '" + json.getString("storagevehicle_code") + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeExt)) { + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,json.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size() ==0 ) { throw new BadRequestException("此木箱没有绑定托盘号!"+json.getString("storagevehicle_code")); } @@ -472,7 +477,7 @@ public class OutBussManageServiceImpl implements OutBussManageService { JSONObject param2 = new JSONObject(); param2.put("task_type", "010709"); param2.put("vehicle_code", json.getString("storagevehicle_code")); - param2.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); + param2.put("vehicle_code2", jsonVeExts.get(0).getStoragevehicle_code()); param2.put("point_code1", json.getString("struct_code")); param2.put("point_code2", jsonMove.getString("struct_code")); @@ -495,13 +500,11 @@ public class OutBussManageServiceImpl implements OutBussManageService { @Override public void createMove2(List list, Consumer allTransactionConsumer) { - //子卷包装关系表 + //子卷包装关系表 4567 WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); //物料表 WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); // 获取子卷包装集合 String vehilcle_in = list.stream() @@ -609,9 +612,10 @@ public class OutBussManageServiceImpl implements OutBussManageService { jsonMoveDtl.put("turnin_struct_name", jsonMove.getString("struct_name")); // 查询木箱对应的载具 - JSONObject jsonVeExt = extTab.query("pcsn = '" + json.getString("storagevehicle_code") + "'") - .uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeExt)) { + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getPcsn,json.getString("storagevehicle_code")); + List jsonVeExts = storagevehicleexMapper.selectList(lam); + if (jsonVeExts.size()==0) { throw new BadRequestException("此木箱没有绑定托盘号!"+json.getString("storagevehicle_code")); } @@ -619,7 +623,7 @@ public class OutBussManageServiceImpl implements OutBussManageService { JSONObject param2 = new JSONObject(); param2.put("task_type", "010709"); param2.put("vehicle_code", json.getString("storagevehicle_code")); - param2.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); + param2.put("vehicle_code2", jsonVeExts.get(0).getStoragevehicle_code()); param2.put("point_code1", json.getString("struct_code")); param2.put("point_code2", jsonMove.getString("struct_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index e9727d0..9252d66 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -1,13 +1,11 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper; @@ -61,8 +59,6 @@ public class SendOutManageServiceImpl implements SendOutManageService { public void createSendOutTask(JSONObject whereJson) { // 子卷包装关系表 WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); /* * 1.找相同订单号的木箱 * 1）有相同订单号有空位的：相同订单号的放在一排 @@ -221,8 +217,6 @@ public class SendOutManageServiceImpl implements SendOutManageService { public void createSendOutTaskOne(JSONObject whereJson) { // 子卷包装关系表 WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); - // 载具扩展属性表 - WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); /* * 1.找相同订单号的木箱 * 1）有相同订单号有空位的：相同订单号的放在一排 diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java deleted file mode 100644 index 2d1deee..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.tools.config; - -import org.springframework.boot.web.servlet.MultipartConfigFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.servlet.MultipartConfigElement; -import java.io.File; - -/** - * @author https://blog.csdn.net/llibin1024530411/article/details/79474953 - * @date 2018-12-28 - */ -@Configuration -public class MultipartConfig { - - /** - * 文件上传临时路径 - */ - @Bean - MultipartConfigElement multipartConfigElement() { - MultipartConfigFactory factory = new MultipartConfigFactory(); - String location = System.getProperty("user.home") + "/.eladmin/file/tmp"; - File tmpFile = new File(location); - if (!tmpFile.exists()) { - if (!tmpFile.mkdirs()) { - System.out.println("create was not successful."); - } - } - factory.setLocation(location); - return factory.createMultipartConfig(); - } -} \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java deleted file mode 100644 index 0a9dc36..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ /dev/null @@ -1,107 +0,0 @@ -///* -// * Copyright 2019-2020 Zheng Jie -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -//package org.nl.modules.tools.rest; -// -//import cn.dev33.satoken.annotation.SaCheckPermission; -//import cn.dev33.satoken.annotation.SaIgnore; -//import lombok.RequiredArgsConstructor; -//import org.nl.modules.common.exception.BadRequestException; -//import org.nl.modules.common.utils.FileUtil; -//import org.nl.modules.logging.annotation.Log; -// -//import org.nl.modules.tools.service.LocalStorageService; -//import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; -//import org.springframework.data.domain.Pageable; -//import org.springframework.http.HttpStatus; -//import org.springframework.http.ResponseEntity; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -//import org.springframework.web.multipart.MultipartFile; -// -//import javax.servlet.http.HttpServletResponse; -//import java.io.IOException; -// -///** -// * @author Zheng Jie -// * @date 2019-09-05 -// */ -//@RestController -//@RequiredArgsConstructor -// -//@RequestMapping("/api/localStorage") -//public class LocalStorageController { -// -// private final LocalStorageService localStorageService; -// -// -// @GetMapping -// @SaCheckPermission("storage:list") -// public ResponseEntity query(LocalStorageQueryCriteria criteria, Pageable pageable) { -// return new ResponseEntity<>(localStorageService.queryAll(criteria, pageable), HttpStatus.OK); -// } -// -// -// @GetMapping(value = "/download") -// @SaCheckPermission("storage:list") -// public void download(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException { -// localStorageService.download(localStorageService.queryAll(criteria), response); -// } -// -// -// @PostMapping -// @SaCheckPermission("storage:add") -// public ResponseEntity create(@RequestParam String name, @RequestParam("file") MultipartFile file) { -// LocalStorage localStorage = localStorageService.create(name, file); -// return new ResponseEntity<>(localStorage, HttpStatus.CREATED); -// } -// -// @PostMapping("/pictures") -// -// public ResponseEntity upload(@RequestParam MultipartFile file) { -// // 判断文件是否为图片 -// String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); -// if (!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))) { -// throw new BadRequestException("只能上传图片"); -// } -// LocalStorage localStorage = localStorageService.create(null, file); -// return new ResponseEntity<>(localStorage, HttpStatus.OK); -// } -// -// @Log("修改文件") -// -// @PutMapping -// @SaCheckPermission("storage:edit") -// public ResponseEntity update(@Validated @RequestBody LocalStorage resources) { -// localStorageService.update(resources); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @Log("删除文件") -// @DeleteMapping -// -// public ResponseEntity delete(@RequestBody Long[] ids) { -// localStorageService.deleteAll(ids); -// return new ResponseEntity<>(HttpStatus.OK); -// } -// -// -// @PostMapping("/importExcel") -// @SaIgnore -// public ResponseEntity importExcel(@RequestBody String path) { -// localStorageService.importExcel(path); -// return new ResponseEntity<>(HttpStatus.OK); -// } -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java deleted file mode 100644 index 88b210a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java +++ /dev/null @@ -1,98 +0,0 @@ -///* -// * Copyright 2019-2020 Zheng Jie -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -//package org.nl.modules.tools.service; -// -// -// -//import org.nl.modules.tools.service.dto.LocalStorageDto; -//import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; -//import org.springframework.data.domain.Pageable; -//import org.springframework.web.multipart.MultipartFile; -// -//import javax.servlet.http.HttpServletResponse; -//import java.io.IOException; -//import java.util.List; -// -///** -// * @author Zheng Jie -// * @date 2019-09-05 -// */ -//public interface LocalStorageService { -// -// /** -// * 分页查询 -// * -// * @param criteria 条件 -// * @param pageable 分页参数 -// * @return / -// */ -// Object queryAll(LocalStorageQueryCriteria criteria, Pageable pageable); -// -// /** -// * 查询全部数据 -// * -// * @param criteria 条件 -// * @return / -// */ -// List queryAll(LocalStorageQueryCriteria criteria); -// -// /** -// * 根据ID查询 -// * -// * @param id / -// * @return / -// */ -// LocalStorageDto findById(Long id); -// -// /** -// * 上传 -// * -// * @param name 文件名称 -// * @param file 文件 -// * @return -// */ -// LocalStorage create(String name, MultipartFile file); -// -// /** -// * 编辑 -// * -// * @param resources 文件信息 -// */ -// void update(LocalStorage resources); -// -// /** -// * 多选删除 -// * -// * @param ids / -// */ -// void deleteAll(Long[] ids); -// -// /** -// * 导出数据 -// * -// * @param localStorageDtos 待导出的数据 -// * @param response / -// * @throws IOException / -// */ -// void download(List localStorageDtos, HttpServletResponse response) throws IOException; -// -// /** -// * 导入数据 -// * -// * @param path -// */ -// void importExcel(String path); -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java deleted file mode 100644 index c5a2b61..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.tools.service.dto; - -import lombok.Getter; -import lombok.Setter; -import org.nl.common.base.BaseDTO; - -import java.io.Serializable; - -/** - * @author Zheng Jie - * @date 2019-09-05 - */ -@Getter -@Setter -public class LocalStorageDto extends BaseDTO implements Serializable { - - private Long id; - - private String realName; - - private String name; - - private String suffix; - - private String type; - - private String size; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java deleted file mode 100644 index 03db8f8..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.tools.service.dto; - -import lombok.Data; -import org.nl.modules.common.annotation.Query; - -import java.sql.Timestamp; -import java.util.List; - - -/** - * @author Zheng Jie - * @date 2019-09-05 - */ -@Data -public class LocalStorageQueryCriteria { - - @Query(blurry = "name,suffix,type,createBy,size") - private String blurry; - - @Query(type = Query.Type.BETWEEN) - private List createTime; -} \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java deleted file mode 100644 index a109794..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java +++ /dev/null @@ -1,367 +0,0 @@ -///* -// * Copyright 2019-2020 Zheng Jie -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -//package org.nl.modules.tools.service.impl; -// -//import cn.hutool.core.date.DateUtil; -//import cn.hutool.core.util.IdUtil; -//import cn.hutool.core.util.ObjectUtil; -//import cn.hutool.core.util.StrUtil; -//import com.alibaba.fastjson.JSONArray; -//import com.alibaba.fastjson.JSONObject; -//import lombok.RequiredArgsConstructor; -//import org.nl.common.utils.SecurityUtils; -//import org.nl.modules.common.config.FileProperties; -//import org.nl.modules.common.exception.BadRequestException; -//import org.nl.modules.common.utils.FileUtil; -//import org.nl.modules.common.utils.PageUtil; -//import org.nl.modules.common.utils.QueryHelp; -//import org.nl.modules.common.utils.ValidationUtil; -// -// -//import org.nl.modules.tools.service.LocalStorageService; -//import org.nl.modules.tools.service.dto.LocalStorageDto; -//import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; -//import org.nl.modules.tools.service.mapstruct.LocalStorageMapper; -//import org.nl.modules.wql.WQL; -//import org.nl.modules.wql.core.bean.WQLObject; -//import org.springframework.data.domain.Page; -//import org.springframework.data.domain.Pageable; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -//import org.springframework.web.multipart.MultipartFile; -// -//import javax.servlet.http.HttpServletResponse; -//import java.io.File; -//import java.io.IOException; -//import java.util.*; -// -///** -// * @author Zheng Jie -// * @date 2019-09-05 -// */ -//@Service -//@RequiredArgsConstructor -//public class LocalStorageServiceImpl implements LocalStorageService { -// -// private final IToolLocalStorageService IToolLocalStorageService; -// private final LocalStorageMapper localStorageMapper; -// private final FileProperties properties; -// -// @Override -// public Object queryAll(LocalStorageQueryCriteria criteria, Pageable pageable) { -// Page page = IToolLocalStorageService.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); -// return PageUtil.toPage(page.map(localStorageMapper::toDto)); -// } -// -// @Override -// public List queryAll(LocalStorageQueryCriteria criteria) { -// return localStorageMapper.toDto(IToolLocalStorageService.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); -// } -// -// @Override -// public LocalStorageDto findById(Long id) { -// LocalStorage localStorage = IToolLocalStorageService.findById(id).orElseGet(LocalStorage::new); -// ValidationUtil.isNull(localStorage.getId(), "LocalStorage", "id", id); -// return localStorageMapper.toDto(localStorage); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public LocalStorage create(String name, MultipartFile multipartFile) { -// FileUtil.checkSize(properties.getMaxSize(), multipartFile.getSize()); -// String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename()); -// String type = FileUtil.getFileType(suffix); -// File file = FileUtil.upload(multipartFile, properties.getPath().getPath() + type + File.separator); -// if (ObjectUtil.isNull(file)) { -// throw new BadRequestException("上传失败"); -// } -// try { -// name = StrUtil.isEmpty(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name; -// LocalStorage localStorage = new LocalStorage( -// file.getName(), -// name, -// suffix, -// file.getPath(), -// type, -// FileUtil.getSize(multipartFile.getSize()) -// ); -// return IToolLocalStorageService.save(localStorage); -// } catch (Exception e) { -// FileUtil.del(file); -// throw e; -// } -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void update(LocalStorage resources) { -// LocalStorage localStorage = IToolLocalStorageService.findById(resources.getId()).orElseGet(LocalStorage::new); -// ValidationUtil.isNull(localStorage.getId(), "LocalStorage", "id", resources.getId()); -// localStorage.copy(resources); -// IToolLocalStorageService.save(localStorage); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void deleteAll(Long[] ids) { -// for (Long id : ids) { -// LocalStorage storage = IToolLocalStorageService.findById(id).orElseGet(LocalStorage::new); -// FileUtil.del(storage.getPath()); -// IToolLocalStorageService.delete(storage); -// } -// } -// -// @Override -// public void download(List queryAll, HttpServletResponse response) throws IOException { -// List> list = new ArrayList<>(); -// for (LocalStorageDto localStorageDTO : queryAll) { -// Map map = new LinkedHashMap<>(); -// map.put("文件名", localStorageDTO.getRealName()); -// map.put("备注名", localStorageDTO.getName()); -// map.put("文件类型", localStorageDTO.getType()); -// map.put("文件大小", localStorageDTO.getSize()); -// map.put("创建者", localStorageDTO.getCreateBy()); -// map.put("创建日期", localStorageDTO.getCreateTime()); -// list.add(map); -// } -// FileUtil.downloadExcel(list, response); -// } -// -// /** -// * 导入数据 -// * -// * @param path -// */ -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void importExcel(String path) { -// WQLObject measureunitTab = WQLObject.getWQLObject("md_pb_measureunit"); -// WQLObject materialbaseTab = WQLObject.getWQLObject("md_me_materialbase"); -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// //List> listMap = EasyExcel.read(path).sheet(1).doReadSync(); -// List> listMap = new ArrayList<>(); -// for (int i = 3; i < listMap.size(); i++) { -// Map map = listMap.get(i); -// -// /*//外库，计划内 -// String package_box_sn = String.valueOf(map.get(16)); -// String container_name = String.valueOf(map.get(8)); -// String sale_order = String.valueOf(map.get(14)); -// String no = String.valueOf(map.get(15)); -// String customer_name = String.valueOf(map.get(20)); -// String sap_pcsn = String.valueOf(map.get(9)); -// String customer_description = String.valueOf(map.get(21)); -// String product_name = String.valueOf(map.get(1)); -// String product_description = String.valueOf(map.get(2)); -// String date_of_FG_inbound = String.valueOf(map.get(11)); -// String width = String.valueOf(map.get(22)); -// String thickness = String.valueOf(map.get(23)); -// String net_weight = String.valueOf(map.get(3)); -// String length = String.valueOf(map.get(25)); -// String is_un_plan_production = "0";*/ -// -// /*//外库，计划外分切 -// String package_box_sn = String.valueOf(map.get(26)); -// String container_name = String.valueOf(map.get(33)); -// String sale_order = String.valueOf(map.get(29)); -// //String no = String.valueOf(map.get(15)); -// String customer_name = String.valueOf(map.get(30)); -// String sap_pcsn = String.valueOf(map.get(33)); -// String customer_description = String.valueOf(map.get(31)); -// String product_name = String.valueOf(map.get(2)); -// String product_description = String.valueOf(map.get(3)); -// String date_of_FG_inbound = String.valueOf(map.get(25)); -// String width = String.valueOf(map.get(34)); -// String thickness = String.valueOf(map.get(35)); -// String net_weight = String.valueOf(map.get(37)); -// String length = String.valueOf(map.get(38)); -// String is_un_plan_production = "1";*/ -// -// //成品库，计划内 -// String package_box_sn = String.valueOf(map.get(18)); -// String container_name = String.valueOf(map.get(10)); -// String sale_order = String.valueOf(map.get(16)); -// String no = String.valueOf(map.get(17)); -// String customer_name = String.valueOf(map.get(22)); -// String sap_pcsn = String.valueOf(map.get(9)); -// String customer_description = String.valueOf(map.get(23)); -// String product_name = String.valueOf(map.get(2)); -// String product_description = String.valueOf(map.get(3)); -// String date_of_FG_inbound = String.valueOf(map.get(12)); -// String width = String.valueOf(map.get(24)); -// String thickness = String.valueOf(map.get(25)); -// String net_weight = String.valueOf(map.get(4)); -// String length = String.valueOf(map.get(27)); -// String is_un_plan_production = "0"; -// -// /*//成品库，计划外 -// String package_box_sn = String.valueOf(map.get(26)); -// String container_name = String.valueOf(map.get(34)); -// String sale_order = String.valueOf(map.get(29)); -// //String no = String.valueOf(map.get(17)); -// String customer_name = String.valueOf(map.get(30)); -// String sap_pcsn = String.valueOf(map.get(33)); -// String customer_description = String.valueOf(map.get(31)); -// String product_name = String.valueOf(map.get(2)); -// String product_description = String.valueOf(map.get(3)); -// String date_of_FG_inbound = String.valueOf(map.get(25)); -// String width = String.valueOf(map.get(36)); -// String thickness = String.valueOf(map.get(37)); -// String net_weight = String.valueOf(map.get(5)); -// String length = String.valueOf(map.get(40)); -// String is_un_plan_production = "1";*/ -// -// /*if (StrUtil.isEmpty(package_box_sn)) { -// throw new BadRequestException("第" + (i + 2) + "行的木箱唯一码为空！"); -// }*/ -// if (StrUtil.isEmpty(sale_order)) { -// throw new BadRequestException("第" + (i + 2) + "行的销售订单及行号为空！"); -// } -// if (StrUtil.isEmpty(customer_name)) { -// throw new BadRequestException("第" + (i + 2) + "行的客户编号为空！"); -// } -// if (StrUtil.isEmpty(customer_description)) { -// throw new BadRequestException("第" + (i + 2) + "行的客户名称为空！"); -// } -// if (StrUtil.isEmpty(product_name)) { -// throw new BadRequestException("第" + (i + 2) + "行的产品编码为空！"); -// } -// if (StrUtil.isEmpty(product_description)) { -// throw new BadRequestException("第" + (i + 2) + "行的产品描述为空！"); -// } -// if (StrUtil.isEmpty(container_name)) { -// throw new BadRequestException("第" + (i + 2) + "行的子卷号为空！"); -// } -// if (StrUtil.isEmpty(width)) { -// throw new BadRequestException("第" + (i + 2) + "行的产品规格(幅宽)为空！"); -// } -// if (StrUtil.isEmpty(net_weight)) { -// throw new BadRequestException("第" + (i + 2) + "行的净重为空！"); -// } -// if (StrUtil.isEmpty(length)) { -// throw new BadRequestException("第" + (i + 2) + "行的长度为空！"); -// } -// if (StrUtil.isEmpty(is_un_plan_production)) { -// throw new BadRequestException("第" + (i + 2) + "行的计划外分切的子卷为空！"); -// } -// -// JSONObject jo = new JSONObject(); -// jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); -// jo.put("package_box_sn", package_box_sn); -// jo.put("sap_pcsn", sap_pcsn); -//// jo.put("box_weight", BoxWeight); -// jo.put("quality_guaran_period", "90"); -// jo.put("sale_order_name", sale_order + "-" + no); -// //jo.put("sale_order_name", sale_order); -// jo.put("customer_name", customer_name); -// jo.put("customer_description", customer_description); -// jo.put("product_name", product_name); -// jo.put("product_description", product_description); -// jo.put("date_of_FG_inbound", date_of_FG_inbound); -// jo.put("container_name", container_name); -// jo.put("width", width); -// if (StrUtil.isEmpty(thickness) || thickness.equals("null")) { -// //查询物料中的厚度 -// JSONObject mater = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + jo.getString("product_name") + "'").uniqueResult(0); -// String code = mater.getString("material_name"); -// code = code.replace("|", ","); -// String[] split = code.split(","); -// String last = split[2]; -// String[] s = last.split("微"); -// thickness = s[0]; -// } -// jo.put("thickness", thickness); -// jo.put("net_weight", net_weight); -// jo.put("length", length); -// jo.put("date_of_production", date_of_FG_inbound); -// jo.put("is_un_plan_production", is_un_plan_production); -// jo.put("status", "0"); -// jo.put("create_id", "1"); -// jo.put("create_name", "管理员"); -// jo.put("create_time", DateUtil.now()); -// WQLObject tab = WQLObject.getWQLObject("PDM_BI_SubPackageRelation"); -// tab.insert(jo); -// } -// -// JSONArray rows = WQL.getWO("ST_REGION_IN_01").addParam("flag", "3").process().getResultJSONArray(0); -// for (int i = 0; i < rows.size(); i++) { -// JSONObject row = rows.getJSONObject(i); -// String package_box_sn = row.getString("package_box_sn"); -// if (StrUtil.isEmpty(package_box_sn) || package_box_sn.equals("null")) { -// continue; -// } -// double total_weight = 0; -// JSONArray box_rows = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + package_box_sn + "'").getResultJSONArray(0); -// -// //判断该木箱是否已经存在库内 -// JSONObject str_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + row.get("package_box_sn") + "'").uniqueResult(0); -// if (ObjectUtil.isNotEmpty(str_jo)) { -// throw new BadRequestException("木箱：" + row.get("package_box_sn") + "已存在库内，请对数据进行核实！"); -// } -// -// //判断是否属于外库 -// JSONObject goal_row = box_rows.getJSONObject(0); -// JSONObject stor_jo = new JSONObject(); -// if (goal_row.getString("remark").contains("外库")) { -// stor_jo = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_virtualstore = '1'").uniqueResult(0); -// } else { -// stor_jo = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_productstore = '1'").uniqueResult(0); -// } -// -// //查询一个空的虚拟区货位 -// JSONObject struct = WQL.getWO("PDA_ST_01").addParam("flag", "3").addParam("stor_id", stor_jo.getString("stor_id")).process().uniqueResult(0); -// for (int j = 0; j < box_rows.size(); j++) { -// JSONObject box_row = box_rows.getJSONObject(j); -// JSONObject ivt_jo = new JSONObject(); -// //插入库存数据 -// ivt_jo.put("stockrecord_id", IdUtil.getSnowflake(1, 1).nextId()); -// ivt_jo.put("struct_id", struct.getString("struct_id")); -// ivt_jo.put("struct_code", struct.getString("struct_code")); -// ivt_jo.put("struct_name", struct.getString("struct_name")); -// ivt_jo.put("region_id", ""); -// ivt_jo.put("quality_scode", "01"); -// ivt_jo.put("pcsn", box_row.getString("container_name")); -// ivt_jo.put("canuse_qty", box_row.getString("net_weight")); -// ivt_jo.put("frozen_qty", 0); -// ivt_jo.put("ivt_qty", box_row.getString("net_weight")); -// ivt_jo.put("instorage_time", DateUtil.now()); -// JSONObject mater = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + box_row.getString("product_name") + "'").uniqueResult(0); -// ivt_jo.put("material_id", mater.getString("material_id")); -// ivt_jo.put("qty_unit_id", mater.getString("base_unit_id")); -// WQLObject.getWQLObject("st_ivt_structivt").insert(ivt_jo); -// total_weight += box_row.getDoubleValue("net_weight"); -// } -// -// //更新总重量 -// HashMap sub_map = new HashMap<>(); -// //sub_map.put("box_weight", total_weight + ""); -// //sub_map.put("quanlity_in_box", box_rows.size() + ""); -// sub_map.put("status", "2"); -// WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_map, "package_box_sn = '" + package_box_sn + "'"); -// -// //更新仓位字段 -// struct.put("storagevehicle_code", package_box_sn); -// WQLObject.getWQLObject("st_ivt_structattr").update(struct); -// -// //更新点位字段 -// HashMap point_map = new HashMap<>(); -// point_map.put("vehicle_code", package_box_sn); -// WQLObject.getWQLObject("SCH_BASE_Point").update(point_map, "point_code = '" + struct.getString("struct_code") + "'"); -// } -// } -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java deleted file mode 100644 index feb750c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -///* -// * Copyright 2019-2020 Zheng Jie -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -//package org.nl.modules.tools.service.mapstruct; -// -// -//import org.mapstruct.Mapper; -//import org.mapstruct.ReportingPolicy; -//import org.nl.modules.common.base.BaseMapper; -// -//import org.nl.modules.tools.service.dto.LocalStorageDto; -// -///** -// * @author Zheng Jie -// * @date 2019-09-05 -// */ -//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -//public interface LocalStorageMapper extends BaseMapper { -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java deleted file mode 100644 index 0c927f2..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java +++ /dev/null @@ -1,60 +0,0 @@ -//package org.nl.wms.basedata.master.rest; -// -// -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.nl.modules.logging.annotation.Log; -//import org.nl.wms.basedata.master.service.SalesService; -//import org.nl.wms.basedata.master.service.dto.SalesDto; -//import org.nl.wms.basedata.master.service.dto.UnitDto; -//import org.springframework.data.domain.Pageable; -//import org.springframework.http.HttpStatus; -//import org.springframework.http.ResponseEntity; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.Map; -// -///** -// * @author loujf -// * @date 2021-12-07 -// **/ -//@RestController -//@RequiredArgsConstructor -// -//@RequestMapping("/api/sales") -//@Slf4j -//public class SalesController { -// private final SalesService salesService; -// -// @GetMapping -// @Log("查询业务员") -// -// public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { -// return new ResponseEntity<>(salesService.queryAll(whereJson, page), HttpStatus.OK); -// } -// -// @PostMapping -// @Log("查询业务员") -// -// public ResponseEntity create(@Validated @RequestBody SalesDto dto) { -// salesService.create(dto); -// return new ResponseEntity<>(HttpStatus.CREATED); -// } -// -// @PutMapping -// @Log("查询业务员") -// -// public ResponseEntity update(@Validated @RequestBody SalesDto dto) { -// salesService.update(dto); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @Log("查询业务员") -// -// @DeleteMapping -// public ResponseEntity delete(@RequestBody Long[] ids) { -// salesService.deleteAll(ids); -// return new ResponseEntity<>(HttpStatus.OK); -// } -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java deleted file mode 100644 index 512ed82..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java +++ /dev/null @@ -1,83 +0,0 @@ -//package org.nl.wms.basedata.master.rest; -// -// -//import com.alibaba.fastjson.JSONObject; -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.nl.common.domain.query.PageQuery; -//import org.nl.modules.logging.annotation.Log; -//import org.nl.wms.basedata.master.service.StoragevehicleinfoService; -//import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; -//import org.springframework.data.domain.Pageable; -//import org.springframework.http.HttpStatus; -//import org.springframework.http.ResponseEntity; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.Map; -// -///** -// * @author ldjun -// * @date 2021-12-09 -// **/ -//@RestController -//@RequiredArgsConstructor -// -//@RequestMapping("/api/storagevehicleinfo") -//@Slf4j -//public class StoragevehicleinfoController { -// -// private final StoragevehicleinfoService storagevehicleinfoService; -// -// @GetMapping -// @Log("查询载具") -// -// //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:list')") -// public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { -// return new ResponseEntity<>(storagevehicleinfoService.queryAll(whereJson, page), HttpStatus.OK); -// } -// -// @PostMapping -// @Log("新增载具") -// -// //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:add')") -// public ResponseEntity create(@RequestBody Map map) { -// return new ResponseEntity<>(storagevehicleinfoService.create(map), HttpStatus.CREATED); -// } -// -// @PutMapping -// @Log("修改载具") -// -// //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") -// public ResponseEntity update(@RequestBody JSONObject map) { -// storagevehicleinfoService.update(map); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @Log("删除载具") -// -// //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:del')") -// @DeleteMapping -// public ResponseEntity delete(@RequestBody Long[] ids) { -// storagevehicleinfoService.deleteAll(ids); -// return new ResponseEntity<>(HttpStatus.OK); -// } -// -// @PutMapping("/changeActive") -// @Log("修改点位启用状态") -// -// //@PreAuthorize("@el.check('store:edit')") -// public ResponseEntity changeActive(@RequestBody JSONObject json) { -// storagevehicleinfoService.changeActive(json); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @GetMapping("/getVehicle/{code}") -// @Log("获取起始载具号") -// -// //@PreAuthorize("@el.check('store:edit')") -// public ResponseEntity getVehicle(@PathVariable String code) { -// JSONObject json = storagevehicleinfoService.getVehicle(code); -// return new ResponseEntity<>(json, HttpStatus.OK); -// } -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java deleted file mode 100644 index 4545330..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java +++ /dev/null @@ -1,71 +0,0 @@ -//package org.nl.wms.basedata.master.rest; -// -// -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.nl.modules.logging.annotation.Log; -//import org.nl.wms.basedata.master.service.UnitService; -//import org.nl.wms.basedata.master.service.dto.UnitDto; -//import org.springframework.data.domain.Pageable; -//import org.springframework.http.HttpStatus; -//import org.springframework.http.ResponseEntity; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.Map; -// -///** -// * @author loujf -// * @date 2021-12-07 -// **/ -//@RestController -//@RequiredArgsConstructor -// -//@RequestMapping("/api/mdPbMeasureunit") -//@Slf4j -//public class UnitController { -// private final UnitService unitService; -// -// @GetMapping -// @Log("查询计量单位") -// -// //@PreAuthorize("@el.check('Unit:list')") -// public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { -// return new ResponseEntity<>(unitService.queryAll(whereJson, page), HttpStatus.OK); -// } -// -// @PostMapping -// @Log("新增计量单位") -// -// //@PreAuthorize("@el.check('Unit:add')") -// public ResponseEntity create(@Validated @RequestBody UnitDto dto) { -// unitService.create(dto); -// return new ResponseEntity<>(HttpStatus.CREATED); -// } -// -// @PutMapping -// @Log("修改计量单位") -// -// //@PreAuthorize("@el.check('Unit:edit')") -// public ResponseEntity update(@Validated @RequestBody UnitDto dto) { -// unitService.update(dto); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @Log("删除计量单位") -// -// //@PreAuthorize("@el.check('Unit:del')") -// @DeleteMapping -// public ResponseEntity delete(@RequestBody String[] ids) { -// unitService.deleteAll(ids); -// return new ResponseEntity<>(HttpStatus.OK); -// } -// -// @GetMapping("/getUnit") -// @Log("查询单位下拉框") -// -// //@PreAuthorize("@el.check('materialtype:list')") -// public ResponseEntity queryUnit(@RequestParam Map whereJson) { -// return new ResponseEntity<>(unitService.getUnit(whereJson), HttpStatus.OK); -// } -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/SalesService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/SalesService.java index 185055f..9857977 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/SalesService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/SalesService.java @@ -1,24 +1,19 @@ package org.nl.wms.basedata.master.sales.service;//package org.nl.wms.basedata.master.service; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata.master.sales.service.dao.Sales; import org.nl.wms.basedata.master.sales.service.dto.SalesDto; import org.nl.wms.basedata.master.sales.service.dto.SalesQuery; -import org.nl.wms.basedata.master.unit.service.dto.UnitDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; /** * @author loujf * @description 服务接口 * @date 2021-12-07 **/ -public interface SalesService { +public interface SalesService extends IService { /** * 查询数据分页 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/impl/SalesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/impl/SalesServiceImpl.java index c03676f..5727570 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/impl/SalesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/impl/SalesServiceImpl.java @@ -1,23 +1,15 @@ package org.nl.wms.basedata.master.sales.service.impl; -import cn.dev33.satoken.json.SaJsonTemplate; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; -import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.basedata.master.devicestatus.service.dao.DeviceStatus; import org.nl.wms.basedata.master.sales.service.SalesService; import org.nl.wms.basedata.master.sales.service.dao.Sales; import org.nl.wms.basedata.master.sales.service.dao.mapper.SalesMapper; @@ -27,12 +19,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import java.lang.reflect.Array; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; /** * @author loujf @@ -42,9 +30,8 @@ import java.util.Map; @Service @RequiredArgsConstructor @Slf4j -public class SalesServiceImpl implements SalesService { +public class SalesServiceImpl extends ServiceImpl implements SalesService { - private final SaJsonTemplate getSaJsonTemplateForJackson; @Autowired private SalesMapper salesMapper; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java deleted file mode 100644 index 2b64825..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java +++ /dev/null @@ -1,74 +0,0 @@ -//package org.nl.wms.basedata.master.service; -// -//import com.alibaba.fastjson.JSONObject; -//import org.nl.wms.basedata.master.service.dto.SalesDto; -//import org.nl.wms.basedata.master.service.dto.UnitDto; -//import org.springframework.data.domain.Pageable; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @author loujf -// * @description 服务接口 -// * @date 2021-12-07 -// **/ -//public interface SalesService { -// -// /** -// * 查询数据分页 -// * -// * @param whereJson 条件 -// * @param page 分页参数 -// * @return Map -// */ -// Map queryAll(Map whereJson, Pageable page); -// -// /** -// * 查询所有数据不分页 -// * -// * @param whereJson 条件参数 -// * @return List -// */ -// List queryAll(Map whereJson); -// -// /** -// * 根据ID查询 -// * -// * @param measure_unit_id ID -// * @return Unit -// */ -// SalesDto findById(Long measure_unit_id); -// -// /** -// * 根据编码查询 -// * -// * @param code code -// * @return Unit -// */ -// SalesDto findByCode(String code); -// -// -// /** -// * 创建 -// * -// * @param dto / -// */ -// void create(SalesDto dto); -// -// /** -// * 编辑 -// * -// * @param dto / -// */ -// void update(SalesDto dto); -// -// /** -// * 多选删除 -// * -// * @param ids / -// */ -// void deleteAll(Long[] ids); -// -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java deleted file mode 100644 index 891303c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java +++ /dev/null @@ -1,84 +0,0 @@ -//package org.nl.wms.basedata.master.service; -// -//import com.alibaba.fastjson.JSONArray; -//import com.alibaba.fastjson.JSONObject; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import org.nl.common.domain.query.PageQuery; -//import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; -//import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo; -//import org.nl.wms.basedata.master.storagevehicleinfo.service.dto.StoragevehicleinfoQuery; -//import org.springframework.data.domain.Pageable; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @author ldjun -// * @description 服务接口 -// * @date 2021-12-09 -// **/ -//public interface StoragevehicleinfoService { -// -// /** -// * 查询数据分页 -// * -// * @param whereJson 条件 -// * @param page 分页参数 -// * @return Map -// */ -// Map queryAll(Map whereJson, Pageable page); -// -// -// -// /** -// * 根据ID查询 -// * -// * @param storagevehicle_id ID -// * @return MdPbStoragevehicleinfo -// */ -// StoragevehicleinfoDto findById(Long storagevehicle_id); -// -// /** -// * 根据编码查询 -// * -// * @param code code -// * @return MdPbStoragevehicleinfo -// */ -// StoragevehicleinfoDto findByCode(String code); -// -// -// /** -// * 创建 -// * -// * @param map / -// */ -// JSONArray create(Map map); -// -// /** -// * 编辑 -// * -// * @param dto / -// */ -// void update(JSONObject dto); -// -// /** -// * 多选删除 -// * -// * @param ids / -// */ -// void deleteAll(Long[] ids); -// -// /** -// * 多修改启用状态 -// * -// * @param json / -// */ -// void changeActive(JSONObject json); -// -// /** -// * 获取起始载具号 -// * -// * @param code / -// */ -// JSONObject getVehicle(String code); -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java deleted file mode 100644 index 59afa9a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java +++ /dev/null @@ -1,76 +0,0 @@ -//package org.nl.wms.basedata.master.service; -// -//import com.alibaba.fastjson.JSONObject; -//import org.nl.common.domain.query.PageQuery; -//import org.nl.wms.basedata.master.service.dto.UnitDto; -//import org.nl.wms.basedata.master.unit.service.dto.UnitQuery; -//import org.springframework.data.domain.Pageable; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @author loujf -// * @description 服务接口 -// * @date 2021-12-07 -// **/ -//public interface UnitService { -// -// /** -// * 查询数据分页 -// * -// * @param whereJson 条件 -// * @param page 分页参数 -// * @return Map -// */ -// Map queryAll(Map whereJson, Pageable page); -// -// /** -// * 查询所有数据不分页 -// * -// * @param whereJson 条件参数 -// * @return List -// */ -// List queryAll(Map whereJson); -// -// /** -// * 根据ID查询 -// * -// * @param measure_unit_id ID -// * @return Unit -// */ -// UnitDto findById(Long measure_unit_id); -// -// /** -// * 根据编码查询 -// * -// * @param code code -// * @return Unit -// */ -// UnitDto findByCode(String code); -// -// -// /** -// * 创建 -// * -// * @param dto / -// */ -// void create(UnitDto dto); -// -// /** -// * 编辑 -// * -// * @param dto / -// */ -// void update(UnitDto dto); -// -// /** -// * 多选删除 -// * -// * @param ids / -// */ -// void deleteAll(String[] ids); -// -// JSONObject getUnit(Map whereJson); -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java deleted file mode 100644 index 8b078fb..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java +++ /dev/null @@ -1,26 +0,0 @@ -//package org.nl.wms.basedata.master.service.dto; -// -//import lombok.Data; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -// -///** -// * @author loujf -// * @description / -// * @date 2021-12-07 -// **/ -//@Data -//public class SalesDto implements Serializable { -// -// private Long sales_id; -// -// private String sales_code; -// -// private String sales_name; -// -// private String area; -// -// private String is_active; -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java deleted file mode 100644 index 5f6198a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java +++ /dev/null @@ -1,63 +0,0 @@ -//package org.nl.wms.basedata.master.service.dto; -// -//import com.fasterxml.jackson.databind.annotation.JsonSerialize; -//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -//import lombok.Data; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -// -///** -// * @author ldjun -// * @description / -// * @date 2021-12-09 -// **/ -//@Data -//public class StoragevehicleinfoDto implements Serializable { -// -// /** -// * 防止精度丢失 -// */ -// @JsonSerialize(using = ToStringSerializer.class) -// private Long storagevehicle_id; -// -// private String storagevehicle_code; -// -// private String storagevehicle_name; -// -// private String one_code; -// -// private String two_code; -// -// private String rfid_code; -// -// private String create_id; -// -// private String create_name; -// -// private String create_time; -// -// private String update_optid; -// -// private String update_optname; -// -// private String update_time; -// -// private String is_delete; -// -// private String is_used; -// -// private String storagevehicle_type; -// -// private BigDecimal vehicle_width; -// -// private BigDecimal vehicle_long; -// -// private BigDecimal vehicle_height; -// -// private String overstruct_type; -// -// private BigDecimal occupystruct_qty; -// -// private String ext_id; -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java deleted file mode 100644 index 6109fc9..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java +++ /dev/null @@ -1,41 +0,0 @@ -//package org.nl.wms.basedata.master.service.dto; -// -//import lombok.Data; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -// -///** -// * @author loujf -// * @description / -// * @date 2021-12-07 -// **/ -//@Data -//public class UnitDto implements Serializable { -// -// private Long measure_unit_id; -// -// private String unit_code; -// -// private String unit_name; -// -// private BigDecimal qty_precision; -// -// private String is_used; -// -// private String create_id; -// -// private String create_name; -// -// private String create_time; -// -// private String update_optid; -// -// private String update_optname; -// -// private String update_time; -// -// private String is_delete; -// -// private String ext_id; -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java deleted file mode 100644 index b6a4ac9..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -//package org.nl.wms.basedata.master.service.impl; -// -// -//import cn.hutool.core.date.DateUtil; -//import cn.hutool.core.util.IdUtil; -//import cn.hutool.core.util.ObjectUtil; -//import cn.hutool.core.util.StrUtil; -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONArray; -//import com.alibaba.fastjson.JSONObject; -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.nl.common.utils.SecurityUtils; -//import org.nl.modules.common.exception.BadRequestException; -//import org.nl.modules.wql.core.bean.ResultBean; -//import org.nl.modules.wql.core.bean.WQLObject; -//import org.nl.modules.wql.util.WqlUtil; -//import org.nl.wms.basedata.master.service.SalesService; -//import org.nl.wms.basedata.master.service.dto.SalesDto; -//import org.nl.wms.basedata.master.service.dto.UnitDto; -//import org.springframework.data.domain.Pageable; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @author loujf -// * @description 服务实现 -// * @date 2021-12-07 -// **/ -//@Service -//@RequiredArgsConstructor -//@Slf4j -//public class SalesServiceImpl implements SalesService { -// -// @Override -// public Map queryAll(Map whereJson, Pageable page) { -// String where = ""; -// WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); -// String search = (String) whereJson.get("search"); -// if (!StrUtil.isEmpty(search)) { -// where = " AND (sales_code like '%" + search + "%' OR sales_name like '%" + search + "%' ) "; -// } -// ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1 " + where, "sales_code"); -// final JSONObject json = rb.pageResult(); -// return json; -// } -// -// @Override -// public List queryAll(Map whereJson) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// JSONArray arr = wo.query().getResultJSONArray(0); -// List list = arr.toJavaList(UnitDto.class); -// return list; -// } -// -// @Override -// public SalesDto findById(Long sales_id) { -// WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); -// JSONObject json = wo.query("sales_id =" + sales_id + "").uniqueResult(0); -// if (ObjectUtil.isEmpty(json)) { -// return null; -// } -// final SalesDto obj = json.toJavaObject(SalesDto.class); -// return obj; -// } -// -// @Override -// public SalesDto findByCode(String code) { -// WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); -// JSONObject json = wo.query("sales_code ='" + code + "'").uniqueResult(0); -// if (ObjectUtil.isEmpty(json)) { -// return null; -// } -// final SalesDto obj = json.toJavaObject(SalesDto.class); -// return obj; -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void create(SalesDto dto) { -// String sales_code = dto.getSales_code(); -// SalesDto unitDto = this.findByCode(sales_code); -// if (unitDto != null) { -// if (unitDto.getArea().equals(dto.getArea())) { -// throw new BadRequestException("存在相同区域的业务员!"); -// } -// } -// -// dto.setSales_id(IdUtil.getSnowflake(1, 1).nextId()); -// -// WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); -// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); -// wo.insert(json); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void update(SalesDto dto) { -// SalesDto entity = this.findById(dto.getSales_id()); -// if (entity == null) { -// throw new BadRequestException("被删除或无权限，操作失败!"); -// } -// -// String sales_code = dto.getSales_code(); -// SalesDto unitDto = this.findByCode(sales_code); -// if (unitDto != null && !unitDto.getSales_id().equals(dto.getSales_id())) { -// throw new BadRequestException("存在相同的编码"); -// } -// -// WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); -// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); -// wo.update(json); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void deleteAll(Long[] ids) { -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// -// WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); -// for (Long sales_id : ids) { -// wo.delete("sales_id = '" + sales_id + "'"); -// } -// } -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java deleted file mode 100644 index 91096a6..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ /dev/null @@ -1,271 +0,0 @@ -//package org.nl.wms.basedata.master.service.impl; -// -// -//import cn.hutool.core.date.DateUtil; -//import cn.hutool.core.map.MapUtil; -//import cn.hutool.core.util.IdUtil; -//import cn.hutool.core.util.ObjectUtil; -//import cn.hutool.core.util.StrUtil; -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONArray; -//import com.alibaba.fastjson.JSONObject; -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.nl.common.utils.SecurityUtils; -//import org.nl.modules.common.exception.BadRequestException; -//import org.nl.common.utils.CodeUtil; -//import org.nl.modules.wql.WQL; -//import org.nl.modules.wql.core.bean.WQLObject; -//import org.nl.modules.wql.util.WqlUtil; -//import org.nl.system.service.coderule.impl.SysCodeRuleServiceImpl; -//import org.nl.wms.basedata.master.service.ClassstandardService; -//import org.nl.wms.basedata.master.service.StoragevehicleinfoService; -//import org.nl.wms.basedata.master.service.dto.ClassstandardDto; -//import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; -//import org.springframework.data.domain.Pageable; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -///** -// * @author ldjun -// * @description 服务实现 -// * @date 2021-12-09 -// **/ -//@Service -//@RequiredArgsConstructor -//@Slf4j -//public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService { -// -// private final ClassstandardService classstandardService; -// -// @Override -// public Map queryAll(Map whereJson, Pageable page) { -// WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); -// HashMap map = new HashMap(); -// -// String storagevehicle_code_begin = (String) whereJson.get("storagevehicle_code_begin"); -// String storagevehicle_code_end = (String) whereJson.get("storagevehicle_code_end"); -// -// if (StrUtil.isNotEmpty((String) whereJson.get("storagevehicle_type"))) { -// ClassstandardDto dto = classstandardService.findById((String) whereJson.get("storagevehicle_type")); -// String storagevehicle_type = classstandardService.getChildIdStr(dto.getClass_id().toString()); -// map.put("storagevehicle_type", storagevehicle_type); -// -// } -// map.put("storagevehicle_code_begin", storagevehicle_code_begin); -// map.put("storagevehicle_code_end", storagevehicle_code_end); -// map.put("flag", "1"); -// JSONObject json = WQL.getWO("QMD_PB_STORAGEVEHICLEINFO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.storagevehicle_code ASC"); -// /*JSONArray content = json.getJSONArray("content"); -// for (int i = 0; i < content.size(); i++) { -// JSONObject jsonObject = content.getJSONObject(i); -// JSONObject jsonTask = taskService.query("vehicle_code = '" + jsonObject.getString("storagevehicle_code") + "' and task_status <> '99' and is_delete = '0'").uniqueResult(0); -// if (ObjectUtil.isNotEmpty(jsonTask)) { -// jsonObject.put("start_point_code", jsonTask.getString("start_point_code")); -// jsonObject.put("next_point_code", jsonTask.getString("next_point_code")); -// jsonObject.put("is_task", "1"); -// jsonObject.put("point_code", ""); -// } else { -// jsonObject.put("is_task", "0"); -// } -// }*/ -// return json; -// } -// -// -// -// @Override -// public StoragevehicleinfoDto findById(Long storagevehicle_id) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); -// JSONObject json = wo.query("storagevehicle_id =" + storagevehicle_id + "").uniqueResult(0); -// final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); -// return obj; -// } -// -// @Override -// public StoragevehicleinfoDto findByCode(String code) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); -// JSONObject json = wo.query("storagevehicle_code ='" + code + "'").uniqueResult(0); -// if (ObjectUtil.isEmpty(json)) { -// throw new BadRequestException("请输入正确的载具号！"); -// } -// final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); -// return obj; -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public JSONArray create(Map map) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); -// JSONObject jsonObject = wo.query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' and is_delete = '0'").uniqueResult(0); -// if (!ObjectUtil.isEmpty(jsonObject)) { -// throw new BadRequestException("此载具已存在"); -// } -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// -// String storagevehicle_type = ((String) map.get("storagevehicle_type")); -// JSONObject class_jo = WQLObject.getWQLObject("md_pb_classstandard").query("class_id = '" + storagevehicle_type + "'").uniqueResult(0); -// String class_code = class_jo.getString("class_code").substring(0, 4); -// ; -// String code = ""; -// switch (class_code) { -// case "0001": -// //气涨轴编码 -// code = "VEHICCLE_CODE_QZZ"; -// break; -// case "0002": -// code = "VEHICLE_CODE_GXTP"; -// break; -// case "0003": -// if (class_jo.getString("class_code").equals("000301")){ -// code = "VEHICLE_CODE_LK"; -// } -// if (class_jo.getString("class_code").equals("000302")){ -// code = "VEHICLE_CODE_LKB"; -// } -// break; -// default: -// break; -// } -// if (StrUtil.isEmpty(code)) { -// throw new BadRequestException("请选择正确的载具类型！"); -// } -// JSONArray resultCodeArr = new JSONArray(); -// int num = MapUtil.getInt(map, "num"); -// for (int i = 0; i < num; i++) { -// StoragevehicleinfoDto dto = new StoragevehicleinfoDto(); -// dto.setStoragevehicle_id(IdUtil.getSnowflake(1, 1).nextId()); -// dto.setStoragevehicle_code(CodeUtil.getNewCode(code)); -// dto.setCreate_id(currentUserId); -// dto.setStoragevehicle_name(dto.getStoragevehicle_code()); -// dto.setCreate_name(nickName); -// dto.setUpdate_optid(currentUserId); -// dto.setUpdate_optname(nickName); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// dto.setStoragevehicle_type(class_jo.getString("class_code")); -// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); -// wo.insert(json); -// resultCodeArr.add(dto.getStoragevehicle_code()); -// } -// return resultCodeArr; -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void update(JSONObject dto) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); -// WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); -// JSONObject jsonObject = wo.query("storagevehicle_code = '" + dto.getString("storagevehicle_code") + "' and is_delete = '0' AND storagevehicle_id != '" + dto.getString("storagevehicle_id") + "'").uniqueResult(0); -// if (!ObjectUtil.isEmpty(jsonObject)) { -// throw new BadRequestException("此载具已存在"); -// } -// -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// -// String qty = dto.getString("qty"); -// String pcsn = dto.getString("pcsn"); -// if (StrUtil.isNotEmpty(qty) || StrUtil.isNotEmpty(pcsn)) { -// JSONObject ext_jo = veExtTab.query("storagevehicle_code = '"+dto.getString("storagevehicle_code")+"'").uniqueResult(0); -// if (ObjectUtil.isEmpty(ext_jo)) { -// //新增一条记录 -// JSONObject jsonVeExt = new JSONObject(); -// jsonVeExt.put("storagevehicleext_id", org.nl.common.utils.IdUtil.getLongId()); -// jsonVeExt.put("storagevehicle_id", dto.getLongValue("storagevehicle_id")); -// jsonVeExt.put("storagevehicle_code", dto.getString("storagevehicle_code")); -// jsonVeExt.put("storagevehicle_type", dto.getString("storagevehicle_type")); -// if (StrUtil.isNotEmpty(pcsn)) { -// jsonVeExt.put("pcsn", pcsn); -// } -// if (StrUtil.isNotEmpty(qty)) { -// jsonVeExt.put("qty", qty); -// } -// jsonVeExt.put("device_uuid", org.nl.common.utils.IdUtil.getLongId()); -// jsonVeExt.put("update_time", DateUtil.now()); -// veExtTab.insert(jsonVeExt); -// } else { -// if (StrUtil.isNotEmpty(pcsn)) { -// ext_jo.put("pcsn", pcsn); -// } -// if (StrUtil.isNotEmpty(qty)) { -// ext_jo.put("qty", qty); -// } -// veExtTab.update(ext_jo); -// } -// } -// -// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); -// wo.update(json); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void deleteAll(Long[] ids) { -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// -// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); -// for (Long storagevehicle_id : ids) { -// JSONObject param = new JSONObject(); -// param.put("storagevehicle_id", String.valueOf(storagevehicle_id)); -// param.put("is_delete", "1"); -// param.put("update_optid", currentUserId); -// param.put("update_optname", nickName); -// param.put("update_time", now); -// wo.update(param); -// } -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void changeActive(JSONObject json) { -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// -// String is_used = "1"; -// if (StrUtil.equals("1", json.getString("is_used"))) { -// is_used = "0"; -// } -// json.put("is_used", is_used); -// json.put("update_optid", currentUserId); -// json.put("update_optname", nickName); -// json.put("update_time", now); -// WQLObject.getWQLObject("md_pb_storagevehicleinfo").update(json); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public JSONObject getVehicle(String code) { -// String term = ""; -// switch (code) { -// case "00": -// term = "VEHICCLE_CODE_MTP"; -// break; -// case "01": -// term = "VEHICCLE_CODE_TTP"; -// break; -// default: -// break; -// } -// -// HashMap map = new HashMap<>(); -// map.put("code", term); -// map.put("flag", "0"); -// SysCodeRuleServiceImpl genCodeService = new SysCodeRuleServiceImpl(); -// String value = genCodeService.codeDemo(map); -// -// JSONObject json = new JSONObject(); -// json.put("value", value); -// return json; -// } -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java deleted file mode 100644 index b46d88a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -//package org.nl.wms.basedata.master.service.impl; -// -// -//import cn.hutool.core.date.DateUtil; -//import cn.hutool.core.util.IdUtil; -//import cn.hutool.core.util.ObjectUtil; -//import cn.hutool.core.util.StrUtil; -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONArray; -//import com.alibaba.fastjson.JSONObject; -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.nl.common.utils.SecurityUtils; -//import org.nl.modules.common.exception.BadRequestException; -//import org.nl.modules.wql.core.bean.ResultBean; -//import org.nl.modules.wql.core.bean.WQLObject; -//import org.nl.modules.wql.util.WqlUtil; -//import org.nl.wms.basedata.master.service.UnitService; -//import org.nl.wms.basedata.master.service.dto.UnitDto; -//import org.springframework.data.domain.Pageable; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @author loujf -// * @description 服务实现 -// * @date 2021-12-07 -// **/ -//@Service -//@RequiredArgsConstructor -//@Slf4j -//public class UnitServiceImpl implements UnitService { -// -// @Override -// public Map queryAll(Map whereJson, Pageable page) { -// String where = ""; -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// String search = (String) whereJson.get("search"); -// if (!StrUtil.isEmpty(search)) { -// where = " AND (unit_code like '%" + search + "%' OR unit_name like '%" + search + "%' ) "; -// } -// ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete='0' " + where, "update_time desc"); -// final JSONObject json = rb.pageResult(); -// return json; -// } -// -// @Override -// public List queryAll(Map whereJson) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// JSONArray arr = wo.query().getResultJSONArray(0); -// List list = arr.toJavaList(UnitDto.class); -// return list; -// } -// -// @Override -// public UnitDto findById(Long measure_unit_id) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// JSONObject json = wo.query("measure_unit_id =" + measure_unit_id + "").uniqueResult(0); -// if (ObjectUtil.isEmpty(json)) { -// return null; -// } -// final UnitDto obj = json.toJavaObject(UnitDto.class); -// return obj; -// } -// -// @Override -// public UnitDto findByCode(String code) { -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// JSONObject json = wo.query("unit_code ='" + code + "'").uniqueResult(0); -// if (ObjectUtil.isEmpty(json)) { -// return null; -// } -// final UnitDto obj = json.toJavaObject(UnitDto.class); -// return obj; -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void create(UnitDto dto) { -// String unit_code = dto.getUnit_code(); -// UnitDto unitDto = this.findByCode(unit_code); -// if (unitDto != null && "0".equals(unitDto.getIs_delete())) { -// throw new BadRequestException("存在相同的编码"); -// } -// -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// -// dto.setMeasure_unit_id(IdUtil.getSnowflake(1, 1).nextId()); -// dto.setCreate_id(String.valueOf(currentUserId)); -// dto.setCreate_name(nickName); -// dto.setUpdate_optid(String.valueOf(currentUserId)); -// dto.setUpdate_optname(nickName); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); -// wo.insert(json); -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void update(UnitDto dto) { -// UnitDto entity = this.findById(dto.getMeasure_unit_id()); -// if (entity == null) { -// throw new BadRequestException("被删除或无权限，操作失败!"); -// } -// -// String unit_code = dto.getUnit_code(); -// UnitDto unitDto = this.findByCode(unit_code); -// if (unitDto != null && -// !unitDto.getMeasure_unit_id().equals(dto.getMeasure_unit_id()) -// && "0".equals(unitDto.getIs_delete())) { -// throw new BadRequestException("存在相同的编码"); -// } -// -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// dto.setUpdate_time(now); -// dto.setUpdate_optid(String.valueOf(currentUserId)); -// dto.setUpdate_optname(nickName); -// -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); -// wo.update(json); -// } -// -// @Override -// public JSONObject getUnit(Map whereJson) { -// JSONArray units = WQLObject.getWQLObject("md_pb_measureunit").query("is_used = '1' AND is_delete = '0'").getResultJSONArray(0); -// JSONObject jo = new JSONObject(); -// jo.put("content", units); -// return jo; -// } -// -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void deleteAll(String[] ids) { -// String currentUserId = SecurityUtils.getCurrentUserId(); -// String nickName = SecurityUtils.getCurrentNickName(); -// String now = DateUtil.now(); -// -// WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); -// for (String measure_unit_id : ids) { -// JSONObject param = new JSONObject(); -// param.put("measure_unit_id", String.valueOf(measure_unit_id)); -// param.put("is_delete", "1"); -// param.put("update_optid", currentUserId); -// param.put("update_optname", nickName); -// param.put("update_time", now); -// wo.update(param); -// } -// } -// -//} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/StoragevehicleinfoService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/StoragevehicleinfoService.java index 998e0ed..f49c839 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/StoragevehicleinfoService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/StoragevehicleinfoService.java @@ -2,23 +2,18 @@ package org.nl.wms.basedata.master.storagevehicleinfo.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; - +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo; -import org.nl.wms.basedata.master.storagevehicleinfo.service.dto.StoragevehicleinfoDto; import org.nl.wms.basedata.master.storagevehicleinfo.service.dto.StoragevehicleinfoQuery; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; /** * @author ldjun * @description 服务接口 * @date 2021-12-09 **/ -public interface StoragevehicleinfoService { +public interface StoragevehicleinfoService extends IService { /** * 查询数据分页 @@ -30,9 +25,9 @@ public interface StoragevehicleinfoService { JSONObject queryAll(StoragevehicleinfoQuery whereJson, PageQuery page); + Storagevehicleinfo getInfoByCode(String code); - - + Storagevehicleex getExtByCode(String code); /** * 创建 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/dao/Storagevehicleex.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/dao/Storagevehicleex.java index 56c7d30..9372608 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/dao/Storagevehicleex.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/dao/Storagevehicleex.java @@ -1,5 +1,7 @@ package org.nl.wms.basedata.master.storagevehicleinfo.service.dao; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +11,7 @@ import lombok.EqualsAndHashCode; @TableName("md_pb_storagevehicleext") public class Storagevehicleex { - + @TableId(value = "storagevehicleext_id", type = IdType.NONE) private Long storagevehicleext_id; private Long storagevehicle_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/impl/StoragevehicleinfoServiceImpl.java index 5381c40..0c9f257 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/impl/StoragevehicleinfoServiceImpl.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.CodeUtil; @@ -40,7 +41,7 @@ import java.util.*; **/ @Service @Slf4j -public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService { +public class StoragevehicleinfoServiceImpl extends ServiceImpl implements StoragevehicleinfoService { @Autowired IClassStandardService classstandardService; @@ -67,7 +68,27 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService jo.put("totalElements", storagevehicleinfoIPage.getTotal()); return jo; } - + @Override + public Storagevehicleinfo getInfoByCode(String code){ + if (StrUtil.isEmpty(code)) { + throw new BadRequestException("载具编码不能为空！"); + } + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleinfo::getStoragevehicle_code,code) + .eq(Storagevehicleinfo::getIs_delete,"0"); + Storagevehicleinfo storagevehicleex = storagevehicleinfoMapper.selectOne(lam); + return storagevehicleex; + } + @Override + public Storagevehicleex getExtByCode(String code){ + if (StrUtil.isEmpty(code)) { + throw new BadRequestException("载具编码不能为空！"); + } + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Storagevehicleex::getStoragevehicle_code,code); + Storagevehicleex storagevehicleex = storagevehicleexMapper.selectOne(lam); + return storagevehicleex; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/cotroller/UnitController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/cotroller/UnitController.java index 2ad6029..ed8c046 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/cotroller/UnitController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/cotroller/UnitController.java @@ -66,9 +66,9 @@ public class UnitController { @GetMapping("/getUnit") @Log("查询单位下拉框") - //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryUnit(@RequestParam Map whereJson) { return new ResponseEntity<>(unitService.getUnit(whereJson), HttpStatus.OK); } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/UnitService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/UnitService.java index 886d67b..e626125 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/UnitService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/UnitService.java @@ -1,12 +1,13 @@ package org.nl.wms.basedata.master.unit.service; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata.master.unit.service.dao.Unit; import org.nl.wms.basedata.master.unit.service.dto.UnitDto; import org.nl.wms.basedata.master.unit.service.dto.UnitQuery; +import java.util.List; import java.util.Map; /** @@ -14,7 +15,7 @@ import java.util.Map; * @description 服务接口 * @date 2021-12-07 **/ -public interface UnitService { +public interface UnitService extends IService { /** * 查询数据分页 @@ -25,10 +26,7 @@ public interface UnitService { */ IPage queryAll(UnitQuery whereJson, PageQuery page); - - - - + Unit queryByCode(String unit_code); /** * 创建 @@ -52,6 +50,6 @@ public interface UnitService { void deleteAll(String[] ids); - JSONObject getUnit(Map whereJson); + List getUnit(Map whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/impl/UnitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/impl/UnitServiceImpl.java index 8353eab..649f4df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/impl/UnitServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/impl/UnitServiceImpl.java @@ -1,23 +1,18 @@ package org.nl.wms.basedata.master.unit.service.impl; -import cn.dev33.satoken.json.SaJsonTemplate; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.basedata.master.sales.service.dao.Sales; import org.nl.wms.basedata.master.unit.service.UnitService; import org.nl.wms.basedata.master.unit.service.dao.Unit; import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; @@ -27,9 +22,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -41,9 +34,7 @@ import java.util.Map; @Service @RequiredArgsConstructor @Slf4j -public class UnitServiceImpl implements UnitService { - - private final SaJsonTemplate getSaJsonTemplateForJackson; +public class UnitServiceImpl extends ServiceImpl implements UnitService { @Autowired private UnitMapper unitMapper; @@ -60,14 +51,26 @@ public class UnitServiceImpl implements UnitService { unitMapper.selectPage(pages, lam); return pages; } - + @Override + public Unit queryByCode(String unit_code){ + if (ObjectUtil.isEmpty(unit_code)) { + throw new BadRequestException("单位编码不能为空!"); + } + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Unit::getIs_used, "1") + .eq(Unit::getIs_delete, "0") + .eq(Unit::getUnit_code,unit_code); + List units = unitMapper.selectList(lam); + if(units.size()>0){ + return units.get(0); + } + return null; + } @Override @Transactional(rollbackFor = Exception.class) public void create(UnitDto dto) { - LambdaQueryWrapper lam = new LambdaQueryWrapper(); - lam.eq(Unit::getUnit_code, dto.getUnit_code()); - Unit unit = unitMapper.selectOne(lam); + Unit unit = this.queryByCode(dto.getUnit_code()); if (unit != null && "0".equals(unit.getIs_delete())) { throw new BadRequestException("存在相同的编码"); } @@ -99,9 +102,7 @@ public class UnitServiceImpl implements UnitService { if (unitById == null) { throw new BadRequestException("被删除或无权限，操作失败!"); } - LambdaQueryWrapper lamCode = new LambdaQueryWrapper(); - lamCode.eq(Unit::getUnit_code, dto.getUnit_code()); - Unit unitByCode = unitMapper.selectOne(lamCode); + Unit unitByCode = this.queryByCode(dto.getUnit_code()); if (unitByCode != null && !unitByCode.getMeasure_unit_id().equals(dto.getMeasure_unit_id())&&"0".equals(unitByCode.getIs_delete())) { throw new BadRequestException("存在相同的编码"); } @@ -139,13 +140,11 @@ public class UnitServiceImpl implements UnitService { @Override - public JSONObject getUnit(Map whereJson) { + public List getUnit(Map whereJson) { LambdaQueryWrapper lam = new LambdaQueryWrapper(); - lam.eq(Unit::getIs_used, "1").eq(Unit::getIs_delete, "0"); + lam.eq(Unit::getIs_used, "1") + .eq(Unit::getIs_delete, "0"); List units = unitMapper.selectList(lam); - JSONObject jo = new JSONObject(); - jo.put("content", units); - return jo; + return units; } - } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java index c5b40bc..ae895d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java @@ -85,14 +85,6 @@ public class StructivtController { return new ResponseEntity<>(structivtService.getStructById(param), HttpStatus.OK); } - @GetMapping("/getUnits") - @Log("查询计量单位下拉") - - //@PreAuthorize("@el.check('structivt:list')") - public ResponseEntity getUnits() { - return new ResponseEntity<>(structivtService.getUnits(), HttpStatus.OK); - } - @Log("导出数据") @GetMapping(value = "/download") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java index 15db8d5..ab1a6e0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java @@ -78,7 +78,6 @@ public interface StructivtService { JSONObject getStructById(JSONObject param); - JSONArray getUnits(); void download(Map map, HttpServletResponse response, String[] product_area, String[] ivt_flag) throws IOException; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index 035f469..46650d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -8,7 +8,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; -import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -204,13 +203,6 @@ public class StructivtServiceImpl implements StructivtService { return jsonObject; } - @Override - public JSONArray getUnits() { - WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); - final JSONArray resultJSONArray = wo.query("is_delete = '0'").getResultJSONArray(0); - return resultJSONArray; - } - @Override public void download(Map whereJson, HttpServletResponse response, String[] product_area, String[] ivt_flag) throws IOException { String material = MapUtil.getStr(whereJson, "material"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java index 35c79fc..7268002 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java @@ -27,6 +27,8 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo; import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr; import org.nl.wms.basedata.st.structattr.service.dao.Structattr; import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper; @@ -75,6 +77,9 @@ public class StructattrServiceImpl extends ServiceImpl().lambda() @@ -2624,14 +2630,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String desiccantTemplate = "6"; //是否开盖 String isUncap = "1"; - JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + material_barcode + "'").uniqueResult(0); + Storagevehicleex vehicle_info = storagevehicleinfoService.getExtByCode(material_barcode); if (ObjectUtil.isEmpty(vehicle_info)) { - vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0); + vehicle_info = storagevehicleinfoService.getExtByCode(vehicle_code); if (ObjectUtil.isEmpty(vehicle_info)){ throw new BadRequestException("未查询到载具号【" + vehicle_code + "】对应的载具信息！"); } } - material_barcode = vehicle_info.getString("pcsn"); + material_barcode = vehicle_info.getPcsn(); // 查询木箱信息 BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( new QueryWrapper().lambda() diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 6f260d9..f6b63d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -44,6 +44,8 @@ import org.nl.wms.basedata.master.customer.service.dao.Customerbase; import org.nl.wms.basedata.master.customer.service.dao.mapper.CustomerbaseMapper; import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase; import org.nl.wms.basedata.master.materialbase.service.dao.mapper.MaterialbaseMapper; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.mes.service.MesToLmsService; import org.nl.wms.pda.mps.service.InService; @@ -72,7 +74,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { private final OutService outService; private final InService inService; - + @Autowired + private UnitMapper unitMapper; @Autowired private IPdmBiSlittingproductionplanService slittingproductionplanService; @@ -920,12 +923,13 @@ public class MesToLmsServiceImpl implements MesToLmsService { dtl.put("material_id", materialbase.getMaterial_id()); dtl.put("pcsn", plan_jo.getString("restruct_container_name")); dtl.put("box_no", package_box_sn); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + materialbase.getBase_unit_id() + "'").uniqueResult(0); + + Unit unit = unitMapper.selectById(materialbase.getBase_unit_id()); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("未查询到物料计量单位：" + materialbase.getBase_unit_id() + "，信息！"); } - dtl.put("qty_unit_id", unit.getString("measure_unit_id")); - dtl.put("qty_unit_name", unit.getString("unit_name")); + dtl.put("qty_unit_id", unit.getMeasure_unit_id()); + dtl.put("qty_unit_name", unit.getUnit_name()); dtl.put("plan_qty", sub_jo.getString("net_weight")); dtl.put("source_billdtl_id", plan_jo.getString("workorder_id")); rows.add(dtl); @@ -1531,12 +1535,15 @@ public class MesToLmsServiceImpl implements MesToLmsService { change_jo.put("isRePrintPackageBoxLabel", isRePrintPackageBoxLabel); change_jo.put("isUnPackBox", isUnPackBox); change_jo.put("UpdatedDateOfProduction", UpdatedDateOfProduction); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + materialbase.getBase_unit_id() + "'").uniqueResult(0); + + + Unit unit = unitMapper.selectById(materialbase.getBase_unit_id()); + if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("计量单位不存在：" + materialbase.getBase_unit_id()); } change_jo.put("qty_unit_id", materialbase.getBase_unit_id()); - change_jo.put("qty_unit_name", unit.getString("unit_name")); + change_jo.put("qty_unit_name", unit.getUnit_name()); change_jo.put("qty", container_row.getString("net_weight")); WQLObject.getWQLObject("ST_IVT_StructIvtChangeDtl").insert(change_jo); total_qty += container_row.getDoubleValue("net_weight"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index a90e365..49e711a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -15,6 +15,9 @@ import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase; import org.nl.wms.basedata.master.materialbase.service.dao.MaterialbaseProc; import org.nl.wms.basedata.master.materialbase.service.dao.mapper.MaterialbaseMapper; import org.nl.wms.basedata.master.materialbase.service.dao.mapper.MaterialbaseProcMapper; +import org.nl.wms.basedata.master.unit.service.UnitService; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.ext.sap.service.SapToLmsService; import org.nl.wms.st.inbill.service.CheckOutBillService; import org.nl.wms.st.inbill.service.RawAssistIStorService; @@ -43,6 +46,10 @@ public class SapToLmsServiceImpl implements SapToLmsService { @Autowired private MaterialbaseProcMapper materialbaseProcMapper; + @Autowired + private UnitMapper unitMapper; + @Autowired + private UnitService unitService; public JSONObject getReCutInfo2(JSONObject json) { @@ -103,12 +110,12 @@ public class SapToLmsServiceImpl implements SapToLmsService { dtl.put("material_id", mater_jo.getString("material_id")); dtl.put("pcsn", container_name); dtl.put("box_no", sub_jo.getString("package_box_sn")); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + mater_jo.getString("base_unit_id") + "'").uniqueResult(0); + Unit unit = unitMapper.selectById(mater_jo.getString("base_unit_id")); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("未查询到物料计量单位：" + mater_jo.getString("base_unit_id") + "，信息！"); } - dtl.put("qty_unit_id", unit.getString("measure_unit_id")); - dtl.put("qty_unit_name", unit.getString("unit_name")); + dtl.put("qty_unit_id", unit.getMeasure_unit_id()); + dtl.put("qty_unit_name", unit.getUnit_name()); dtl.put("plan_qty", sub_jo.getString("net_weight")); dtls.add(dtl); } @@ -197,12 +204,12 @@ public class SapToLmsServiceImpl implements SapToLmsService { } dtl.put("material_id", mater_jo.getString("material_id")); dtl.put("sap_pcsn", sap_pcsn); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + mater_jo.getString("base_unit_id") + "'").uniqueResult(0); + Unit unit = unitMapper.selectById(mater_jo.getString("base_unit_id")); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("未查询到物料计量单位：" + mater_jo.getString("base_unit_id") + "，信息！"); } - dtl.put("qty_unit_id", unit.getString("measure_unit_id")); - dtl.put("qty_unit_name", unit.getString("unit_name")); + dtl.put("qty_unit_id", unit.getMeasure_unit_id()); + dtl.put("qty_unit_name", unit.getUnit_name()); dtl.put("package_box_sn", sub_jo.getString("package_box_sn")); dtl.put("qty", sub_jo.getString("net_weight")); dtls.add(dtl); @@ -303,16 +310,18 @@ public class SapToLmsServiceImpl implements SapToLmsService { lamater.eq(Materialbase::getMaterial_code,MATNR); lamater.eq(Materialbase::getIs_delete,"0"); Materialbase materialbase = materialbaseMapper.selectOne(lamater); + + Unit unit = unitService.queryByCode(MEINS); + if (ObjectUtil.isEmpty(unit)) { + throw new BadRequestException("未查询到相关计量单位，请进行维护！"); + } if (ObjectUtil.isEmpty(materialbase)) { materialbase = new Materialbase(); materialbase.setMaterial_id( IdUtil.getSnowflake(1, 1).nextId()+""); materialbase.setMaterial_code(MATNR); materialbase.setMaterial_name(MATNR01); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + MEINS + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(unit)) { - throw new BadRequestException("未查询到相关计量单位，请进行维护！"); - } - materialbase.setBase_unit_id(unit.getString("measure_unit_id")); + + materialbase.setBase_unit_id(String.valueOf(unit.getMeasure_unit_id())); materialbase.setCreate_id("1"); materialbase.setCreate_name("管理员"); materialbase.setCreate_time(DateUtil.now()); @@ -321,11 +330,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { materialbaseMapper.insert(materialbase); } else { materialbase.setMaterial_name(MATNR01); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + MEINS + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(unit)) { - throw new BadRequestException("未查询到相关计量单位，请进行维护！"); - } - materialbase.setBase_unit_id(unit.getString("measure_unit_id")); + materialbase.setBase_unit_id(String.valueOf(unit.getMeasure_unit_id())); materialbase.setUpdate_id("1"); materialbase.setUpdate_name("管理员"); materialbase.setUpdate_time(DateUtil.now()); @@ -350,7 +355,6 @@ public class SapToLmsServiceImpl implements SapToLmsService { log.info("getDeliveryInfo的输入参数为：------------------------" + jo.toString()); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表 - WQLObject unitTab = WQLObject.getWQLObject("md_pb_measureunit"); // 基础单位表 JSONObject result = new JSONObject(); try { @@ -415,7 +419,6 @@ public class SapToLmsServiceImpl implements SapToLmsService { jsonMst.put("cust_code", json.getString("KUNNR")); // 客户 jsonMst.put("consignee", json.getString("NAMEM")); // 收货单位 jsonMst.put("receiptaddress", json.getString("ADRNRS")); // 收货地址 - /*jsonMst.put("remark",json.getString("LGORT"));//库位*/ // 明细 @@ -423,11 +426,11 @@ public class SapToLmsServiceImpl implements SapToLmsService { if (ObjectUtil.isEmpty(jsonMater)) { throw new BadRequestException("此物料不存在" + json.getString("MATNR")); } - JSONObject jsonUnit = unitTab.query("measure_unit_id = '" + jsonMater.getString("base_unit_id") + "'").uniqueResult(0); + Unit jsonUnit = unitMapper.selectById(jsonMater.getString("base_unit_id")); jsonDtl.put("material_id", jsonMater.getString("material_id")); jsonDtl.put("qty_unit_id", jsonMater.getLongValue("base_unit_id")); - jsonDtl.put("qty_unit_name", jsonUnit.getString("unit_name")); + jsonDtl.put("qty_unit_name", jsonUnit.getUnit_name()); jsonDtl.put("plan_qty", json.getDoubleValue("LFIMG")); jsonDtl.put("source_bill_code", json.getString("VGBEL-VGPOS")); jsonDtl.put("vbeln", json.getString("VBELN")); // 来源交货单 @@ -625,7 +628,6 @@ public class SapToLmsServiceImpl implements SapToLmsService { WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 仓库表 WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表 - WQLObject unitTab = WQLObject.getWQLObject("md_pb_measureunit"); // 基础单位表 // 校验调入仓库和调出仓库是否存在 String lgort_out = jo.getString("LGORT1"); // 调出仓库 @@ -676,7 +678,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { if (ObjectUtil.isEmpty(jsonMater)) { throw new BadRequestException("此物料不存在" + jsonObject.getString("MATNR")); } - JSONObject jsonUnit = unitTab.query("measure_unit_id = '" + jsonMater.getString("base_unit_id") + "'").uniqueResult(0); + Unit jsonUnit = unitMapper.selectById(jsonMater.getString("base_unit_id")); if (ObjectUtil.isEmpty(jsonObject.getString("KALAB"))) { throw new BadRequestException("调拨数量不能为空!"); @@ -687,7 +689,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { jsonDtl.put("material_id", jsonMater.getString("material_id")); jsonDtl.put("qty_unit_id", jsonMater.getLongValue("base_unit_id")); - jsonDtl.put("qty_unit_name", jsonUnit.getString("unit_name")); + jsonDtl.put("qty_unit_name", jsonUnit.getUnit_name()); jsonDtl.put("plan_qty", jsonObject.getDoubleValue("KALAB")); jsonDtl.put("source_bill_code", jsonObject.getString("ZVBELN")); jsonDtl.put("vbeln", jo.getString("ZDBSQD")); // 来源交货单 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java index 41daaed..2bf18fe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java @@ -12,10 +12,13 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.content.HttpContext; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.service.CasingService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +29,8 @@ import java.util.HashMap; @Slf4j public class CasingServiceImpl implements CasingService { private final LmsToMesService lmsToMesService; - + @Autowired + StoragevehicleinfoService storagevehicleinfoService; @Override public JSONObject queryMaterialInfo(JSONObject whereJson, HttpContext ctx) { String product_area = whereJson.getString("product_area"); @@ -195,14 +199,14 @@ public class CasingServiceImpl implements CasingService { throw new BadRequestException("未查询到对应的穿拔轴机构，请扫描正确点位！"); } - JSONObject qzz_jo = WQLObject.getWQLObject("md_pb_storagevehicleinfo").query("storagevehicle_code = '" + qzzno + "' AND is_delete = '0'").uniqueResult(0); + Storagevehicleinfo qzz_jo = storagevehicleinfoService.getInfoByCode(qzzno); if (ObjectUtil.isEmpty(qzz_jo)) { throw new BadRequestException("该气涨轴不存在或被删除！"); } - if ("0".equals(qzz_jo.getString("is_used"))) { + if ("0".equals(qzz_jo.getIs_used())) { throw new BadRequestException("气涨轴未启用！"); } - String storagevehicle_type = qzz_jo.getString("storagevehicle_type"); + String storagevehicle_type = qzz_jo.getStoragevehicle_type(); String to_size = ""; if ("000101".equals(storagevehicle_type)) { to_size = "3"; @@ -243,14 +247,14 @@ public class CasingServiceImpl implements CasingService { throw new BadRequestException("未查询到对应的穿拔轴机构，请扫描正确点位！"); } - JSONObject qzz_jo = WQLObject.getWQLObject("md_pb_storagevehicleinfo").query("storagevehicle_code = '" + qzzno + "' AND is_delete = '0'").uniqueResult(0); + Storagevehicleinfo qzz_jo = storagevehicleinfoService.getInfoByCode(qzzno); if (ObjectUtil.isEmpty(qzz_jo)) { throw new BadRequestException("该气涨轴不存在或被删除！"); } - if ("0".equals(qzz_jo.getString("is_used"))) { + if ("0".equals(qzz_jo.getIs_used())) { throw new BadRequestException("气涨轴未启用！"); } - String storagevehicle_type = qzz_jo.getString("storagevehicle_type"); + String storagevehicle_type = qzz_jo.getStoragevehicle_type(); String to_size = ""; if ("000101".equals(storagevehicle_type)) { to_size = "3"; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index 5726ea6..f8b39ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -15,15 +15,17 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.content.HttpContext; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.pda.mps.service.FeedingService; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.tasks.CoolCutTask; import org.nl.wms.sch.tasks.OutHotTask; import org.nl.wms.st.inbill.service.CheckOutBillService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,10 +35,10 @@ import java.util.HashMap; @RequiredArgsConstructor @Slf4j public class FeedingServiceImpl implements FeedingService { - private final LmsToMesService lmsToMesService; private final CheckOutBillService checkOutBillService; - + @Autowired + private UnitMapper unitMapper; @Override public JSONObject queryMaterialInfo(JSONObject whereJson, HttpContext ctx) { String product_area = whereJson.getString("product_area"); @@ -201,12 +203,12 @@ public class FeedingServiceImpl implements FeedingService { dtl.put("material_id", mater_jo.getString("material_id")); dtl.put("pcsn", plan_jo.getString("restruct_container_name")); dtl.put("box_no", package_box_sn); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + mater_jo.getString("base_unit_id") + "'").uniqueResult(0); + Unit unit = unitMapper.selectById(mater_jo.getString("base_unit_id")); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("未查询到物料计量单位：" + mater_jo.getString("base_unit_id") + "基础信息！"); } - dtl.put("qty_unit_id", unit.getString("measure_unit_id")); - dtl.put("qty_unit_name", unit.getString("unit_name")); + dtl.put("qty_unit_id", unit.getMeasure_unit_id()); + dtl.put("qty_unit_name", unit.getUnit_name()); dtl.put("plan_qty", sub_jo.getString("net_weight")); dtl.put("source_billdtl_id", plan_jo.getString("workorder_id")); rows.add(dtl); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java index d1eef37..3f775d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java @@ -4,19 +4,15 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; -import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; -import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; - -import java.math.BigDecimal; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex; import java.util.Arrays; import java.util.List; @@ -44,20 +40,22 @@ public class ComPareUtil { if (StringUtils.isBlank(subList.get(0).getString("package_box_sn"))) { throw new BadRequestException("木箱号不能为空!"); } + StoragevehicleinfoService storagevehicleinfoService = SpringContextHolder.getBean(StoragevehicleinfoService.class); + //查询托盘重量 - JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0); + Storagevehicleex vehicle_ext = storagevehicleinfoService.getExtByCode(vehicle_code); if (ObjectUtil.isEmpty(vehicle_ext)) { throw new BadRequestException("未查询到托盘的扩展信息"); } IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class); - List list = ipdmBiSubpackagerelationService.list(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getPackage_box_sn, vehicle_ext.getString("pcsn"))); + List list = ipdmBiSubpackagerelationService.list(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getPackage_box_sn, vehicle_ext.getPcsn())); if (ObjectUtil.isEmpty(list)) { throw new BadRequestException("未查询到对应的木箱包装关系！"); } PdmBiSubpackagerelation sub = list.get(0); - double vehicle_weight = vehicle_ext.getDoubleValue("qty"); + double vehicle_weight = Double.parseDouble(vehicle_ext.getQty()); double current_weight = NumberUtil.sub(jsonObject.getDoubleValue("weight"), vehicle_weight); double box_weight = sub.getBox_weight().doubleValue(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java index cef6788..3fa19db 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java @@ -10,6 +10,7 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -27,10 +28,13 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.system.service.tools.IToolLocalStorageService; +import org.nl.wms.basedata.master.sales.service.dao.Sales; +import org.nl.wms.basedata.master.sales.service.dao.mapper.SalesMapper; import org.nl.wms.createmsg.CreateMsg; import org.nl.wms.ext.mes.service.LmsToMesService; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.File; @@ -55,6 +59,8 @@ public class AutoSendSalesIvt { private final LmsToMesService lmsToMesService; private final RedissonClient redissonClient; + @Autowired + private SalesMapper salesMapper; /* * 填充前路径 @@ -504,15 +510,15 @@ public class AutoSendSalesIvt { * 查询此区域的所有业务员 */ String area = result.getString("value"); - - List areaList = WQLObject.getWQLObject("md_cs_areasalesinfo") - .query("area = '" + area + "' and is_active = '1'") - .getResultJSONArray(0).toJavaList(JSONObject.class); + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + lam.eq(Sales::getIs_active,"1"); + lam.eq(Sales::getArea,area); + List areaList =salesMapper.selectList(lam); List userList = areaList.stream() .map(row -> { JSONObject jsonObject = new JSONObject(); - jsonObject.put("User", row.getString("sales_code")); + jsonObject.put("User", row.getSales_code()); return jsonObject; }) .collect(Collectors.toList()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index 3178040..043d53f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -20,6 +20,8 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto; import org.nl.wms.basedata.st.storattr.service.StorattrService; import org.nl.wms.basedata.st.structattr.service.StructattrService; @@ -37,6 +39,7 @@ import org.nl.wms.st.inbill.service.RawAssistIStorService; import org.nl.wms.st.inbill.service.StorPublicService; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -67,6 +70,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { private final TaskService taskService; private final RedissonClient redissonClient; + @Autowired + private UnitMapper unitMapper; @Override public Map pageQuery(Map whereJson, Pageable page) { @@ -259,8 +264,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { row.put("bill_status", "10"); row.put("quality_scode", "01"); row.put("qty_unit_id", material.getString("base_unit_id")); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + material.getString("base_unit_id") + "'").uniqueResult(0); - row.put("qty_unit_name", unit.getString("unit_name")); + Unit unit = unitMapper.selectById(material.getString("base_unit_id")); + row.put("qty_unit_name", unit.getUnit_name()); row.put("assign_qty", row.get("net_weight")); row.put("plan_qty", row.get("net_weight")); String net_weight = row.get("net_weight"); @@ -293,7 +298,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { dis.put("quality_scode", row.get("quality_scode")); dis.put("work_status", "00"); dis.put("qty_unit_id", material.getString("base_unit_id")); - dis.put("qty_unit_name", unit.getString("unit_name")); + dis.put("qty_unit_name", unit.getUnit_name()); dis.put("plan_qty", row.get("plan_qty")); WQLObject.getWQLObject("ST_IVT_IOStorInvDis").insert(dis); @@ -420,8 +425,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { row.put("bill_status", "10"); row.put("quality_scode", "01"); row.put("qty_unit_id", material.getString("base_unit_id")); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + material.getString("base_unit_id") + "'").uniqueResult(0); - row.put("qty_unit_name", unit.getString("unit_name")); + Unit unit = unitMapper.selectById(material.getString("base_unit_id")); + row.put("qty_unit_name", unit.getUnit_name()); row.put("assign_qty", row.get("net_weight")); row.put("plan_qty", row.get("net_weight")); String net_weight = row.get("net_weight"); @@ -440,7 +445,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { dis.put("quality_scode", row.get("quality_scode")); dis.put("work_status", "00"); dis.put("qty_unit_id", material.getString("base_unit_id")); - dis.put("qty_unit_name", unit.getString("unit_name")); + dis.put("qty_unit_name", unit.getUnit_name()); dis.put("plan_qty", row.get("plan_qty")); WQLObject.getWQLObject("ST_IVT_IOStorInvDis").insert(dis); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java index e89fe62..5b78766 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -440,8 +440,6 @@ public class StorPublicServiceImpl implements StorPublicService { WQLObject wo_Struct = WQLObject.getWQLObject("ST_IVT_StructAttr"); //点位表 WQLObject wo_Point = WQLObject.getWQLObject("SCH_BASE_Point"); - //载具表 - WQLObject wo_Storage = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); String struct_id = from.getString("struct_id"); String point_code = from.getString("point_code"); //锁定类型 @@ -516,8 +514,6 @@ public class StorPublicServiceImpl implements StorPublicService { WQLObject wo_Struct = WQLObject.getWQLObject("ST_IVT_StructAttr"); //点位表 WQLObject wo_Point = WQLObject.getWQLObject("SCH_BASE_Point"); - //载具表 - WQLObject wo_Storage = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); String struct_id = from.getString("struct_id"); String point_code = from.getString("point_code"); //锁定类型 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java index bfed56b..96322cd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java @@ -18,6 +18,8 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.basedata.master.customer.service.dao.Customerbase; import org.nl.wms.basedata.master.customer.service.dao.mapper.CustomerbaseMapper; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.st.instor.service.ChangeService; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +40,8 @@ public class ChangeServiceImpl implements ChangeService { @Autowired private CustomerbaseMapper customerbaseMapper; + @Autowired + private UnitMapper unitMapper; @Override public Map pageQuery(Map whereJson, Pageable page) { @@ -206,9 +210,10 @@ public class ChangeServiceImpl implements ChangeService { change_jo.put("isRePrintPackageBoxLabel", isRePrintPackageBoxLabel); change_jo.put("isUnPackBox", isUnPackBox); change_jo.put("UpdatedDateOfProduction", UpdatedDateOfProduction); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + mater_jo.getString("base_unit_id") + "'").uniqueResult(0); + + Unit unit = unitMapper.selectById(mater_jo.getString("base_unit_id")); change_jo.put("qty_unit_id", mater_jo.getString("base_unit_id")); - change_jo.put("qty_unit_name", unit.getString("unit_name")); + change_jo.put("qty_unit_name", unit.getUnit_name()); change_jo.put("qty", container_row.getString("net_weight")); WQLObject.getWQLObject("ST_IVT_StructIvtChangeDtl").insert(change_jo); total_qty += container_row.getDoubleValue("net_weight"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java index 5a090b8..87d9c18 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java @@ -18,7 +18,8 @@ import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.system.service.user.ISysUserService; +import org.nl.wms.basedata.master.unit.service.dao.Unit; +import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.st.inbill.service.CheckOutBillService; import org.nl.wms.st.instor.service.RecutPlanService; @@ -44,7 +45,7 @@ public class RecutPlanServiceImpl implements RecutPlanService { private IStIvtIostorinvOutService iStIvtIostorinvOutService; @Autowired - private ISysUserService iSysUserService; + private UnitMapper unitMapper; @Override public Map pageQuery(Map whereJson, Pageable page) { @@ -244,12 +245,13 @@ public class RecutPlanServiceImpl implements RecutPlanService { dtl.put("material_id", mater_jo.getString("material_id")); dtl.put("pcsn", container_name); dtl.put("box_no", sub_jo.getString("package_box_sn")); - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + mater_jo.getString("base_unit_id") + "'").uniqueResult(0); + + Unit unit = unitMapper.selectById(mater_jo.getString("base_unit_id")); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("未查询到物料计量单位：" + mater_jo.getString("base_unit_id") + "，信息！"); } - dtl.put("qty_unit_id", unit.getString("measure_unit_id")); - dtl.put("qty_unit_name", unit.getString("unit_name")); + dtl.put("qty_unit_id", unit.getMeasure_unit_id()); + dtl.put("qty_unit_name", unit.getUnit_name()); dtl.put("plan_qty", sub_jo.getString("net_weight")); dtls.add(dtl); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java index 102b07a..930eb27 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java @@ -16,8 +16,11 @@ import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService; +import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo; import org.nl.wms.st.inbill.service.dto.RegionioDto; import org.nl.wms.st.outbill.service.RegionioOutService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,7 +38,8 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j public class RegionioOutServiceImpl implements RegionioOutService { - + @Autowired + StoragevehicleinfoService storagevehicleinfoService; @Override public Map queryAll(Map whereJson, Pageable page) { String bill_code = MapUtil.getStr(whereJson, "bill_code"); @@ -113,11 +117,10 @@ public class RegionioOutServiceImpl implements RegionioOutService { @Transactional(rollbackFor = Exception.class) public void create(RegionioDto dto) { WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); - WQLObject vehicleTab = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); + Storagevehicleinfo jsonVehicle = storagevehicleinfoService.getInfoByCode(dto.getVehicle_code()); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在"); } @@ -155,11 +158,10 @@ public class RegionioOutServiceImpl implements RegionioOutService { } WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); - WQLObject vehicleTab = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); + Storagevehicleinfo jsonVehicle = storagevehicleinfoService.getInfoByCode(dto.getVehicle_code()); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在"); } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/structivt.js b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/structivt.js index 52927a9..0a7d513 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/structivt.js +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/structivt.js @@ -39,13 +39,6 @@ export function getStructById(data) { }) } -export function getUnits() { - return request({ - url: 'api/structivt/getUnits', - method: 'get' - }) -} - export function save(data) { return request({ url: 'api/structivt/save', @@ -62,4 +55,4 @@ export function excelImport(data) { }) } -export default { add, edit, del, getStruct, getStructById, getUnits, save, excelImport } +export default { add, edit, del, getStruct, getStructById, save, excelImport }