仓库导出修改

liweidong
wusiyu 2 days ago
parent d26e971be8
commit f69288eba3
  1. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java
  2. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java
  3. 4
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java

@ -1,6 +1,5 @@
package org.springblade.wms.controller; package org.springblade.wms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
@ -124,7 +123,7 @@ public class StGoodsExtController extends BladeController {
@ApiLog("导出数据") @ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stGoodsExt") @Operation(summary = "导出数据", description = "传入stGoodsExt")
public void exportStGoodsExt(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsExt, BladeUser bladeUser, HttpServletResponse response) { public void exportStGoodsExt(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsExt, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGoodsExt> queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class); // QueryWrapper<StGoodsExt> queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class);
//if (!AuthUtil.isAdministrator()) { //if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(StGoodsExt::getTenantId, bladeUser.getTenantId()); // queryWrapper.lambda().eq(StGoodsExt::getTenantId, bladeUser.getTenantId());
//} //}

@ -9,6 +9,7 @@ import org.springblade.wms.pojo.entity.StGoodsExt;
import org.springblade.wms.pojo.vo.StGoodsExtVO; import org.springblade.wms.pojo.vo.StGoodsExtVO;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @version 1.0 * @version 1.0
@ -47,6 +48,6 @@ public interface StGoodsExtMapper extends BaseMapper<StGoodsExt> {
Double getPlanQty(Long goodsId); Double getPlanQty(Long goodsId);
List<StGoodsExtExcel> exportStGoodsExt(@Param("stGoodsExt") StGoodsExtVO stGoodsExt); List<StGoodsExtExcel> exportStGoodsExt(@Param("stGoodsExt") Map<String, Object> stGoodsExt);
} }

@ -1,6 +1,5 @@
package org.springblade.wms.service.impl; package org.springblade.wms.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -129,8 +128,7 @@ public class StGoodsExtServiceImpl extends BaseServiceImpl<StGoodsExtMapper, StG
@Override @Override
public List<StGoodsExtExcel> exportStGoodsExt(Map<String, Object> stGoodsExt) { public List<StGoodsExtExcel> exportStGoodsExt(Map<String, Object> stGoodsExt) {
StGoodsExtVO stGoodsExtVO = BeanUtil.mapToBean(stGoodsExt, StGoodsExtVO.class, true); List<StGoodsExtExcel> stGoodsExtList = baseMapper.exportStGoodsExt(stGoodsExt);
List<StGoodsExtExcel> stGoodsExtList = baseMapper.exportStGoodsExt(stGoodsExtVO);
return stGoodsExtList; return stGoodsExtList;
} }

Loading…
Cancel
Save