Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,8 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.convert.itembasic.ItembasicConvert;
@@ -20,6 +22,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -105,15 +108,6 @@ public class ItembasicController {
         return success(ItembasicConvert.INSTANCE.convert(itembasic));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得物品基本信息列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
-    public CommonResult<List<ItembasicRespVO>> getItembasicList(@RequestParam("ids") Collection<Long> ids) {
-        List<ItembasicDO> list = itembasicService.getItembasicList(ids);
-        return success(ItembasicConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得物品基本信息分页")
     @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
@@ -149,21 +143,28 @@ public class ItembasicController {
     public void exportItembasicExcel(@Valid ItembasicExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ItembasicDO> list = itembasicService.getItembasicList(exportReqVO);
-        // 导出 Excel
-        List<ItembasicExcelVO> datas = ItembasicConvert.INSTANCE.convertList02(list);
-        for(ItembasicExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ItembasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown);
+    }
+
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出物品基本信息 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
+    @OperateLog(type = EXPORT)
+    public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ItembasicDO> list = itembasicService.getItembasicList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ItembasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ItembasicExcelVO> getExcelVo(List<ItembasicDO> list, Map<Integer, String[]> mapDropDown) {
         String[] status = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS);
         mapDropDown.put(4, status);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
         mapDropDown.put(5, uom);
         String[] altUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
         mapDropDown.put(6, altUom);
-        mapDropDown.put(6, altUom);
         String[] isStdPack = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(7, isStdPack);
         String[] enableBuy = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
@@ -192,8 +193,16 @@ public class ItembasicController {
         mapDropDown.put(20, eqLevel);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(22, available);
-        ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<ItembasicExcelVO> resultList = ItembasicConvert.INSTANCE.convertList02(list);
+        for(ItembasicExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入物品基本信息模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

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

@@ -94,4 +94,8 @@ public interface ItembasicMapper extends BaseMapperX<ItembasicDO> {
                 .orderByDesc(ItembasicDO::getId));
     }
 
+    default List<ItembasicDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
+
 }

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

@@ -56,10 +56,10 @@ public interface ItembasicService {
     /**
      * 获得物品基本信息列表
      *
-     * @param ids 编号
+     * @param conditions 条件
      * @return 物品基本信息列表
      */
-    List<ItembasicDO> getItembasicList(Collection<Long> ids);
+    List<ItembasicDO> getItembasicList(CustomConditions conditions);
 
     /**
      * 获得物品基本信息分页

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

@@ -89,8 +89,8 @@ public class ItembasicServiceImpl implements ItembasicService {
     }
 
     @Override
-    public List<ItembasicDO> getItembasicList(Collection<Long> ids) {
-        return itembasicMapper.selectBatchIds(ids);
+    public List<ItembasicDO> getItembasicList(CustomConditions conditions) {
+        return itembasicMapper.selectSeniorList(conditions);
     }
 
     @Override