9/1

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInfoRest.java

@@ -29,7 +29,10 @@ public class WarehouseInfoRest {
     public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq) {
         return wmsWarehouseService.listPage(pq);
     }
-
+    @PostMapping("/list")
+    public ResultBean<List<WarehouseInfo>> list(@RequestBody WarehouseInfoMapQuery query) {
+        return  wmsWarehouseService.listQuery(query);
+    }
     @ApiOperation("查询所有的仓库")
     @PostMapping("/listAll")
     public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {

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<PagerVo<WarehouseInventoryHistoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryHistoryQuery> pq){
+        return warehouseInventoryHistoryService.listPage(pq);
+    }
+}

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRecordRest.java

@@ -132,7 +132,11 @@ public class WarehouseInventoryRecordRest {
 	ResultBean<List<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecordList(@RequestParam("sid")String sid){
         return warehouseInventoryRecordService.getWarehouseInventoryRecordList(sid);
 	}
-
+	@ApiOperation("库存出入库记录")
+	@PostMapping("/getWarehouseInventoryRecord")
+	ResultBean<PagerVo<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecord(@RequestBody PagerQuery<WarehouseInventoryRecordQuery1> pq){
+		return warehouseInventoryRecordService.getWarehouseInventoryRecord(pq);
+	}
 	@ApiOperation("出入库查询")
 	@PostMapping("/pageList")
 	ResultBean<PagerVo<WarehouseInventoryRecordsVo>> pageList(@RequestBody PagerQuery<WarehouseInventoryRecordsQuery> pagerQuery){

wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java

@@ -44,7 +44,9 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         }
         PagerVo<BaseBrandInfoVo> 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);

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

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

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;//下标
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -51,6 +51,15 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         PagerVo<WarehouseInfoVo> p = WarehouseFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
+    public ResultBean<List<WarehouseInfo>> 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<WarehouseInfo> p = WarehouseFeign.list(pq).getData();
+        return rb.success().setData(p);
+    }
     public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String useOrgSid = "";

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

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;
+
+}

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;
+}

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<WarehouseInventoryHistory> {
+
+    IPage<WarehouseInventoryHistoryVo> listPage(IPage<WarehouseInventoryHistory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryHistory> qw);
+    List<WarehouseInventoryHistoryVo> getListBySpuSid(@Param("spuSid")String spuSid);
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.warehouseinventoryhistory.WarehouseInventoryHistoryMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+
+</mapper>

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;
+
+
+
+    //供应商
+}

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();
+
+}

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<WarehouseInventoryHistoryMapper, WarehouseInventoryHistory> {
+
+    @Autowired
+    WarehouseInventoryHistoryFeign warehouseInventoryHistoryFeign;
+
+    public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
+        ResultBean rb =new ResultBean().fail();
+        WarehouseInventoryHistoryQuery query = pq.getParams();
+
+        return warehouseInventoryHistoryFeign.listPage(pq);
+    }
+
+
+}

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<WarehouseInventoryHistoryVo> list=new ArrayList<>();
+
+}

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;
 }

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;
+}

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<Warehous
     private WarehouseInventoryRecordFeign  warehouseInventoryRecordFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private CommonMethod commonMethod;
 
     private QueryWrapper<WarehouseInventoryRecord> createQueryWrapper(WarehouseInventoryRecordQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -101,7 +106,13 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
     public ResultBean<List<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecordList(String sid) {
         return warehouseInventoryRecordFeign.getWarehouseInventoryRecordList(sid);
     }
-
+    public ResultBean<PagerVo<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecord(PagerQuery<WarehouseInventoryRecordQuery1> 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<PagerVo<WarehouseInventoryRecordsVo>> listPage(PagerQuery<WarehouseInventoryRecordsQuery> pagerQuery) {
         ResultBean rb =new ResultBean();
         PagerVo<WarehouseInventoryRecordsVo> pagging = warehouseInventoryRecordFeign.listPage(pagerQuery).getData();

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java

@@ -37,6 +37,8 @@ public interface WarehouseFeign {
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq);
+    @PostMapping("/list")
+    public ResultBean<List<WarehouseInfo>> list(@RequestBody WarehouseInfoMapQuery query);
     @ApiOperation("查询所有的仓库")
     @PostMapping("/listAll")
     public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query);

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<WarehouseInfo>> list(WarehouseInfoMapQuery query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
 		return null;

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(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @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<PagerVo<WarehouseInventoryHistoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryHistoryQuery> pq);
+}

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(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class WarehouseInventoryHistoryFeignFallback implements WarehouseInventoryHistoryFeign {
+
+
+    @Override
+    public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
+        return null;
+    }
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java

@@ -74,6 +74,9 @@ public interface WarehouseInventoryRecordFeign {
     @ApiOperation("库存出入库记录")
     @GetMapping("/getWarehouseInventoryRecordList")
     ResultBean<List<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecordList(@RequestParam("sid")String sid);
+    @ApiOperation("库存出入库记录")
+    @PostMapping("/getWarehouseInventoryRecord")
+    ResultBean<PagerVo<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecord(@RequestBody PagerQuery<WarehouseInventoryRecordQuery1> pagerQuery);
 
     @ApiOperation("出入库查询")
     @PostMapping("/pageList")

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<PagerVo<WarehouseInventoryRecordListVo>> getWarehouseInventoryRecord(PagerQuery<WarehouseInventoryRecordQuery1> pagerQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<WarehouseInventoryRecordsVo>> pageList(PagerQuery<WarehouseInventoryRecordsQuery> pagerQuery) {
 		return null;