From 97b71a1e8cd396f3ad622a6b54c0f8b793418cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Wed, 14 Jan 2026 15:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataobject/base/MaterialDestroyDO.java | 70 +++++++++---------- .../base/service/base/ElementServiceImpl.java | 10 +-- .../base/MaterialDestroyServiceImpl.java | 3 + .../module/erp/enums/ErrorCodeConstants.java | 2 +- .../admin/erp/ErpMaterialController.java | 8 +-- .../InternalWarehouseMapper.java | 5 ++ .../erp/service/erp/ErpMaterialService.java | 2 +- .../service/erp/ErpMaterialServiceImpl.java | 4 +- .../InternalWarehouseServiceImpl.java | 12 ++++ 9 files changed, 68 insertions(+), 48 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java index 1ddba897..2b8cebd4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java @@ -58,41 +58,41 @@ public class MaterialDestroyDO extends BusinessBaseDO { */ @TableField("OPTN") private String operation; - /** - * 公司编号 - */ - @TableField("COMPANY_ID") - private Long companyId; - /** - * 公司名称 - */ - @TableField("COMPANY_NAME") - private String companyName; - /** - * 部门编号 - */ - @TableField("DEPT_ID") - private Long deptId; - /** - * 部门名称 - */ - @TableField("DEPT_NAME") - private String deptName; - /** - * 岗位编号 - */ - @TableField("POST_ID") - private Long postId; - /** - * 创建人名称 - */ - @TableField("CREATOR_NAME") - private String creatorName; - /** - * 更新人名称 - */ - @TableField("UPDATER_NAME") - private String updaterName; +// /** +// * 公司编号 +// */ +// @TableField("COMPANY_ID") +// private Long companyId; +// /** +// * 公司名称 +// */ +// @TableField("COMPANY_NAME") +// private String companyName; +// /** +// * 部门编号 +// */ +// @TableField("DEPT_ID") +// private Long deptId; +// /** +// * 部门名称 +// */ +// @TableField("DEPT_NAME") +// private String deptName; +// /** +// * 岗位编号 +// */ +// @TableField("POST_ID") +// private Long postId; +// /** +// * 创建人名称 +// */ +// @TableField("CREATOR_NAME") +// private String creatorName; +// /** +// * 更新人名称 +// */ +// @TableField("UPDATER_NAME") +// private String updaterName; /** * 供应商编码 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java index 2a57bb29..81f266ef 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java @@ -37,7 +37,7 @@ public class ElementServiceImpl implements ElementService { // 插入 ElementDO element = BeanUtils.toBean(createReqVO, ElementDO.class); // 校验存在 - validateElementCodeExists(createReqVO.getAbbreviation()); + validateElementCodeExists(createReqVO.getAbbreviation(),"insert",null); //金属编码自动生成，格式 JSYS-00001,依次新增 String maxCode = elementMapper.selectMaxCode(); if (maxCode == null) { @@ -59,7 +59,7 @@ public class ElementServiceImpl implements ElementService { // 校验存在 validateElementExists(updateReqVO.getId()); // 校验存在 - validateElementCodeExists(updateReqVO.getAbbreviation()); + validateElementCodeExists(updateReqVO.getAbbreviation(),"update",updateReqVO.getId()); // 更新 ElementDO updateObj = BeanUtils.toBean(updateReqVO, ElementDO.class); elementMapper.updateById(updateObj); @@ -94,9 +94,11 @@ public class ElementServiceImpl implements ElementService { } } - private void validateElementCodeExists(String code) { + private void validateElementCodeExists(String code,String type,Long id) { ElementDO elementDO = elementMapper.getElementName(code); - if (elementDO != null) { + if (elementDO != null&&type.equals("insert")) { + throw exception(ELEMENT_EXISTS); + }else if (elementDO != null&&type.equals("update")&& !elementDO.getId().equals(id)) { throw exception(ELEMENT_EXISTS); } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java index 2f81e775..09c989a5 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java @@ -34,6 +34,9 @@ public class MaterialDestroyServiceImpl implements MaterialDestroyService { public MaterialDestroyRespVO createMaterialDestroy(MaterialDestroySaveReqVO createReqVO) { // 插入 MaterialDestroyDO materialDestroy = BeanUtils.toBean(createReqVO, MaterialDestroyDO.class); + if (materialDestroy.getIsEnable()==null||materialDestroy.getIsEnable().isEmpty()) { + materialDestroy.setIsEnable("1"); + } materialDestroyMapper.insert(materialDestroy); // 返回 return BeanUtils.toBean(materialDestroy, MaterialDestroyRespVO.class); diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java index 6e64ccbf..dd799267 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java @@ -59,6 +59,6 @@ public interface ErrorCodeConstants { ErrorCode MATERIAL_ERROR = new ErrorCode( 1_017_000_009, "主物料信息错误"); ErrorCode INTERNAL_WAREHOUSE_NOT_EXISTS= new ErrorCode(1_017_000_011,"内部仓库不存在"); - + ErrorCode INTERNAL_WAREHOUSE_EXISTS=new ErrorCode(1_017_000_012,"内部仓库已存在"); ErrorCode WAREHOUSE_FACTORY_NOT_EXISTS=new ErrorCode(1_017_000_010,"库位与工厂信息不存在"); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java index 27cc7a5d..905779c0 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java @@ -155,17 +155,15 @@ public class ErpMaterialController { @PostMapping("/api-erp-material") @Operation(summary = "通过接口查询物料") @PreAuthorize("@ss.hasPermission('sply:erp-material:query')") - public CommonResult> getErpMaterialByApi(@RequestBody MaterialInfomationApiVO vo) { + public CommonResult> getErpMaterialByApi(@RequestBody MaterialInfomationApiVO vo) { MaterialInfomationPageReqDTO material = new MaterialInfomationPageReqDTO(); material.setCode(vo.getMaterialNumber()); material.setName(vo.getMaterialName()); material.setPageSize(vo.getPageSize()); material.setPageNo(vo.getPageNo()); - List erpMaterial = erpMaterialService.getErpMaterialByApi(material); - return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class)); + PageResult erpMaterialByApi = erpMaterialService.getErpMaterialByApi(material); + return success(BeanUtils.toBean(erpMaterialByApi, ErpMaterialRespVO.class)); } - - //通过主物料查询子物料信息 @GetMapping("/erpMaterial-mainMaterial-code") @Operation(summary = "通过主物料编号查询子物料信息") diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java index 2db832cb..fb99b541 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java @@ -6,9 +6,11 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.framework.tenant.core.aop.TenantIgnore; import com.zt.plat.module.erp.controller.admin.erp.internalwarehouse.vo.InternalWarehousePageReqVO; import com.zt.plat.module.erp.dal.dataobject.erp.internalwarehouse.InternalWarehouseDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** @@ -33,5 +35,8 @@ public interface InternalWarehouseMapper extends BaseMapperX getErpMaterialByMainMaterial(Long mainMaterialId); - List getErpMaterialByApi( MaterialInfomationPageReqDTO material); + PageResult getErpMaterialByApi( MaterialInfomationPageReqDTO material); ErpMaterialDO getErpMaterialByMainMaterialByCode(String code); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index df748aac..2ffa312d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -279,7 +279,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { } @Override - public List getErpMaterialByApi(MaterialInfomationPageReqDTO material) { + public PageResult getErpMaterialByApi(MaterialInfomationPageReqDTO material) { CommonResult> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(material); List erpMaterialDOList = new ArrayList<>(); if (materialInfomationPage.getData() != null && materialInfomationPage.getData().getList() != null && !materialInfomationPage.getData().getList().isEmpty()) { @@ -290,7 +290,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { } ); } - return erpMaterialDOList; + return new PageResult<>(erpMaterialDOList, materialInfomationPage.getData().getTotal()); } @Override diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java index 1a7f9a31..8961bac5 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java @@ -1,6 +1,8 @@ package com.zt.plat.module.erp.service.erp.internalwarehouse; import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.tenant.core.aop.TenantIgnore; import com.zt.plat.module.erp.controller.admin.erp.internalwarehouse.vo.InternalWarehouseEnableDisableReqVO; import com.zt.plat.module.erp.controller.admin.erp.internalwarehouse.vo.InternalWarehousePageReqVO; import com.zt.plat.module.erp.controller.admin.erp.internalwarehouse.vo.InternalWarehouseRespVO; @@ -23,6 +25,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.erp.enums.ErrorCodeConstants.INTERNAL_WAREHOUSE_EXISTS; import static com.zt.plat.module.erp.enums.ErrorCodeConstants.INTERNAL_WAREHOUSE_NOT_EXISTS; @@ -42,11 +45,20 @@ public class InternalWarehouseServiceImpl implements InternalWarehouseService { public InternalWarehouseRespVO createInternalWarehouse(InternalWarehouseSaveReqVO createReqVO) { // 插入 InternalWarehouseDO internalWarehouse = BeanUtils.toBean(createReqVO, InternalWarehouseDO.class); + //校验所绑定的库位是否已经存在 + validateInternalWarehouseExists(createReqVO.getNumber()); internalWarehouseMapper.insert(internalWarehouse); // 返回 return BeanUtils.toBean(internalWarehouse, InternalWarehouseRespVO.class); } + + public void validateInternalWarehouseExists(String number){ + if (internalWarehouseMapper.selectCountByNumber(number)>0) { + throw exception(INTERNAL_WAREHOUSE_EXISTS); + } + + } @Override public void updateInternalWarehouse(InternalWarehouseSaveReqVO updateReqVO) { // 校验存在