企业管理高级搜索

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -957,5 +957,7 @@ public interface ErrorCodeConstants {
     ErrorCode  BARBASIC_NOT_EXISTS = new ErrorCode(1_000_303_000, "条码实体基类不存在");
 
     ErrorCode  BARBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_303_001, "条码实体列表不存在");
+
+    ErrorCode  ENTERPRISE_EXISTS = new ErrorCode(1_000_303_001, "企业已存在");
 }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/enterprise/EnterpriseController.java

@@ -1,6 +1,12 @@
 package com.win.module.wms.controller.enterprise;
 
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.bom.vo.BomRespVO;
 import com.win.module.wms.controller.enterprise.vo.*;
+import com.win.module.wms.convert.bom.BomConvert;
+import com.win.module.wms.dal.dataobject.bom.BomDO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -36,6 +42,9 @@ public class EnterpriseController {
     @Resource
     private EnterpriseService enterpriseService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建企业")
     @PreAuthorize("@ss.hasPermission('wms:enterprise:create')")
@@ -60,6 +69,21 @@ public class EnterpriseController {
         return success(true);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物料清单分页")
+    @PreAuthorize("@ss.hasPermission('wms:enterprise:query')")
+    public CommonResult<PageResult<EnterpriseRespVO>> getEnterpriseSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterpriseSenior(conditions);
+        PageResult<EnterpriseRespVO> result = EnterpriseConvert.INSTANCE.convertPage(pageResult);
+        for(EnterpriseRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
     @GetMapping("/get")
     @Operation(summary = "获得企业")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/enterprise/vo/EnterpriseRespVO.java

@@ -16,4 +16,7 @@ public class EnterpriseRespVO extends EnterpriseBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/enterprise/EnterpriseDO.java

@@ -82,4 +82,5 @@ public class EnterpriseDO extends BaseDO {
      */
     private String siteId;
 
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/enterprise/EnterpriseMapper.java

@@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.enterprise;
 
 import java.util.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseExportReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterprisePageReqVO;
+import com.win.module.wms.dal.dataobject.bom.BomDO;
 import com.win.module.wms.dal.dataobject.enterprise.EnterpriseDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -37,6 +40,10 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
                 .orderByDesc(EnterpriseDO::getId));
     }
 
+    default PageResult<EnterpriseDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<EnterpriseDO> selectList(EnterpriseExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<EnterpriseDO>()
                 .eqIfPresent(EnterpriseDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/enterprise/EnterpriseService.java

@@ -3,10 +3,12 @@ package com.win.module.wms.service.enterprise;
 import java.util.*;
 import javax.validation.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseCreateReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseExportReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterprisePageReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseUpdateReqVO;
+import com.win.module.wms.dal.dataobject.bom.BomDO;
 import com.win.module.wms.dal.dataobject.enterprise.EnterpriseDO;
 import com.win.framework.common.pojo.PageResult;
 
@@ -71,4 +73,16 @@ public interface EnterpriseService {
      */
     List<EnterpriseDO> getEnterpriseList(EnterpriseExportReqVO exportReqVO);
 
+    /**
+     * 获得用高级搜索物品清单分页列表
+     *
+     * @param conditions 分页、排序和自定义条件
+     * @return 分页列表
+     */
+    PageResult<EnterpriseDO> getEnterpriseSenior(CustomConditions conditions);
+
+
+
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/enterprise/EnterpriseServiceImpl.java

@@ -1,9 +1,12 @@
 package com.win.module.wms.service.enterprise;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseCreateReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseExportReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterprisePageReqVO;
 import com.win.module.wms.controller.enterprise.vo.EnterpriseUpdateReqVO;
+import com.win.module.wms.dal.dataobject.bom.BomDO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -35,6 +38,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     public Long createEnterprise(EnterpriseCreateReqVO createReqVO) {
         // 插入
         EnterpriseDO enterprise = EnterpriseConvert.INSTANCE.convert(createReqVO);
+        EnterpriseDO enterpriseDO  = existEnterprise(enterprise.getCode());
+        existEnterprise(enterpriseDO);
         enterpriseMapper.insert(enterprise);
         // 返回
         return enterprise.getId();
@@ -57,6 +62,21 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterpriseMapper.deleteById(id);
     }
 
+    public void existEnterprise(EnterpriseDO enterpriseDO){
+        if(enterpriseDO!=null){
+            throw exception(ENTERPRISE_EXISTS);
+        }
+    }
+
+    public  EnterpriseDO existEnterprise(String code){
+        QueryWrapper<EnterpriseDO> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("code",code);
+        EnterpriseDO enterpriseDO = enterpriseMapper.selectOne(queryWrapper);
+        return enterpriseDO;
+
+    }
+
+
     private void validateEnterpriseExists(Long id) {
         if (enterpriseMapper.selectById(id) == null) {
             throw exception(ENTERPRISE_NOT_EXISTS);
@@ -83,4 +103,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         return enterpriseMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public PageResult<EnterpriseDO> getEnterpriseSenior(CustomConditions conditions){
+        return enterpriseMapper.selectSenior(conditions);
+    }
+
 }