From 093d4e47724fe0693e8e4a917b7d396878121a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 2 Jul 2025 12:05:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/ModelController.java | 4 +- .../admin/controller/WorkbenchController.java | 4 +- .../service/MaterialControllerService.java | 38 ++++----- .../admin/service/ModelControllerService.java | 46 +++++----- .../service/WarehouseControllerService.java | 54 ++++++------ .../service/WorkbenchControllerService.java | 46 +++++----- .../{Material.java => WmsMaterial.java} | 2 +- .../entity/{Model.java => WmsModel.java} | 2 +- .../{Warehouse.java => WmsWarehouse.java} | 2 +- .../{Workbench.java => WmsWorkbench.java} | 2 +- ...rialMapper.java => WmsMaterialMapper.java} | 6 +- .../{ModelMapper.java => WmsModelMapper.java} | 4 +- ...useMapper.java => WmsWarehouseMapper.java} | 4 +- ...nchMapper.java => WmsWorkbenchMapper.java} | 4 +- ...lService.java => IWmsMaterialService.java} | 10 +-- ...odelService.java => IWmsModelService.java} | 10 +-- ...Service.java => IWmsWarehouseService.java} | 8 +- ...Service.java => IWmsWorkbenchService.java} | 10 +-- .../service/impl/ModelServiceImpl.java | 84 ------------------- ...eImpl.java => WmsMaterialServiceImpl.java} | 30 +++---- .../service/impl/WmsModelServiceImpl.java | 84 +++++++++++++++++++ ...Impl.java => WmsWarehouseServiceImpl.java} | 46 +++++----- .../service/impl/WmsWorkbenchServiceImpl.java | 84 +++++++++++++++++++ .../service/impl/WorkbenchServiceImpl.java | 84 ------------------- ...terialMapper.xml => WmsMaterialMapper.xml} | 10 +-- .../{ModelMapper.xml => WmsModelMapper.xml} | 2 +- ...houseMapper.xml => WmsWarehouseMapper.xml} | 6 +- ...benchMapper.xml => WmsWorkbenchMapper.xml} | 2 +- 28 files changed, 344 insertions(+), 344 deletions(-) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/{Material.java => WmsMaterial.java} (96%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/{Model.java => WmsModel.java} (95%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/{Warehouse.java => WmsWarehouse.java} (96%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/{Workbench.java => WmsWorkbench.java} (95%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/{MaterialMapper.java => WmsMaterialMapper.java} (78%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/{ModelMapper.java => WmsModelMapper.java} (63%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/{WarehouseMapper.java => WmsWarehouseMapper.java} (82%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/{WorkbenchMapper.java => WmsWorkbenchMapper.java} (61%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/{IMaterialService.java => IWmsMaterialService.java} (71%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/{IModelService.java => IWmsModelService.java} (68%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/{IWarehouseService.java => IWmsWarehouseService.java} (77%) rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/{IWorkbenchService.java => IWmsWorkbenchService.java} (65%) delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ModelServiceImpl.java rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/{MaterialServiceImpl.java => WmsMaterialServiceImpl.java} (54%) create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsModelServiceImpl.java rename nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/{WarehouseServiceImpl.java => WmsWarehouseServiceImpl.java} (54%) create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWorkbenchServiceImpl.java delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WorkbenchServiceImpl.java rename nflg-wms-repository/src/main/resources/mapper/{MaterialMapper.xml => WmsMaterialMapper.xml} (84%) rename nflg-wms-repository/src/main/resources/mapper/{ModelMapper.xml => WmsModelMapper.xml} (70%) rename nflg-wms-repository/src/main/resources/mapper/{WarehouseMapper.xml => WmsWarehouseMapper.xml} (88%) rename nflg-wms-repository/src/main/resources/mapper/{WorkbenchMapper.xml => WmsWorkbenchMapper.xml} (68%) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ModelController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ModelController.java index f16731a0..d70118af 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ModelController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ModelController.java @@ -7,7 +7,7 @@ import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.ModelAddQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO; import com.nflg.wms.common.pojo.qo.ModelUpdateQO; -import com.nflg.wms.repository.entity.Model; +import com.nflg.wms.repository.entity.WmsModel; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -72,7 +72,7 @@ public class ModelController extends BaseController { * @param request 搜索参数 */ @PostMapping("search") - public ApiResult> search(@Valid @RequestBody ModelSearchQO request){ + public ApiResult> search(@Valid @RequestBody ModelSearchQO request){ return ApiResult.success(modelControllerService.search(request)); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WorkbenchController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WorkbenchController.java index 2e690f14..5952406d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WorkbenchController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WorkbenchController.java @@ -7,7 +7,7 @@ import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.ModelAddQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO; import com.nflg.wms.common.pojo.qo.ModelUpdateQO; -import com.nflg.wms.repository.entity.Workbench; +import com.nflg.wms.repository.entity.WmsWorkbench; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -72,7 +72,7 @@ public class WorkbenchController extends BaseController { * @param request 搜索参数 */ @PostMapping("search") - public ApiResult> search(@Valid @RequestBody ModelSearchQO request){ + public ApiResult> search(@Valid @RequestBody ModelSearchQO request){ return ApiResult.success(workbenchControllerService.search(request)); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index d0e73592..163282a5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -10,8 +10,8 @@ import com.nflg.wms.common.pojo.qo.MaterialUpdateQO; import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Material; -import com.nflg.wms.repository.service.IMaterialService; +import com.nflg.wms.repository.entity.WmsMaterial; +import com.nflg.wms.repository.service.IWmsMaterialService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; @@ -34,29 +34,29 @@ import java.util.stream.Collectors; public class MaterialControllerService { @Resource - private IMaterialService materialService; + private IWmsMaterialService materialService; public void add(@Valid MaterialAddQO request) { - Material material = Convert.convert(Material.class, request); - material.setCreateBy(UserUtil.getUserName()); - material.setCreateTime(LocalDateTime.now()); - materialService.add(material); + WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); + wmsMaterial.setCreateBy(UserUtil.getUserName()); + wmsMaterial.setCreateTime(LocalDateTime.now()); + materialService.add(wmsMaterial); } public void update(@Valid MaterialUpdateQO request) { - Material old = materialService.getById(request.getId()); + WmsMaterial old = materialService.getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！"); - Material material = Convert.convert(Material.class, request); + WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); if (StrUtil.isNotBlank(old.getImage()) && Objects.nonNull(old.getWeight())) { - material.setVersion(old.getVersion() + 1); - material.setCreateBy(UserUtil.getUserName()); - material.setCreateTime(LocalDateTime.now()); - material.setId(null); - materialService.add(material); + wmsMaterial.setVersion(old.getVersion() + 1); + wmsMaterial.setCreateBy(UserUtil.getUserName()); + wmsMaterial.setCreateTime(LocalDateTime.now()); + wmsMaterial.setId(null); + materialService.add(wmsMaterial); }else { - material.setUpdateBy(UserUtil.getUserName()); - material.setUpdateTime(LocalDateTime.now()); - materialService.update(material); + wmsMaterial.setUpdateBy(UserUtil.getUserName()); + wmsMaterial.setUpdateTime(LocalDateTime.now()); + materialService.update(wmsMaterial); } } @@ -69,8 +69,8 @@ public class MaterialControllerService { } public void exportNotSet(HttpServletResponse response) throws IOException { - List materials = materialService.getNotSet(); - List datas = materials.stream().map(model -> Convert.convert(MaterialExcelExportDTO.class, model)).collect(Collectors.toList()); + List wmsMaterials = materialService.getNotSet(); + List datas = wmsMaterials.stream().map(model -> Convert.convert(MaterialExcelExportDTO.class, model)).collect(Collectors.toList()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("未设置物料清单.xlsx", StandardCharsets.UTF_8)); new Workbook() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ModelControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ModelControllerService.java index cfd15bb9..ccf68a84 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ModelControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ModelControllerService.java @@ -17,8 +17,8 @@ import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Model; -import com.nflg.wms.repository.service.IModelService; +import com.nflg.wms.repository.entity.WmsModel; +import com.nflg.wms.repository.service.IWmsModelService; import com.nflg.wms.starter.service.FileUploadService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -48,23 +48,23 @@ import java.util.stream.Collectors; public class ModelControllerService { @Resource - private IModelService modelService; + private IWmsModelService modelService; @Resource private FileUploadService fileUploadService; public void add(@Valid ModelAddQO request) { - Model model= Convert.convert(Model.class, request); - model.setCreateBy(UserUtil.getUserName()); - model.setCreateTime(LocalDateTime.now()); - modelService.add(model); + WmsModel wmsModel = Convert.convert(WmsModel.class, request); + wmsModel.setCreateBy(UserUtil.getUserName()); + wmsModel.setCreateTime(LocalDateTime.now()); + modelService.add(wmsModel); } public void update(@Valid ModelUpdateQO request) { - Model model= Convert.convert(Model.class, request); - model.setUpdateBy(UserUtil.getUserName()); - model.setUpdateTime(LocalDateTime.now()); - modelService.update(model); + WmsModel wmsModel = Convert.convert(WmsModel.class, request); + wmsModel.setUpdateBy(UserUtil.getUserName()); + wmsModel.setUpdateTime(LocalDateTime.now()); + modelService.update(wmsModel); } public void delete(@Valid @NotNull Long id) { @@ -75,7 +75,7 @@ public class ModelControllerService { modelService.enable(request); } - public IPage search(@Valid ModelSearchQO request) { + public IPage search(@Valid ModelSearchQO request) { return modelService.search(request); } @@ -101,37 +101,37 @@ public class ModelControllerService { @Transactional public boolean updateCheckAndImport(List data) { - List models = new ArrayList<>(); + List wmsModels = new ArrayList<>(); for (ModelExcelImportDTO dto : data) { - Model model = new Model(); + WmsModel wmsModel = new WmsModel(); StringBuilder sb = new StringBuilder(); if (Objects.isNull(dto.getNo())) { sb.append("机型编号不能为空;"); } else { - model = modelService.lambdaQuery().eq(Model::getNo, dto.getNo()).one(); - if (Objects.isNull(model)) { - model = new Model() + wmsModel = modelService.lambdaQuery().eq(WmsModel::getNo, dto.getNo()).one(); + if (Objects.isNull(wmsModel)) { + wmsModel = new WmsModel() .setNo(dto.getNo()) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); }else { - model.setUpdateBy(UserUtil.getUserName()); - model.setUpdateTime(LocalDateTime.now()); + wmsModel.setUpdateBy(UserUtil.getUserName()); + wmsModel.setUpdateTime(LocalDateTime.now()); } } - model.setRemark(dto.getRemark()); + wmsModel.setRemark(dto.getRemark()); dto.setError(sb.toString()); - models.add(model); + wmsModels.add(wmsModel); } if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { - modelService.saveOrUpdateBatch(models); + modelService.saveOrUpdateBatch(wmsModels); return true; } return false; } public void exportSelect(HttpServletResponse response,List ids) throws IOException { - List users = CollectionUtil.isNotEmpty(ids)?modelService.listByIds(ids):new ArrayList<>(); + List users = CollectionUtil.isNotEmpty(ids)?modelService.listByIds(ids):new ArrayList<>(); List datas = users.stream().map(model -> { ModelExcelExportDTO dto = new ModelExcelExportDTO(); dto.setNo(model.getNo()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java index ec4376b1..e32b83c5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java @@ -20,9 +20,9 @@ import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.DictionaryItem; -import com.nflg.wms.repository.entity.Warehouse; +import com.nflg.wms.repository.entity.WmsWarehouse; import com.nflg.wms.repository.service.IDictionaryItemService; -import com.nflg.wms.repository.service.IWarehouseService; +import com.nflg.wms.repository.service.IWmsWarehouseService; import com.nflg.wms.starter.service.FileUploadService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -52,7 +52,7 @@ import java.util.stream.Collectors; public class WarehouseControllerService { @Resource - private IWarehouseService warehouseService; + private IWmsWarehouseService warehouseService; @Resource private IDictionaryItemService dictionaryItemService; @@ -61,17 +61,17 @@ public class WarehouseControllerService { private FileUploadService fileUploadService; public void add(@Valid WarehouseAddQO request) { - Warehouse warehouse= Convert.convert(Warehouse.class, request); - warehouse.setCreateBy(UserUtil.getUserName()); - warehouse.setCreateTime(LocalDateTime.now()); - warehouseService.add(warehouse); + WmsWarehouse wmsWarehouse = Convert.convert(WmsWarehouse.class, request); + wmsWarehouse.setCreateBy(UserUtil.getUserName()); + wmsWarehouse.setCreateTime(LocalDateTime.now()); + warehouseService.add(wmsWarehouse); } public void update(@Valid WarehouseUpdateQO request) { - Warehouse warehouse= Convert.convert(Warehouse.class, request); - warehouse.setUpdateBy(UserUtil.getUserName()); - warehouse.setUpdateTime(LocalDateTime.now()); - warehouseService.update(warehouse); + WmsWarehouse wmsWarehouse = Convert.convert(WmsWarehouse.class, request); + wmsWarehouse.setUpdateBy(UserUtil.getUserName()); + wmsWarehouse.setUpdateTime(LocalDateTime.now()); + warehouseService.update(wmsWarehouse); } public void delete(@Valid @NotNull Long id) { @@ -134,34 +134,34 @@ public class WarehouseControllerService { @Transactional public boolean updateCheckAndImport(List data) { List factorys = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_FACTORY); - List warehouses = new ArrayList<>(); + List wmsWarehouses = new ArrayList<>(); for (WarehouseExcelImportDTO dto : data) { - Warehouse warehouse = new Warehouse(); + WmsWarehouse wmsWarehouse = new WmsWarehouse(); StringBuilder sb = new StringBuilder(); if (Objects.isNull(dto.getNo())) { sb.append("仓库编号不能为空;"); } else { - warehouse = warehouseService.lambdaQuery().eq(Warehouse::getNo, dto.getNo()).one(); - if (Objects.isNull(warehouse)) { - warehouse = new Warehouse() + wmsWarehouse = warehouseService.lambdaQuery().eq(WmsWarehouse::getNo, dto.getNo()).one(); + if (Objects.isNull(wmsWarehouse)) { + wmsWarehouse = new WmsWarehouse() .setNo(dto.getNo()) .setEnable(true) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); }else { - warehouse.setUpdateBy(UserUtil.getUserName()); - warehouse.setUpdateTime(LocalDateTime.now()); + wmsWarehouse.setUpdateBy(UserUtil.getUserName()); + wmsWarehouse.setUpdateTime(LocalDateTime.now()); } } if (StrUtil.isBlank(dto.getName())){ sb.append("仓库名称不能为空;"); }else { - warehouse.setName(dto.getName()); + wmsWarehouse.setName(dto.getName()); } - warehouse.setUserName(dto.getUserName()); - warehouse.setCheckUserName(dto.getCheckUserName()); - warehouse.setPhone(dto.getPhone()); - warehouse.setAddress(dto.getAddress()); + wmsWarehouse.setUserName(dto.getUserName()); + wmsWarehouse.setCheckUserName(dto.getCheckUserName()); + wmsWarehouse.setPhone(dto.getPhone()); + wmsWarehouse.setAddress(dto.getAddress()); if (StrUtil.isBlank(dto.getFactoryName())){ sb.append("所属工厂不能为空;"); }else { @@ -169,15 +169,15 @@ public class WarehouseControllerService { if (Objects.isNull(factory)){ sb.append("所属工厂无效;"); }else { - warehouse.setFactoryId(factory.getId()); + wmsWarehouse.setFactoryId(factory.getId()); } } - warehouse.setRemark(dto.getRemark()); + wmsWarehouse.setRemark(dto.getRemark()); dto.setError(sb.toString()); - warehouses.add(warehouse); + wmsWarehouses.add(wmsWarehouse); } if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { - warehouseService.saveOrUpdateBatch(warehouses); + warehouseService.saveOrUpdateBatch(wmsWarehouses); return true; } return false; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WorkbenchControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WorkbenchControllerService.java index 8d0c5e76..ec538d17 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WorkbenchControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WorkbenchControllerService.java @@ -17,8 +17,8 @@ import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Workbench; -import com.nflg.wms.repository.service.IWorkbenchService; +import com.nflg.wms.repository.entity.WmsWorkbench; +import com.nflg.wms.repository.service.IWmsWorkbenchService; import com.nflg.wms.starter.service.FileUploadService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -48,23 +48,23 @@ import java.util.stream.Collectors; public class WorkbenchControllerService { @Resource - private IWorkbenchService workbenchService; + private IWmsWorkbenchService workbenchService; @Resource private FileUploadService fileUploadService; public void add(@Valid ModelAddQO request) { - Workbench workbench= Convert.convert(Workbench.class, request); - workbench.setCreateBy(UserUtil.getUserName()); - workbench.setCreateTime(LocalDateTime.now()); - workbenchService.add(workbench); + WmsWorkbench wmsWorkbench = Convert.convert(WmsWorkbench.class, request); + wmsWorkbench.setCreateBy(UserUtil.getUserName()); + wmsWorkbench.setCreateTime(LocalDateTime.now()); + workbenchService.add(wmsWorkbench); } public void update(@Valid ModelUpdateQO request) { - Workbench workbench= Convert.convert(Workbench.class, request); - workbench.setUpdateBy(UserUtil.getUserName()); - workbench.setUpdateTime(LocalDateTime.now()); - workbenchService.update(workbench); + WmsWorkbench wmsWorkbench = Convert.convert(WmsWorkbench.class, request); + wmsWorkbench.setUpdateBy(UserUtil.getUserName()); + wmsWorkbench.setUpdateTime(LocalDateTime.now()); + workbenchService.update(wmsWorkbench); } public void delete(@Valid @NotNull Long id) { @@ -75,7 +75,7 @@ public class WorkbenchControllerService { workbenchService.enable(request); } - public IPage search(@Valid ModelSearchQO request) { + public IPage search(@Valid ModelSearchQO request) { return workbenchService.search(request); } @@ -101,37 +101,37 @@ public class WorkbenchControllerService { @Transactional public boolean updateCheckAndImport(List data) { - List workbenches = new ArrayList<>(); + List wmsWorkbenches = new ArrayList<>(); for (WorkbenchExcelImportDTO dto : data) { - Workbench workbench = new Workbench(); + WmsWorkbench wmsWorkbench = new WmsWorkbench(); StringBuilder sb = new StringBuilder(); if (Objects.isNull(dto.getNo())) { sb.append("机型编号不能为空;"); } else { - workbench = workbenchService.lambdaQuery().eq(Workbench::getNo, dto.getNo()).one(); - if (Objects.isNull(workbench)) { - workbench = new Workbench() + wmsWorkbench = workbenchService.lambdaQuery().eq(WmsWorkbench::getNo, dto.getNo()).one(); + if (Objects.isNull(wmsWorkbench)) { + wmsWorkbench = new WmsWorkbench() .setNo(dto.getNo()) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); }else { - workbench.setUpdateBy(UserUtil.getUserName()); - workbench.setUpdateTime(LocalDateTime.now()); + wmsWorkbench.setUpdateBy(UserUtil.getUserName()); + wmsWorkbench.setUpdateTime(LocalDateTime.now()); } } - workbench.setRemark(dto.getRemark()); + wmsWorkbench.setRemark(dto.getRemark()); dto.setError(sb.toString()); - workbenches.add(workbench); + wmsWorkbenches.add(wmsWorkbench); } if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { - workbenchService.saveOrUpdateBatch(workbenches); + workbenchService.saveOrUpdateBatch(wmsWorkbenches); return true; } return false; } public void exportSelect(HttpServletResponse response, List ids) throws IOException { - List users = CollectionUtil.isNotEmpty(ids)?workbenchService.listByIds(ids):new ArrayList<>(); + List users = CollectionUtil.isNotEmpty(ids)?workbenchService.listByIds(ids):new ArrayList<>(); List datas = users.stream().map(model -> { WorkbenchExcelExportDTO dto = new WorkbenchExcelExportDTO(); dto.setNo(model.getNo()); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Material.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsMaterial.java similarity index 96% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Material.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsMaterial.java index dd483431..03d5303b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Material.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsMaterial.java @@ -23,7 +23,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -public class Material implements Serializable { +public class WmsMaterial implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Model.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsModel.java similarity index 95% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Model.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsModel.java index dab08e93..2677cb2a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Model.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsModel.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -public class Model implements Serializable { +public class WmsModel implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Warehouse.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java similarity index 96% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Warehouse.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java index f3f192eb..315d357f 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Warehouse.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -public class Warehouse implements Serializable { +public class WmsWarehouse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Workbench.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWorkbench.java similarity index 95% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Workbench.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWorkbench.java index 2b75fdb6..a52fea1c 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Workbench.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWorkbench.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -public class Workbench implements Serializable { +public class WmsWorkbench implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/MaterialMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsMaterialMapper.java similarity index 78% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/MaterialMapper.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsMaterialMapper.java index 7bab9b1d..71698c60 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/MaterialMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsMaterialMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.MaterialSearchQO; import com.nflg.wms.common.pojo.vo.MaterialVO; -import com.nflg.wms.repository.entity.Material; +import com.nflg.wms.repository.entity.WmsMaterial; import java.util.List; @@ -17,11 +17,11 @@ import java.util.List; * @author 代码生成器生成 * @since 2025 */ -public interface MaterialMapper extends BaseMapper { +public interface WmsMaterialMapper extends BaseMapper { IPage search(MaterialSearchQO request, Page objectPage); List getHistory(String no); - List getNotSet(); + List getNotSet(); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/ModelMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsModelMapper.java similarity index 63% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/ModelMapper.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsModelMapper.java index 2156d46e..f6fa312d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/ModelMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsModelMapper.java @@ -1,7 +1,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nflg.wms.repository.entity.Model; +import com.nflg.wms.repository.entity.WmsModel; /** *

@@ -11,6 +11,6 @@ import com.nflg.wms.repository.entity.Model; * @author 代码生成器生成 * @since 2025 */ -public interface ModelMapper extends BaseMapper { +public interface WmsModelMapper extends BaseMapper { } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WarehouseMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java similarity index 82% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WarehouseMapper.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java index e9bac358..8d6d1fab 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WarehouseMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.vo.WarehouseVO; -import com.nflg.wms.repository.entity.Warehouse; +import com.nflg.wms.repository.entity.WmsWarehouse; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; * @author 代码生成器生成 * @since 2025 */ -public interface WarehouseMapper extends BaseMapper { +public interface WmsWarehouseMapper extends BaseMapper { IPage search(WarehouseSearchQO request, Page objectPage); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WorkbenchMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWorkbenchMapper.java similarity index 61% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WorkbenchMapper.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWorkbenchMapper.java index 3a52dcf9..4e3c4009 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WorkbenchMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWorkbenchMapper.java @@ -1,7 +1,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nflg.wms.repository.entity.Workbench; +import com.nflg.wms.repository.entity.WmsWorkbench; /** *

@@ -11,6 +11,6 @@ import com.nflg.wms.repository.entity.Workbench; * @author 代码生成器生成 * @since 2025 */ -public interface WorkbenchMapper extends BaseMapper { +public interface WmsWorkbenchMapper extends BaseMapper { } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMaterialService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsMaterialService.java similarity index 71% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMaterialService.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsMaterialService.java index a31d1d82..2280c40a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMaterialService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsMaterialService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.MaterialSearchQO; import com.nflg.wms.common.pojo.vo.MaterialVO; -import com.nflg.wms.repository.entity.Material; +import com.nflg.wms.repository.entity.WmsMaterial; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; @@ -18,15 +18,15 @@ import java.util.List; * @author 代码生成器生成 * @since 2025 */ -public interface IMaterialService extends IService { +public interface IWmsMaterialService extends IService { - void add(Material material); + void add(WmsMaterial wmsMaterial); - void update(Material material); + void update(WmsMaterial wmsMaterial); IPage search(@Valid MaterialSearchQO request); List getHistory(@Valid @NotBlank String no); - List getNotSet(); + List getNotSet(); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IModelService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsModelService.java similarity index 68% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IModelService.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsModelService.java index 3280cc83..6dc5b425 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IModelService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsModelService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO; -import com.nflg.wms.repository.entity.Model; +import com.nflg.wms.repository.entity.WmsModel; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -16,15 +16,15 @@ import jakarta.validation.constraints.NotNull; * @author 代码生成器生成 * @since 2025 */ -public interface IModelService extends IService { +public interface IWmsModelService extends IService { - void add(Model model); + void add(WmsModel wmsModel); - void update(Model model); + void update(WmsModel wmsModel); void delete(@Valid @NotNull Long id); void enable(@Valid EnableQO request); - IPage search(@Valid ModelSearchQO request); + IPage search(@Valid ModelSearchQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWarehouseService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java similarity index 77% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWarehouseService.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java index ae11dfb6..4ff0f2ce 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWarehouseService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.vo.WarehouseVO; -import com.nflg.wms.repository.entity.Warehouse; +import com.nflg.wms.repository.entity.WmsWarehouse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -19,11 +19,11 @@ import java.util.List; * @author 代码生成器生成 * @since 2025 */ -public interface IWarehouseService extends IService { +public interface IWmsWarehouseService extends IService { - void add(Warehouse warehouse); + void add(WmsWarehouse wmsWarehouse); - void update(Warehouse warehouse); + void update(WmsWarehouse wmsWarehouse); void delete(@Valid @NotNull Long id); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWorkbenchService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWorkbenchService.java similarity index 65% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWorkbenchService.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWorkbenchService.java index 171540c9..73aa9a0a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWorkbenchService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWorkbenchService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.ModelSearchQO; -import com.nflg.wms.repository.entity.Workbench; +import com.nflg.wms.repository.entity.WmsWorkbench; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -16,15 +16,15 @@ import jakarta.validation.constraints.NotNull; * @author 代码生成器生成 * @since 2025 */ -public interface IWorkbenchService extends IService { +public interface IWmsWorkbenchService extends IService { - void add(Workbench workbench); + void add(WmsWorkbench wmsWorkbench); - void update(Workbench workbench); + void update(WmsWorkbench wmsWorkbench); void delete(@Valid @NotNull Long id); void enable(@Valid EnableQO request); - IPage search(@Valid ModelSearchQO request); + IPage search(@Valid ModelSearchQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ModelServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ModelServiceImpl.java deleted file mode 100644 index 499450c1..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ModelServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.wms.common.pojo.qo.EnableQO; -import com.nflg.wms.common.pojo.qo.ModelSearchQO; -import com.nflg.wms.common.util.UserUtil; -import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Model; -import com.nflg.wms.repository.mapper.ModelMapper; -import com.nflg.wms.repository.service.IAuditLogService; -import com.nflg.wms.repository.service.IModelService; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.Objects; - -/** - *

- * 服务实现类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -@Service -public class ModelServiceImpl extends ServiceImpl implements IModelService { - - @Resource - private IAuditLogService auditLogService; - - @Transactional - @Override - public void add(Model model) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Model::getNo, model.getNo()).exists()).throwMessage("机型已存在"); - save(model); - auditLogService.addInsert(Model.class,model,model.getCreateBy()); - } - - @Transactional - @Override - public void update(Model model) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Model::getNo, model.getNo()).ne(Model::getId, model.getId()).exists()) - .throwMessage("机型已存在"); - Model old = getById(model.getId()); - VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机型不存在"); - updateById(model); - Model newModel = getById(model.getId()); - auditLogService.addUpdate(Model.class, old, newModel, model.getUpdateBy()); - } - - @Transactional - @Override - public void delete(Long id) { - Model old = getById(id); - removeById(id); - auditLogService.addDelete(Model.class, old, UserUtil.getUserName()); - } - - @Override - public void enable(EnableQO request) { - Model old = getById(request.getId()); - lambdaUpdate() - .set(Model::getEnable, request.getEnable()) - .set(Model::getUpdateBy, UserUtil.getUserName()) - .set(Model::getUpdateTime, LocalDateTime.now()) - .eq(Model::getId, request.getId()) - .update(); - Model newModel = getById(request.getId()); - auditLogService.addUpdate(Model.class, old, newModel, UserUtil.getUserName()); - } - - @Override - public IPage search(ModelSearchQO request) { - return lambdaQuery() - .like(StrUtil.isNotBlank(request.getNo()),Model::getNo, request.getNo()) - .orderByDesc(Model::getId) - .page(new Page<>(request.getPage(), request.getPageSize())); - } -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MaterialServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java similarity index 54% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MaterialServiceImpl.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java index ac2b3c43..28c12938 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MaterialServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.qo.MaterialSearchQO; import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Material; -import com.nflg.wms.repository.mapper.MaterialMapper; +import com.nflg.wms.repository.entity.WmsMaterial; +import com.nflg.wms.repository.mapper.WmsMaterialMapper; import com.nflg.wms.repository.service.IAuditLogService; -import com.nflg.wms.repository.service.IMaterialService; +import com.nflg.wms.repository.service.IWmsMaterialService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -24,26 +24,26 @@ import java.util.List; * @since 2025 */ @Service -public class MaterialServiceImpl extends ServiceImpl implements IMaterialService { +public class WmsMaterialServiceImpl extends ServiceImpl implements IWmsMaterialService { @Resource private IAuditLogService auditLogService; @Override - public void add(Material material) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Material::getNo, material.getNo()).exists()) + public void add(WmsMaterial wmsMaterial) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsMaterial::getNo, wmsMaterial.getNo()).exists()) .throwMessage("SAP料号已存在"); - save(material); - auditLogService.addInsert(Material.class,material,material.getCreateBy()); + save(wmsMaterial); + auditLogService.addInsert(WmsMaterial.class, wmsMaterial, wmsMaterial.getCreateBy()); } @Override - public void update(Material material) { - Material old = getById(material.getId()); - material.setNo(null); - updateById(material); - Material newMaterial = getById(material.getId()); - auditLogService.addUpdate(Material.class, old, newMaterial, material.getUpdateBy()); + public void update(WmsMaterial wmsMaterial) { + WmsMaterial old = getById(wmsMaterial.getId()); + wmsMaterial.setNo(null); + updateById(wmsMaterial); + WmsMaterial newWmsMaterial = getById(wmsMaterial.getId()); + auditLogService.addUpdate(WmsMaterial.class, old, newWmsMaterial, wmsMaterial.getUpdateBy()); } @Override @@ -57,7 +57,7 @@ public class MaterialServiceImpl extends ServiceImpl i } @Override - public List getNotSet() { + public List getNotSet() { return baseMapper.getNotSet(); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsModelServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsModelServiceImpl.java new file mode 100644 index 00000000..f630f470 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsModelServiceImpl.java @@ -0,0 +1,84 @@ +package com.nflg.wms.repository.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.qo.ModelSearchQO; +import com.nflg.wms.common.util.UserUtil; +import com.nflg.wms.common.util.VUtil; +import com.nflg.wms.repository.entity.WmsModel; +import com.nflg.wms.repository.mapper.WmsModelMapper; +import com.nflg.wms.repository.service.IAuditLogService; +import com.nflg.wms.repository.service.IWmsModelService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.Objects; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsModelServiceImpl extends ServiceImpl implements IWmsModelService { + + @Resource + private IAuditLogService auditLogService; + + @Transactional + @Override + public void add(WmsModel wmsModel) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsModel::getNo, wmsModel.getNo()).exists()).throwMessage("机型已存在"); + save(wmsModel); + auditLogService.addInsert(WmsModel.class, wmsModel, wmsModel.getCreateBy()); + } + + @Transactional + @Override + public void update(WmsModel wmsModel) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsModel::getNo, wmsModel.getNo()).ne(WmsModel::getId, wmsModel.getId()).exists()) + .throwMessage("机型已存在"); + WmsModel old = getById(wmsModel.getId()); + VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机型不存在"); + updateById(wmsModel); + WmsModel newWmsModel = getById(wmsModel.getId()); + auditLogService.addUpdate(WmsModel.class, old, newWmsModel, wmsModel.getUpdateBy()); + } + + @Transactional + @Override + public void delete(Long id) { + WmsModel old = getById(id); + removeById(id); + auditLogService.addDelete(WmsModel.class, old, UserUtil.getUserName()); + } + + @Override + public void enable(EnableQO request) { + WmsModel old = getById(request.getId()); + lambdaUpdate() + .set(WmsModel::getEnable, request.getEnable()) + .set(WmsModel::getUpdateBy, UserUtil.getUserName()) + .set(WmsModel::getUpdateTime, LocalDateTime.now()) + .eq(WmsModel::getId, request.getId()) + .update(); + WmsModel newWmsModel = getById(request.getId()); + auditLogService.addUpdate(WmsModel.class, old, newWmsModel, UserUtil.getUserName()); + } + + @Override + public IPage search(ModelSearchQO request) { + return lambdaQuery() + .like(StrUtil.isNotBlank(request.getNo()), WmsModel::getNo, request.getNo()) + .orderByDesc(WmsModel::getId) + .page(new Page<>(request.getPage(), request.getPageSize())); + } +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WarehouseServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java similarity index 54% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WarehouseServiceImpl.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java index 8b32da0b..3f5c0d46 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WarehouseServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java @@ -8,10 +8,10 @@ import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Warehouse; -import com.nflg.wms.repository.mapper.WarehouseMapper; +import com.nflg.wms.repository.entity.WmsWarehouse; +import com.nflg.wms.repository.mapper.WmsWarehouseMapper; import com.nflg.wms.repository.service.IAuditLogService; -import com.nflg.wms.repository.service.IWarehouseService; +import com.nflg.wms.repository.service.IWmsWarehouseService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,54 +29,54 @@ import java.util.Objects; * @since 2025 */ @Service -public class WarehouseServiceImpl extends ServiceImpl implements IWarehouseService { +public class WmsWarehouseServiceImpl extends ServiceImpl implements IWmsWarehouseService { @Resource private IAuditLogService auditLogService; @Transactional @Override - public void add(Warehouse warehouse) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Warehouse::getNo, warehouse.getNo()).exists()) + public void add(WmsWarehouse wmsWarehouse) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWarehouse::getNo, wmsWarehouse.getNo()).exists()) .throwMessage("仓库编码已存在"); - save(warehouse); - auditLogService.addInsert(Warehouse.class,warehouse, warehouse.getCreateBy()); + save(wmsWarehouse); + auditLogService.addInsert(WmsWarehouse.class, wmsWarehouse, wmsWarehouse.getCreateBy()); } @Transactional @Override - public void update(Warehouse warehouse) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Warehouse::getNo, warehouse.getNo()).ne(Warehouse::getId, warehouse.getId()).exists()) + public void update(WmsWarehouse wmsWarehouse) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWarehouse::getNo, wmsWarehouse.getNo()).ne(WmsWarehouse::getId, wmsWarehouse.getId()).exists()) .throwMessage("仓库编码已存在"); - Warehouse old = getById(warehouse.getId()); + WmsWarehouse old = getById(wmsWarehouse.getId()); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在"); - updateById(warehouse); - Warehouse newModel = getById(warehouse.getId()); - auditLogService.addUpdate(Warehouse.class, old, newModel, warehouse.getUpdateBy()); + updateById(wmsWarehouse); + WmsWarehouse newModel = getById(wmsWarehouse.getId()); + auditLogService.addUpdate(WmsWarehouse.class, old, newModel, wmsWarehouse.getUpdateBy()); } @Transactional @Override public void delete(Long id) { // TODO 删除仓库，判断是否绑定了储位 - Warehouse old = getById(id); + WmsWarehouse old = getById(id); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在"); removeById(id); - auditLogService.addDelete(Warehouse.class, old, UserUtil.getUserName()); + auditLogService.addDelete(WmsWarehouse.class, old, UserUtil.getUserName()); } @Override public void enable(EnableQO request) { - Warehouse old = getById(request.getId()); + WmsWarehouse old = getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("仓库不存在"); lambdaUpdate() - .set(Warehouse::getEnable, request.getEnable()) - .set(Warehouse::getUpdateBy, UserUtil.getUserName()) - .set(Warehouse::getUpdateTime, LocalDateTime.now()) - .eq(Warehouse::getId, request.getId()) + .set(WmsWarehouse::getEnable, request.getEnable()) + .set(WmsWarehouse::getUpdateBy, UserUtil.getUserName()) + .set(WmsWarehouse::getUpdateTime, LocalDateTime.now()) + .eq(WmsWarehouse::getId, request.getId()) .update(); - Warehouse newModel = getById(request.getId()); - auditLogService.addUpdate(Warehouse.class, old, newModel, UserUtil.getUserName()); + WmsWarehouse newModel = getById(request.getId()); + auditLogService.addUpdate(WmsWarehouse.class, old, newModel, UserUtil.getUserName()); } @Override diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWorkbenchServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWorkbenchServiceImpl.java new file mode 100644 index 00000000..0b955971 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWorkbenchServiceImpl.java @@ -0,0 +1,84 @@ +package com.nflg.wms.repository.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.qo.ModelSearchQO; +import com.nflg.wms.common.util.UserUtil; +import com.nflg.wms.common.util.VUtil; +import com.nflg.wms.repository.entity.WmsWorkbench; +import com.nflg.wms.repository.mapper.WmsWorkbenchMapper; +import com.nflg.wms.repository.service.IAuditLogService; +import com.nflg.wms.repository.service.IWmsWorkbenchService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.Objects; + +/** + *

+ * 机台 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsWorkbenchServiceImpl extends ServiceImpl implements IWmsWorkbenchService { + + @Resource + private IAuditLogService auditLogService; + + @Transactional + @Override + public void add(WmsWorkbench wmsWorkbench) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWorkbench::getNo, wmsWorkbench.getNo()).exists()).throwMessage("机台已存在"); + save(wmsWorkbench); + auditLogService.addInsert(WmsWorkbench.class, wmsWorkbench, wmsWorkbench.getCreateBy()); + } + + @Transactional + @Override + public void update(WmsWorkbench wmsWorkbench) { + VUtil.trueThrowBusinessError(lambdaQuery().eq(WmsWorkbench::getNo, wmsWorkbench.getNo()).ne(WmsWorkbench::getId, wmsWorkbench.getId()).exists()) + .throwMessage("机型已存在"); + WmsWorkbench old = getById(wmsWorkbench.getId()); + VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机台不存在"); + updateById(wmsWorkbench); + WmsWorkbench ninfo = getById(wmsWorkbench.getId()); + auditLogService.addUpdate(WmsWorkbench.class, old, ninfo, wmsWorkbench.getUpdateBy()); + } + + @Transactional + @Override + public void delete(Long id) { + WmsWorkbench old = getById(id); + removeById(id); + auditLogService.addDelete(WmsWorkbench.class, old, UserUtil.getUserName()); + } + + @Override + public void enable(EnableQO request) { + WmsWorkbench old = getById(request.getId()); + lambdaUpdate() + .set(WmsWorkbench::getEnable, request.getEnable()) + .set(WmsWorkbench::getUpdateBy, UserUtil.getUserName()) + .set(WmsWorkbench::getUpdateTime, LocalDateTime.now()) + .eq(WmsWorkbench::getId, request.getId()) + .update(); + WmsWorkbench newModel = getById(request.getId()); + auditLogService.addUpdate(WmsWorkbench.class, old, newModel, UserUtil.getUserName()); + } + + @Override + public IPage search(ModelSearchQO request) { + return lambdaQuery() + .like(StrUtil.isNotBlank(request.getNo()), WmsWorkbench::getNo, request.getNo()) + .orderByDesc(WmsWorkbench::getId) + .page(new Page<>(request.getPage(), request.getPageSize())); + } +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WorkbenchServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WorkbenchServiceImpl.java deleted file mode 100644 index 2255cb1e..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WorkbenchServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.wms.common.pojo.qo.EnableQO; -import com.nflg.wms.common.pojo.qo.ModelSearchQO; -import com.nflg.wms.common.util.UserUtil; -import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.Workbench; -import com.nflg.wms.repository.mapper.WorkbenchMapper; -import com.nflg.wms.repository.service.IAuditLogService; -import com.nflg.wms.repository.service.IWorkbenchService; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.Objects; - -/** - *

- * 机台 服务实现类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -@Service -public class WorkbenchServiceImpl extends ServiceImpl implements IWorkbenchService { - - @Resource - private IAuditLogService auditLogService; - - @Transactional - @Override - public void add(Workbench workbench) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Workbench::getNo, workbench.getNo()).exists()).throwMessage("机台已存在"); - save(workbench); - auditLogService.addInsert(Workbench.class,workbench,workbench.getCreateBy()); - } - - @Transactional - @Override - public void update(Workbench workbench) { - VUtil.trueThrowBusinessError(lambdaQuery().eq(Workbench::getNo, workbench.getNo()).ne(Workbench::getId, workbench.getId()).exists()) - .throwMessage("机型已存在"); - Workbench old = getById(workbench.getId()); - VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("机台不存在"); - updateById(workbench); - Workbench ninfo = getById(workbench.getId()); - auditLogService.addUpdate(Workbench.class, old, ninfo, workbench.getUpdateBy()); - } - - @Transactional - @Override - public void delete(Long id) { - Workbench old = getById(id); - removeById(id); - auditLogService.addDelete(Workbench.class, old, UserUtil.getUserName()); - } - - @Override - public void enable(EnableQO request) { - Workbench old = getById(request.getId()); - lambdaUpdate() - .set(Workbench::getEnable, request.getEnable()) - .set(Workbench::getUpdateBy, UserUtil.getUserName()) - .set(Workbench::getUpdateTime, LocalDateTime.now()) - .eq(Workbench::getId, request.getId()) - .update(); - Workbench newModel = getById(request.getId()); - auditLogService.addUpdate(Workbench.class, old, newModel, UserUtil.getUserName()); - } - - @Override - public IPage search(ModelSearchQO request) { - return lambdaQuery() - .like(StrUtil.isNotBlank(request.getNo()),Workbench::getNo, request.getNo()) - .orderByDesc(Workbench::getId) - .page(new Page<>(request.getPage(), request.getPageSize())); - } -} diff --git a/nflg-wms-repository/src/main/resources/mapper/MaterialMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsMaterialMapper.xml similarity index 84% rename from nflg-wms-repository/src/main/resources/mapper/MaterialMapper.xml rename to nflg-wms-repository/src/main/resources/mapper/WmsMaterialMapper.xml index 2479ca39..029b5e74 100644 --- a/nflg-wms-repository/src/main/resources/mapper/MaterialMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsMaterialMapper.xml @@ -1,10 +1,10 @@ - + select * - from material + from wms_material where no=#{no} order by id desc - SELECT * FROM ( SELECT DISTINCT ON ("no") * - FROM material + FROM wms_material ORDER BY "no", id DESC ) t where image is null or weight is null diff --git a/nflg-wms-repository/src/main/resources/mapper/ModelMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsModelMapper.xml similarity index 70% rename from nflg-wms-repository/src/main/resources/mapper/ModelMapper.xml rename to nflg-wms-repository/src/main/resources/mapper/WmsModelMapper.xml index 3c4bd9ea..25a30022 100644 --- a/nflg-wms-repository/src/main/resources/mapper/ModelMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsModelMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nflg-wms-repository/src/main/resources/mapper/WarehouseMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml similarity index 88% rename from nflg-wms-repository/src/main/resources/mapper/WarehouseMapper.xml rename to nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml index 20989c1a..c67ebd66 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WarehouseMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml @@ -1,10 +1,10 @@ - + select w.*,di.name as factory_name - from warehouse w + from wms_warehouse w left join dictionary_item di on w.factory_id=di.id where w.id in diff --git a/nflg-wms-repository/src/main/resources/mapper/WorkbenchMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsWorkbenchMapper.xml similarity index 68% rename from nflg-wms-repository/src/main/resources/mapper/WorkbenchMapper.xml rename to nflg-wms-repository/src/main/resources/mapper/WmsWorkbenchMapper.xml index 89715178..45dadbdf 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WorkbenchMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsWorkbenchMapper.xml @@ -1,5 +1,5 @@ - +