物品基础信息增加高级查询接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@@ -2,6 +2,7 @@ package com.win.module.wms.controller.itembasic;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
@@ -129,6 +130,19 @@ public class ItembasicController {
         return success(result);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<ItembasicRespVO>> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ItembasicDO> pageResult = itembasicService.getItembasicSenior(conditions);
+        PageResult<ItembasicRespVO> result = ItembasicConvert.INSTANCE.convertPage(pageResult);
+        for(ItembasicRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
 
     @GetMapping("/export-excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.itembasic;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.itembasic.vo.ItembasicExportReqVO;
 import com.win.module.wms.controller.itembasic.vo.ItembasicPageReqVO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
@@ -55,6 +57,10 @@ public interface ItembasicMapper extends BaseMapperX<ItembasicDO> {
                 .orderByDesc(ItembasicDO::getId));
     }
 
+    default PageResult<ItembasicDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ItembasicDO> selectList(ItembasicExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ItembasicDO>()
                 .eqIfPresent(ItembasicDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.service.itembasic;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
@@ -68,6 +69,14 @@ public interface ItembasicService {
      */
     PageResult<ItembasicDO> getItembasicPage(ItembasicPageReqVO pageReqVO);
 
+    /**
+     * 获得用高级搜索户分页列表
+     *
+     * @param conditions 分页、排序和自定义条件
+     * @return 分页列表
+     */
+    PageResult<ItembasicDO> getItembasicSenior(CustomConditions conditions);
+
     /**
      * 获得物品基本信息列表, 用于 Excel 导出
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.win.framework.common.exception.ServiceException;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.datapermission.core.util.DataPermissionUtils;
 import com.win.module.infra.api.trends.TrendsApi;
@@ -101,6 +102,11 @@ public class ItembasicServiceImpl implements ItembasicService {
         return itembasicMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<ItembasicDO> getItembasicSenior(CustomConditions conditions) {
+        return itembasicMapper.selectSenior(conditions);
+    }
+
     @Override
     public List<ItembasicDO> getItembasicList(ItembasicExportReqVO exportReqVO) {
         return itembasicMapper.selectList(exportReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java

@@ -88,11 +88,11 @@ public interface RuleService {
     /**
      * 获取检验策略
      *
-     * @param supplierType 供应商类型
+     * @param supplierCode 供应商类型
      * @param itemCode     物品代码
      * @return
      */
-    RuleRespVO inspect(String supplierType, String itemCode);
+    RuleRespVO inspect(String supplierCode, String itemCode);
 
     /**
      * 获取到货检验任务拆分策略

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -158,7 +158,7 @@ public class RuleServiceImpl implements RuleService {
     }
 
     @Override
-    public RuleRespVO inspect(String supplierType, String itemCode) {
+    public RuleRespVO inspect(String supplierCode, String itemCode) {
         QueryWrapper<RuleDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("strategy_code", "S003");
         queryWrapper.orderByDesc("priority");
@@ -170,7 +170,7 @@ public class RuleServiceImpl implements RuleService {
             }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
-            params.put("SupplierType", supplierType);
+            params.put("SupplierCode", supplierCode);
             params.put("ItemCode", itemCode);
             if(this.forEachParams(params, conditionArray)) {
                 return RuleConvert.INSTANCE.convert(ruleDO);