open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

6/13

Browse Source
This commit is contained in:
wangpengfei
2024-06-13 08:40:28 +08:00
parent 56011a5c5f
commit 21ba8358f1
12 changed files with 98 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java
View File

@@ -1,5 +1,7 @@
package com.yxt.warehouse.apiadmin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -17,7 +19,7 @@ import java.util.List;
*/
@Api(tags = "库区信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehousearea")
@RequestMapping("/apiadmin/warehousearea")
public class WarehouseAreaRest {
@Autowired
@@ -25,8 +27,8 @@ public class WarehouseAreaRest {
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> pq) {
return wmsWarehouseAreaService.listPage(pq);
public ResultBean<IPage<WarehouseAreaVo>> listPage(@RequestBody WarehouseAreaQuery query) {
return wmsWarehouseAreaService.listPage(query.getPage(),query.getQw());
}
@ApiOperation("查询所有的库区")
@GetMapping("/listAll")

21
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java
View File

@@ -1,24 +1,25 @@
package com.yxt.warehouse.apiadmin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeDto;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeQuery;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeService;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo;
import com.yxt.warehouse.biz.warehouseareatype.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/3/18 14:57
*/
@Api(tags = "库区类型信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouseareatype")
@RequestMapping("/apiadmin/warehouseareatype")
public class WarehouseAreaTypeRest {
@Autowired
@@ -26,13 +27,13 @@ public class WarehouseAreaTypeRest {
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq) {
return wmsWarehouseAreaTypeService.listPage(pq);
public ResultBean<IPage<WarehouseAreaTypeVo>> listPage(@RequestBody WarehouseAreaTypeQuery query) {
return wmsWarehouseAreaTypeService.listPage(query.getPage(),query.getQw());
}
@ApiOperation("查询所有的")
@GetMapping("/listAll")
public ResultBean<WarehouseAreaTypeVo> listAll() {
return wmsWarehouseAreaTypeService.listAll();
@GetMapping("/listAll/{useOrgSid}")
public ResultBean<List<WarehouseAreaType>> listAll(@PathVariable("useOrgSid") String useOrgSid) {
return wmsWarehouseAreaTypeService.listAll(useOrgSid);
}
@ApiOperation("保存修改")

15
src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
View File

@@ -1,9 +1,12 @@
package com.yxt.warehouse.apiadmin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType;
import com.yxt.warehouse.biz.warehouseinfo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +21,7 @@ import java.util.List;
*/
@Api(tags = "仓库信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouseinfo")
@RequestMapping("/apiadmin/warehouseinfo")
public class WarehouseInfoRest {
@Autowired
@@ -26,13 +29,13 @@ public class WarehouseInfoRest {
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq) {
return wmsWarehouseService.listPage(pq);
public ResultBean<IPage<WarehouseInfoVo>> listPage(@RequestBody WarehouseInfoQuery query) {
return wmsWarehouseService.listPage(query.getPage(), query.getQw());
}
@ApiOperation("查询所有的仓库")
@GetMapping("/listAll")
public ResultBean<WarehouseInfoVo> listAll() {
return wmsWarehouseService.listAll();
@GetMapping("/listAll/{useOrgSid}")
public ResultBean<List<WarehouseInfo>> listAll(@PathVariable("useOrgSid") String useOrgSid) {
return wmsWarehouseService.listAll(useOrgSid);
}
@ApiOperation("保存修改")

13
src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java
View File

@@ -1,12 +1,11 @@
package com.yxt.warehouse.apiadmin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackDto;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackQuery;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackService;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo;
import com.yxt.warehouse.biz.warehouserack.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "货架信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouserack")
@RequestMapping("/apiadmin/warehouserack")
public class WarehouseRackRest {
@Autowired
@@ -26,8 +25,8 @@ public class WarehouseRackRest {
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq) {
return wmsWarehouseRackService.listPage(pq);
public ResultBean<IPage<WarehouseRackVo>> listPage(@RequestBody WarehouseRackQuery query) {
return wmsWarehouseRackService.listPage(query);
}
@ApiOperation("查询所有的库区")
@GetMapping("/getAllType")

12
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java
View File

@@ -1,6 +1,9 @@
package com.yxt.warehouse.biz.warehousearea;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -13,4 +16,13 @@ public class WarehouseAreaQuery implements Query {
private String code;//编码
private String warehouseSid;//仓库
private String areaTypeSid;//库区类型
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
private QueryWrapper<WarehouseArea> qw;
private IPage<WarehouseArea> page;
}

23
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
View File

@@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Date;
@@ -25,28 +26,10 @@ import java.util.stream.Collectors;
public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper, WarehouseArea> {
public ResultBean<PagerVo<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
public ResultBean<IPage<WarehouseAreaVo>> listPage( IPage<WarehouseArea> page , QueryWrapper<WarehouseArea> qw) {
ResultBean rb = ResultBean.fireFail();
WarehouseAreaQuery query = pq.getParams();
QueryWrapper<WarehouseArea> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("areaName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("areaCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getWarehouseSid())){
qw.eq("b.sid",query.getWarehouseSid());
}
if(StringUtils.isNotBlank(query.getAreaTypeSid())){
qw.eq("c.sid",query.getAreaTypeSid());
}
qw.ne("a.isDelete","1");
IPage<WarehouseArea> page = PagerUtil.queryToPage(pq);
IPage<WarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseAreaVo> records = pagging.getRecords();
return rb.success().setData(p);
return rb.success().setData(pagging);
}
public ResultBean<WarehouseAreaVo> getAllType() {
ResultBean rb = ResultBean.fireFail();

12
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java
View File

@@ -1,6 +1,9 @@
package com.yxt.warehouse.biz.warehouseareatype;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -10,4 +13,13 @@ import lombok.Data;
@Data
public class WarehouseAreaTypeQuery implements Query {
private String name;
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
private IPage<WarehouseAreaType> page;
private QueryWrapper<WarehouseAreaType> qw;
}

18
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
View File

@@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Date;
@@ -25,24 +26,15 @@ import java.util.stream.Collectors;
public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTypeMapper, WarehouseAreaType> {
public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
public ResultBean<IPage<WarehouseAreaTypeVo>> listPage(IPage<WarehouseAreaType> page, QueryWrapper<WarehouseAreaType> qw) {
ResultBean rb = ResultBean.fireFail();
WarehouseAreaTypeQuery query = pq.getParams();
QueryWrapper<WarehouseAreaType> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("warehouseAreaTypeName",query.getName());
}
qw.ne("isDelete","1");
IPage<WarehouseAreaType> page = PagerUtil.queryToPage(pq);
IPage<WarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseAreaTypeVo> records = pagging.getRecords();
return rb.success().setData(p);
return rb.success().setData(pagging);
}
public ResultBean<WarehouseAreaTypeVo> listAll() {
public ResultBean<List<WarehouseAreaType>> listAll(String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WarehouseAreaType>().eq("isEnable",1)
.ne("isDelete","1"));
.ne("isDelete","1").eq("useOrgSid",useOrgSid));
return rb.success().setData(pagging);
}

13
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java
View File

@@ -1,6 +1,9 @@
package com.yxt.warehouse.biz.warehouseinfo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -12,4 +15,14 @@ public class WarehouseInfoQuery implements Query {
private String name;
private String code;
private String address;
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
private IPage<WarehouseInfo> page;
private QueryWrapper<WarehouseInfo> qw;
}

27
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -11,11 +11,13 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -34,30 +36,15 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
@Autowired
WarehouseExtendService wmsWarehouseExtendService;
public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
public ResultBean<IPage<WarehouseInfoVo>> listPage(IPage<WarehouseInfo> page, QueryWrapper<WarehouseInfo> qw) {
ResultBean rb = ResultBean.fireFail();
WarehouseInfoQuery query = pq.getParams();
QueryWrapper<WarehouseInfo> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("warehouseName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("warehouseCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getAddress())){
qw.like("address",query.getAddress());
}
qw.ne("isDelete",1);
qw.orderByDesc("sortNo");
IPage<WarehouseInfo> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseInfoVo> records = pagging.getRecords();
return rb.success().setData(p);
return rb.success().setData(pagging);
}
public ResultBean<WarehouseInfoVo> listAll() {
public ResultBean<List<WarehouseInfo>> listAll(String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WarehouseInfo>().eq("isEnable",1));
List<WarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WarehouseInfo>().eq("isEnable",1)
.eq("useOrgSid",useOrgSid).eq("isDelete","0"));
return rb.success().setData(pagging);
}

11
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java
View File

@@ -1,6 +1,9 @@
package com.yxt.warehouse.biz.warehouserack;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -13,4 +16,12 @@ public class WarehouseRackQuery implements Query {
private String code;//编码
private String warehouseSid;//仓库
private String areaTypeSid;//库区类型
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
private IPage<WarehouseRack> page;
private QueryWrapper<WarehouseRack> qw;
}

25
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
View File

@@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Date;
@@ -25,28 +26,10 @@ import java.util.stream.Collectors;
public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper, WarehouseRack> {
public ResultBean<PagerVo<WarehouseRackVo>> listPage(PagerQuery<WarehouseRackQuery> pq) {
public ResultBean<IPage<WarehouseRackVo>> listPage(WarehouseRackQuery query) {
ResultBean rb = ResultBean.fireFail();
WarehouseRackQuery query = pq.getParams();
QueryWrapper<WarehouseRack> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("rackName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("rackCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getAreaTypeSid())){
qw.eq("b.sid",query.getAreaTypeSid());
}
if(StringUtils.isNotBlank(query.getWarehouseSid())){
qw.eq("c.sid",query.getWarehouseSid());
}
qw.ne("a.isDelete","1");
IPage<WarehouseRack> page = PagerUtil.queryToPage(pq);
IPage<WarehouseRackVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseRackVo> records = pagging.getRecords();
return rb.success().setData(p);
IPage<WarehouseRackVo> pagging = baseMapper.listPage(query.getPage(), query.getQw());
return rb.success().setData(pagging);
}
public ResultBean<WarehouseRackVo> getAllType() {
ResultBean rb = ResultBean.fireFail();