供应商管理导出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java

@@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.purchaseprice.vo.*;
 import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceRespVO;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert;
 import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.purchaseprice.PurchasepriceService;
@@ -91,14 +94,6 @@ public class PurchasepriceController {
         return success(PurchasepriceConvert.INSTANCE.convert(purchaseprice));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得采购价格单列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:purchaseprice:query')")
-    public CommonResult<List<PurchasepriceRespVO>> getPurchasepriceList(@RequestParam("ids") Collection<Long> ids) {
-        List<PurchasepriceDO> list = purchasepriceService.getPurchasepriceList(ids);
-        return success(PurchasepriceConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得采购价格单分页")
@@ -121,18 +116,33 @@ public class PurchasepriceController {
     public void exportPurchasepriceExcel(@Valid PurchasepriceExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<PurchasepriceDO> list = purchasepriceService.getPurchasepriceList(exportReqVO);
-        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
-        List<PurchasepriceExcelVO> datas = PurchasepriceConvert.INSTANCE.convertList02(list);
+        List<PurchasepriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        for(PurchasepriceExcelVO vo : datas) {
+        ExcelUtils.write(response, "采购价格单.xlsx", "数据",PurchasepriceExcelVO.class, resultList, mapDropDown);
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+    }
-            //后端创建个字段作为前端展示的虚拟字段
+    @PostMapping("/export-excel-senior")
-            vo.setCreator(user.getNickname());
+    @Operation(summary = "导出采购价格单 Excel")
-        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+    @PreAuthorize("@ss.hasPermission('wms:purchaseprice:export')")
+    @OperateLog(type = EXPORT)
+    public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<PurchasepriceDO> list = purchasepriceService.getPurchasepriceList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<PurchasepriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "采购价格单.xlsx", "数据",PurchasepriceExcelVO.class, resultList, mapDropDown);
+    }
+    private List<PurchasepriceExcelVO> getExcelVo(List<PurchasepriceDO> list, Map<Integer, String[]> mapDropDown) {
         String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
         mapDropDown.put(2, currency);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(4, available);
-        ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<PurchasepriceExcelVO> resultList = PurchasepriceConvert.INSTANCE.convertList02(list);
+        for(PurchasepriceExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入采购价格单模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java

@@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO;
 import com.win.module.wms.controller.supplier.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
 import com.win.module.wms.convert.supplier.SupplierConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.supplier.SupplierService;
@@ -121,20 +124,35 @@ public class SupplierController {
     public void exportSupplierExcel(@Valid SupplierExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<SupplierDO> list = supplierService.getSupplierList(exportReqVO);
-        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
-        List<SupplierExcelVO> datas = SupplierConvert.INSTANCE.convertList02(list);
+        List<SupplierExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        for(SupplierExcelVO vo : datas) {
+        ExcelUtils.write(response, "供应商.xlsx", "数据", SupplierExcelVO.class, resultList, mapDropDown);
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+    }
-            //后端创建个字段作为前端展示的虚拟字段
+    @PostMapping("/export-excel-senior")
-            vo.setCreator(user.getNickname());
+    @Operation(summary = "导出供应商 Excel")
-        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+    @PreAuthorize("@ss.hasPermission('wms:supplier:export')")
+    @OperateLog(type = EXPORT)
+    public void exportSupplierExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<SupplierDO> list = supplierService.getSupplierList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<SupplierExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "供应商.xlsx", "数据", SupplierExcelVO.class, resultList, mapDropDown);
+    }
+    private List<SupplierExcelVO> getExcelVo(List<SupplierDO> list, Map<Integer, String[]> mapDropDown) {
         String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
         mapDropDown.put(11, currency);
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE);
         mapDropDown.put(13, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(14, available);
-        ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<SupplierExcelVO> resultList = SupplierConvert.INSTANCE.convertList02(list);
+        for(SupplierExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入供应商模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java

@@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.purchaseprice.vo.PurchasepriceRespVO;
 import com.win.module.wms.controller.supplieritem.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert;
 import com.win.module.wms.convert.supplieritem.SupplieritemConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
@@ -80,14 +83,6 @@ public class SupplieritemController {
         return success(SupplieritemConvert.INSTANCE.convert(supplieritem));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得供应商物品列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')")
-    public CommonResult<List<SupplieritemRespVO>> getSupplieritemList(@RequestParam("ids") Collection<Long> ids) {
-        List<SupplieritemDO> list = supplieritemService.getSupplieritemList(ids);
-        return success(SupplieritemConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得供应商物品分页")
@@ -123,13 +118,21 @@ public class SupplieritemController {
     public void exportSupplieritemExcel(@Valid SupplieritemExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<SupplieritemDO> list = supplieritemService.getSupplieritemList(exportReqVO);
-        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
-        List<SupplieritemExcelVO> datas = SupplieritemConvert.INSTANCE.convertList02(list);
+        List<SupplieritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        for(SupplieritemExcelVO vo : datas) {
+        ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown);
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+    }
-            //后端创建个字段作为前端展示的虚拟字段
+    @PostMapping("/export-excel-senior")
-            vo.setCreator(user.getNickname());
+    @Operation(summary = "导出供应商物品 Excel")
-        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+    @PreAuthorize("@ss.hasPermission('wms:supplieritem:export')")
+    @OperateLog(type = EXPORT)
+    public void exportSupplieritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<SupplieritemDO> list = supplieritemService.getSupplieritemList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<SupplieritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown);
+    }
+    private List<SupplieritemExcelVO> getExcelVo(List<SupplieritemDO> list, Map<Integer, String[]> mapDropDown) {
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(13, available);
         String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
@@ -140,9 +143,15 @@ public class SupplieritemController {
         mapDropDown.put(7, altPackUnit);
         String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE);
         mapDropDown.put(12, settlementType);
-        ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<SupplieritemExcelVO> resultList = SupplieritemConvert.INSTANCE.convertList02(list);
+        for(SupplieritemExcelVO 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/purchaseprice/PurchasepriceMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.purchaseprice.vo.PurchasepriceExportReqVO;
 import com.win.module.wms.controller.purchaseprice.vo.PurchasepricePageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -53,4 +54,7 @@ public interface PurchasepriceMapper extends BaseMapperX<PurchasepriceDO> {
     }
 
     default PurchasepriceDO selectByItemCode(String itemCode){return selectOne(PurchasepriceDO::getItemCode,itemCode);};
+    default List<PurchasepriceDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.supplier.vo.SupplierExportReqVO;
 import com.win.module.wms.controller.supplier.vo.SupplierPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -74,5 +75,8 @@ public interface SupplierMapper extends BaseMapperX<SupplierDO> {
                 .eqIfPresent(SupplierDO::getCreator, reqVO.getCreator())
                 .orderByDesc(SupplierDO::getId));
     }
+    default List<SupplierDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.supplieritem.vo.SupplieritemExportReqVO;
 import com.win.module.wms.controller.supplieritem.vo.SupplieritemPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -75,4 +76,7 @@ public interface SupplieritemMapper extends BaseMapperX<SupplieritemDO> {
     }
 
     default SupplieritemDO selectByItemcodeCode(String itemcode){return selectOne(SupplieritemDO::getItemCode,itemcode);}
+    default List<SupplieritemDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java

@@ -61,7 +61,7 @@ public interface PurchasepriceService {
      * @param ids 编号
      * @return 采购价格单列表
      */
-    List<PurchasepriceDO> getPurchasepriceList(Collection<Long> ids);
+    List<PurchasepriceDO> getPurchasepriceList(CustomConditions conditions);
 
     /**
      * 获得采购价格单分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java

@@ -75,8 +75,8 @@ public class PurchasepriceServiceImpl implements PurchasepriceService {
     }
 
     @Override
-    public List<PurchasepriceDO> getPurchasepriceList(Collection<Long> ids) {
+    public List<PurchasepriceDO> getPurchasepriceList(CustomConditions conditions) {
-        return purchasepriceMapper.selectBatchIds(ids);
+        return purchasepriceMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java

@@ -57,7 +57,7 @@ public interface SupplierService {
      * @param ids 编号
      * @return 供应商列表
      */
-    List<SupplierDO> getSupplierList(Collection<Long> ids);
+    List<SupplierDO> getSupplierList(CustomConditions conditions);
 
     /**
      * 获得供应商分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java

@@ -72,8 +72,8 @@ public class SupplierServiceImpl implements SupplierService {
     }
 
     @Override
-    public List<SupplierDO> getSupplierList(Collection<Long> ids) {
+    public List<SupplierDO> getSupplierList(CustomConditions conditions) {
-        return supplierMapper.selectBatchIds(ids);
+        return supplierMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java

@@ -63,7 +63,7 @@ public interface SupplieritemService {
      * @param ids 编号
      * @return 供应商物品列表
      */
-    List<SupplieritemDO> getSupplieritemList(Collection<Long> ids);
+    List<SupplieritemDO> getSupplieritemList(CustomConditions conditions);
 
     /**
      * 获得供应商物品分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java

@@ -78,8 +78,8 @@ public class SupplieritemServiceImpl implements SupplieritemService {
     }
 
     @Override
-    public List<SupplieritemDO> getSupplieritemList(Collection<Long> ids) {
+    public List<SupplieritemDO> getSupplieritemList(CustomConditions conditions) {
-        return supplieritemMapper.selectBatchIds(ids);
+        return supplieritemMapper.selectSeniorList(conditions);
     }
 
     @Override