From 86a0536b949365e848da4b7ca5e90fef5475f7e3 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 2 Sep 2024 08:50:48 +0800 Subject: [PATCH] 9/1 --- .../aggregation/WarehouseInfoRest.java | 5 +- .../WarehouseInventoryHistoryRest.java | 33 ++++++++++ .../WarehouseInventoryRecordRest.java | 6 +- .../basebrandinfo/BaseBrandInfoService.java | 4 +- .../biz/func/warehouseinfo/WarehouseInfo.java | 1 + .../func/warehouseinfo/WarehouseInfoDto.java | 1 + .../warehouseinfo/WarehouseInfoMapQuery.java | 21 ++++++ .../warehouseinfo/WarehouseInfoService.java | 9 +++ .../func/warehouseinfo/WarehouseInfoVo.java | 1 + .../WarehouseInventoryHistory.java | 65 +++++++++++++++++++ .../WarehouseInventoryHistoryDto.java | 59 +++++++++++++++++ .../WarehouseInventoryHistoryMapper.java | 21 ++++++ .../WarehouseInventoryHistoryMapper.xml | 9 +++ .../WarehouseInventoryHistoryQuery.java | 42 ++++++++++++ .../WarehouseInventoryHistoryScheduledVo.java | 61 +++++++++++++++++ .../WarehouseInventoryHistoryService.java | 38 +++++++++++ .../WarehouseInventoryHistoryVo.java | 40 ++++++++++++ .../WarehouseInventoryRecordListVo.java | 23 +++++-- .../WarehouseInventoryRecordQuery1.java | 30 +++++++++ .../WarehouseInventoryRecordService.java | 13 +++- .../warehouseinfo/WarehouseFeign.java | 2 + .../warehouseinfo/WarehouseFeignFallback.java | 5 ++ .../WarehouseInventoryHistoryFeign.java | 38 +++++++++++ ...arehouseInventoryHistoryFeignFallback.java | 31 +++++++++ .../WarehouseInventoryRecordFeign.java | 3 + ...WarehouseInventoryRecordFeignFallback.java | 5 ++ 26 files changed, 557 insertions(+), 9 deletions(-) create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryHistoryRest.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoMapQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistory.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryDto.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryScheduledVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordQuery1.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeignFallback.java diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInfoRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInfoRest.java index 59950c4..72954e7 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInfoRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInfoRest.java @@ -29,7 +29,10 @@ public class WarehouseInfoRest { public ResultBean> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseService.listPage(pq); } - + @PostMapping("/list") + public ResultBean> list(@RequestBody WarehouseInfoMapQuery query) { + return wmsWarehouseService.listQuery(query); + } @ApiOperation("查询所有的仓库") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query) { diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryHistoryRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryHistoryRest.java new file mode 100644 index 0000000..d148f48 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryHistoryRest.java @@ -0,0 +1,33 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryQuery; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryService; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2024/8/30 9:23 + */ +@Api(tags = "历史库存") +@RestController +@RequestMapping("/apiadmin/warehouseinventoryhistory") +public class WarehouseInventoryHistoryRest { + @Autowired + WarehouseInventoryHistoryService warehouseInventoryHistoryService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseInventoryHistoryService.listPage(pq); + } +} diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRecordRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRecordRest.java index 346e008..81ed56a 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRecordRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRecordRest.java @@ -132,7 +132,11 @@ public class WarehouseInventoryRecordRest { ResultBean> getWarehouseInventoryRecordList(@RequestParam("sid")String sid){ return warehouseInventoryRecordService.getWarehouseInventoryRecordList(sid); } - + @ApiOperation("库存出入库记录") + @PostMapping("/getWarehouseInventoryRecord") + ResultBean> getWarehouseInventoryRecord(@RequestBody PagerQuery pq){ + return warehouseInventoryRecordService.getWarehouseInventoryRecord(pq); + } @ApiOperation("出入库查询") @PostMapping("/pageList") ResultBean> pageList(@RequestBody PagerQuery pagerQuery){ diff --git a/wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java b/wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java index 60b61ec..95ed199 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java @@ -44,7 +44,9 @@ public class BaseBrandInfoService extends MybatisBaseService baseBrandInfoVos=w.getData(); for (BaseBrandInfoVo baseBrandInfoVo : baseBrandInfoVos.getRecords()) { - baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage()); + if(StringUtils.isNotBlank(baseBrandInfoVo.getImage())){ + baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage()); + } } return rb.success().success().setData(baseBrandInfoVos); diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java index 459060f..0ef4b8c 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java @@ -21,6 +21,7 @@ public class WarehouseInfo extends BaseEntity { private String manager;//主管 private String areaSid;//地区sid private String address;//地址 + private String lngAndLat;//经纬度 private String longitude;//经度 private String latitude;//纬度 private String warehouseTypeKey;//仓库类型Key diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java index fc1b0ee..3e5936b 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java @@ -32,6 +32,7 @@ public class WarehouseInfoDto implements Dto { private String manager;//主管 private String areaSid;//地区sid private String address;//地址 + private String lngAndLat;//经纬度 private String longitude;//经度 private String latitude;//纬度 private String warehouseTypeKey;//仓库类型Key diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoMapQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoMapQuery.java new file mode 100644 index 0000000..0dc1e91 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoMapQuery.java @@ -0,0 +1,21 @@ +package com.yxt.wms.biz.func.warehouseinfo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/8/29 11:52 + */ +@Data +public class WarehouseInfoMapQuery { + private String name;//仓库名称 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private String orgLevelKey;// + private int index;//下标 +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java index 42a21ec..bf499d2 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -51,6 +51,15 @@ public class WarehouseInfoService extends MybatisBaseService p = WarehouseFeign.listPage(pq).getData(); return rb.success().setData(p); } + public ResultBean> listQuery(WarehouseInfoMapQuery pq) { + ResultBean rb = ResultBean.fireFail(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(pq.getOrgPath(),pq.getMenuUrl(),pq.getUserSid()).getData(); + pq.setOrgLevelKey(dataRule.getDataRuleId()); + pq.setIndex(dataRule.getIndex()); + List p = WarehouseFeign.list(pq).getData(); + return rb.success().setData(p); + } public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = ""; diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java index 1594001..3824100 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java @@ -33,6 +33,7 @@ public class WarehouseInfoVo implements Vo { private String manager;//主管 private String areaSid;//地区sid private String address;//地址 + private String lngAndLat;//经纬度 private String longitude;//经度 private String latitude;//纬度 private String warehouseTypeKey;//仓库类型Key diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistory.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistory.java new file mode 100644 index 0000000..67ab1b6 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistory.java @@ -0,0 +1,65 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +@TableName("warehouse_inventory") +public class WarehouseInventoryHistory extends BaseEntity { + + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") + private String goodsID; + @ApiModelProperty("分类sid") + private String goodsTypeSid; + @ApiModelProperty("分类名") + private String goodsTypeName; + @ApiModelProperty("品牌sid") + private String goodsBrandSid; + @ApiModelProperty("品牌名") + private String goodsBrandName; + @ApiModelProperty("商品基础信息sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("现有量") + private BigDecimal count; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + private Date orderDate; + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryDto.java new file mode 100644 index 0000000..455e86a --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryDto.java @@ -0,0 +1,59 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseInventoryHistoryDto implements Dto { + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") + private String goodsID; + @ApiModelProperty("分类sid") + private String goodsTypeSid; + @ApiModelProperty("分类名") + private String goodsTypeName; + @ApiModelProperty("品牌sid") + private String goodsBrandSid; + @ApiModelProperty("品牌名") + private String goodsBrandName; + @ApiModelProperty("商品基础信息sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("现有量") + private BigDecimal count; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.java new file mode 100644 index 0000000..0e2d4db --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.java @@ -0,0 +1,21 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseInventoryHistoryMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getListBySpuSid(@Param("spuSid")String spuSid); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml new file mode 100644 index 0000000..e28d7c2 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java new file mode 100644 index 0000000..90daed0 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java @@ -0,0 +1,42 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInventoryHistoryQuery implements Query { + + @ApiModelProperty("商品编码") + private String goodsSkuCode; + + @ApiModelProperty("仓库") + private String warehouseSid; + @ApiModelProperty("商品名称") + private String goodsSpuSid; + private String brandSid; + private String spec; + private String countStart; + private String countEnd; + + + @ApiModelProperty("条码") + private String barCode; + private String hh; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; + + + + //供应商 +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryScheduledVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryScheduledVo.java new file mode 100644 index 0000000..2b09c04 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryScheduledVo.java @@ -0,0 +1,61 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/8/29 16:55 + */ +@Data +public class WarehouseInventoryHistoryScheduledVo { + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") + private String goodsID; + @ApiModelProperty("分类sid") + private String goodsTypeSid; + @ApiModelProperty("分类名") + private String goodsTypeName; + @ApiModelProperty("品牌sid") + private String goodsBrandSid; + @ApiModelProperty("品牌名") + private String goodsBrandName; + @ApiModelProperty("商品基础信息sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("现有量") + private BigDecimal count; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + private Date orderDate=new Date(); + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryService.java new file mode 100644 index 0000000..e9cc642 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryService.java @@ -0,0 +1,38 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryService; +import com.yxt.wms.feign.warehouse.warehouseinventoryhistory.WarehouseInventoryHistoryFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseInventoryHistoryService extends MybatisBaseService { + + @Autowired + WarehouseInventoryHistoryFeign warehouseInventoryHistoryFeign; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb =new ResultBean().fail(); + WarehouseInventoryHistoryQuery query = pq.getParams(); + + return warehouseInventoryHistoryFeign.listPage(pq); + } + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java new file mode 100644 index 0000000..585abcc --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java @@ -0,0 +1,40 @@ +package com.yxt.wms.biz.func.warehouseinventoryhistory; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInventoryHistoryVo implements Vo { + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("商品基础信息sid") + private String goodsSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("现有量") + private BigDecimal count; + + private Date orderDate; + private List list=new ArrayList<>(); + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java index 3940fc2..3f7ceb6 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java @@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.warehouseinventoryrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @description: 库存出入库记录 * @author: dimengzhe @@ -15,16 +17,27 @@ public class WarehouseInventoryRecordListVo { private String billNo; @ApiModelProperty("单据类型") private String billType; + private String billTypeValue; @ApiModelProperty("发生时间") private String createTime; @ApiModelProperty("业务类型") private String busTypeValue; - @ApiModelProperty("客户/供应商") - private String billObjName; - @ApiModelProperty("批次号") - private String batchNumber; @ApiModelProperty("数量") private String count; @ApiModelProperty("出入库后的库存量") - private String currentCount; + private BigDecimal currentCount; + @ApiModelProperty("操作员") + private String operator; + @ApiModelProperty("单价") + private BigDecimal price; + @ApiModelProperty("spuname") + private String goodsSpuName; + @ApiModelProperty("skutitle") + private String goodsTitle; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("发生成本") + private BigDecimal costIncurred; + @ApiModelProperty("库存成本") + private BigDecimal inventoryCost; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordQuery1.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordQuery1.java new file mode 100644 index 0000000..de7f674 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordQuery1.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.warehouseinventoryrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/8/28 16:45 + */ +@Data +public class WarehouseInventoryRecordQuery1 implements Query { + private String billSid; + private String goodsSpuName; + private String goodsSkuTitle; + private String spec; + private String warehouseName; + private String billType; + private String startTime; + private String endTime; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java index cf7d351..ea0095c 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java @@ -30,6 +30,9 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.commonmethod.CommonMethod; +import com.yxt.wms.biz.func.commonmethod.DataRule; +import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryQuery; import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; import com.yxt.wms.biz.func.warehouseoldinventory.WarehouseOldInventoryDetailsListVo; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; @@ -60,6 +63,8 @@ public class WarehouseInventoryRecordService extends MybatisBaseService createQueryWrapper(WarehouseInventoryRecordQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -101,7 +106,13 @@ public class WarehouseInventoryRecordService extends MybatisBaseService> getWarehouseInventoryRecordList(String sid) { return warehouseInventoryRecordFeign.getWarehouseInventoryRecordList(sid); } - + public ResultBean> getWarehouseInventoryRecord(PagerQuery pq) { + WarehouseInventoryRecordQuery1 query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return warehouseInventoryRecordFeign.getWarehouseInventoryRecord(pq); + } public ResultBean> listPage(PagerQuery pagerQuery) { ResultBean rb =new ResultBean(); PagerVo pagging = warehouseInventoryRecordFeign.listPage(pagerQuery).getData(); diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java index f73c82a..765fe32 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java @@ -37,6 +37,8 @@ public interface WarehouseFeign { @ApiOperation("分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); + @PostMapping("/list") + public ResultBean> list(@RequestBody WarehouseInfoMapQuery query); @ApiOperation("查询所有的仓库") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query); diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java index f4be9ad..1bb5a53 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java @@ -33,6 +33,11 @@ public class WarehouseFeignFallback implements WarehouseFeign { return null; } + @Override + public ResultBean> list(WarehouseInfoMapQuery query) { + return null; + } + @Override public ResultBean> listAll(OrgPathQuery query) { return null; diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeign.java new file mode 100644 index 0000000..28d1c9c --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeign.java @@ -0,0 +1,38 @@ +package com.yxt.wms.feign.warehouse.warehouseinventoryhistory; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryQuery; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "历史库存") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseInventoryHistory", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseinventoryhistory", + fallback = WarehouseInventoryHistoryFeignFallback.class) +public interface WarehouseInventoryHistoryFeign { + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeignFallback.java new file mode 100644 index 0000000..677747c --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryhistory/WarehouseInventoryHistoryFeignFallback.java @@ -0,0 +1,31 @@ +package com.yxt.wms.feign.warehouse.warehouseinventoryhistory; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryQuery; +import com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryVo; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseInventoryHistoryFeignFallback implements WarehouseInventoryHistoryFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java index bcd6de7..4514335 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java @@ -74,6 +74,9 @@ public interface WarehouseInventoryRecordFeign { @ApiOperation("库存出入库记录") @GetMapping("/getWarehouseInventoryRecordList") ResultBean> getWarehouseInventoryRecordList(@RequestParam("sid")String sid); + @ApiOperation("库存出入库记录") + @PostMapping("/getWarehouseInventoryRecord") + ResultBean> getWarehouseInventoryRecord(@RequestBody PagerQuery pagerQuery); @ApiOperation("出入库查询") @PostMapping("/pageList") diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java index 3613e34..9a594b4 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java @@ -76,6 +76,11 @@ public class WarehouseInventoryRecordFeignFallback implements WarehouseInventory return null; } + @Override + public ResultBean> getWarehouseInventoryRecord(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> pageList(PagerQuery pagerQuery) { return null;