Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,8 @@ 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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuService;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
@@ -37,4 +39,9 @@ public class BaseGoodsSkuRest {
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query) {
         return baseGoodsSkuService.listAllByOrg(query);
     }
+    @ApiOperation("入库添加商品列表")
+    @PostMapping("/getSelectList")
+    ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+        return baseGoodsSkuService.getSelectList(pagerQuery);
+    }
 }

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

@@ -55,5 +55,9 @@ public class PurchaseInventoryBillRest {
         return purchaseInventoryBillService.delAllBySids(sids);
     }
 
-
+    @ApiOperation("生成验货入库")
+    @PostMapping("/inspectionWarehousing")
+    ResultBean<String> inspectionWarehousing(@RequestBody PurchaseInventoryBillDto2 dto) {
+        return purchaseInventoryBillService.inspectionWarehousing(dto);
+    }
 }

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

@@ -32,7 +32,16 @@ public class WarehouseInventoryRest {
     public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryQuery> pq) {
         return warehouseInventoryService.listPage(pq);
     }
-
+    @ApiOperation("库位库存分页列表")
+    @PostMapping("/locationListPage")
+    public ResultBean<PagerVo<WarehouseInventoryVo>> locationListPage(@RequestBody PagerQuery<WarehouseInventoryQuery> pq) {
+        return warehouseInventoryService.locationListPage(pq);
+    }
+    @ApiOperation("查询库位商品数量")
+    @PostMapping("/getRackCountBySid")
+    ResultBean getRackCountBySid(@RequestBody WarehouseInventoryRackCountQuery query) {
+        return warehouseInventoryService.getRackCountBySid(query);
+    }
     @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")
     ResultBean delBySids(@RequestBody String[] sids) {

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java

@@ -2,6 +2,8 @@ package com.yxt.wms.biz.func.basegoodssku;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -15,22 +17,25 @@ public class BaseGoodsSkuSelectList {
     private String goodsSpuName;
     //商品sid
     private String goodsSkuSid;
+    //
+    private String goodsSkuTitle;
     //商品编码
     private String goodsSkuCode;
+    //条码
+    private String barCode;
     //规格/型号
-    private String goodsSkuTitle;
+    private String ownSpec;
+
     //计量单位
-    private String goodsUnitSid;
-    private String goodsUnitName;
-    //仓库名称
-    //货位
-    //单位成本（进货价）
-    //数量
-    //税额
-    //含税价
-    //金额
-    //销售价1
-    //销售价2
-    //操作时间
-    //操作人
+    private String goodsUnitSid;//
+    private String goodsUnitName;//单位
+    private BigDecimal costPrice=new BigDecimal(0);//单价
+    private BigDecimal totalPrice=new BigDecimal(0);//总金额
+    private String remarks;//备注
+    private Integer count=0;//数量
+    private String serialNumber;//序列号
+    private String batch;//批次
+    private String warehouseRackSid;//
+    private String warehouseRackName;//库位
+    private String shelfLife;//保质期 天数
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java

@@ -12,4 +12,6 @@ import lombok.Data;
 public class BaseGoodsSkuSelectQuery implements Query {
 
     private String goodsSkuCode;
+    private String goodsSpuName;
+    private String createOrgSid;
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java

@@ -124,19 +124,8 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         return rb.success().setData(baseGoodsSkuDetailsVo);
     }
 
-    public PagerVo<BaseGoodsSkuSelectList> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
-        BaseGoodsSkuSelectQuery query = pagerQuery.getParams();
-        QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
-        if (query != null) {
-            //商品编码
-            if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-                qw.like("sku.goodsSkuCode", query.getGoodsSkuCode());
-            }
-        }
-        IPage<BaseGoodsSku> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<BaseGoodsSkuSelectList> pagging = baseMapper.getSelectList(page, qw);
-        PagerVo<BaseGoodsSkuSelectList> p = PagerUtil.pageToVo(pagging, null);
-        return p;
+    public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+        return baseGoodsSkuFeign.getSelectList(pagerQuery);
     }
 
     public ResultBean<PagerVo<BaseGoodsSkuPurSelectList>> purGoodsListPage(PagerQuery<BaseGoodsSkuPurSelectQuery> pq) {

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java

@@ -54,7 +54,7 @@ public class PurchaseInventoryBillDto2 {
     private String operatorName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("操作时间")
-    private Date operatorTime;
+    private String operatorTime;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java

@@ -11,7 +11,8 @@ import lombok.Data;
  **/
 @Data
 public class PurchaseInventoryBillQuery implements Query {
-
+    @ApiModelProperty("单据类型 0 :采购入库 1 验货入库")
+    private String billType;
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("外部单号")
@@ -32,11 +33,15 @@ public class PurchaseInventoryBillQuery implements Query {
     private String goodsSkuSid;
     @ApiModelProperty("供应商")
     private String supplierName;
+
+
+    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/purchaseinventorybill/PurchaseInventoryBillService.java

@@ -11,12 +11,15 @@ 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.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailDto2;
 import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailService;
 import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo;
 import com.yxt.wms.biz.func.sysstaffinfo.SysStaffinfo;
 import com.yxt.wms.biz.func.sysstaffinfo.SysStaffinfoDetailsVo;
 import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBill;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
 import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillService;
 import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailService;
 import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsListDetailsVo;
@@ -56,9 +59,13 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
     @Autowired
     BaseGoodsSpuFeign goodsSpuFeign;
 
-
+    @Autowired
+    private CommonMethod commonMethod;
     public ResultBean<PagerVo<PurchaseInventoryBillPageVo>> listPage(PagerQuery<PurchaseInventoryBillQuery> pq) {
-
+        PurchaseInventoryBillQuery 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 purchaseInventoryBillFeign.listPage(pq);
     }
 
@@ -96,4 +103,9 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
     public ResultBean delAllBySids(String[] sids) {
         return purchaseInventoryBillFeign.delBySids(sids);
     }
+    public ResultBean<String> inspectionWarehousing(PurchaseInventoryBillDto2 dto) {
+        SysStaffinfo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySidP(dto.getUserSid()).getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
+        return purchaseInventoryBillFeign.inspectionWarehousing(dto);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java

@@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.purchaseinventorybilldetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -11,6 +13,7 @@ import lombok.Data;
 @Data
 public class PurchaseInventoryBillDetailDto2 {
 
+    private String sid;
     @ApiModelProperty("来源单sid")
     private String sourceBillSid;
     @ApiModelProperty("图示")
@@ -29,6 +32,7 @@ public class PurchaseInventoryBillDetailDto2 {
     private String goodsBarCode;
     @ApiModelProperty("规格值")
     private String specValue;
+    private String ownSpec;
     @ApiModelProperty("箱条码")
     private String boxBarCode;
     @ApiModelProperty("箱规格")
@@ -36,12 +40,14 @@ public class PurchaseInventoryBillDetailDto2 {
 
     @ApiModelProperty("单位")
     private String unit;
+    private String goodsUnitName;
     @ApiModelProperty("成本单价")
-    private double price;
+    private BigDecimal price;
+    private BigDecimal costPrice;
     @ApiModelProperty("总价")
-    private double totalPrice;
+    private BigDecimal totalPrice;
     @ApiModelProperty("数量")
-    private double count;
+    private BigDecimal count;
     @ApiModelProperty("辅助单位")
     private String auxiliaryUnits;
     @ApiModelProperty("序列号")

wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java

@@ -29,4 +29,5 @@ public class SysUserRoleDto implements Dto {
     
 	@ApiModelProperty("角色sid")
     private String roleSid;
+    private String orgSid;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java

@@ -15,6 +15,21 @@ public class WarehouseAnsBillDetailVo {
     private String sourceBillSid;
     @ApiModelProperty("图示")
     private String illustration;
+    @ApiModelProperty("类别sid")
+    private String goodsTypeSid;
+    @ApiModelProperty("分类名")
+    private String goodsTypeName;
+
+    @ApiModelProperty("品牌sid")
+    private String goodsBrandSid;
+    @ApiModelProperty("品牌名")
+    private String goodsBrandName;
+
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名")
+    private String manufacturerName;
+
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品名称")

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java

@@ -10,23 +10,32 @@ import lombok.Data;
  */
 @Data
 public class WarehouseInventoryQuery implements Query {
-    @ApiModelProperty("goodsID")
-    private String goodsID;
-
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
 
     @ApiModelProperty("商品编码")
     private String goodsSkuCode;
 
     @ApiModelProperty("仓库")
-    private String warehouseName;
-
-    @ApiModelProperty("库位编码")
-    private String warehouseRackCode;
+    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;
 
-    @ApiModelProperty("批次号")
-    private String batchNumber;
 
     //供应商
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryRackCountQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.wms.biz.func.warehouseinventory;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/8/23 11:02
+ */
+@Data
+public class WarehouseInventoryRackCountQuery {
+    private String sid;
+    private String type;//1 spu 2sku
+    private String orgSid;
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java

@@ -8,12 +8,16 @@ 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.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
+import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillQuery;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.warehouse.warehousesinventory.WarehouseInventoryFeign;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,10 +42,25 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private CommonMethod commonMethod;
     public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(PagerQuery<WarehouseInventoryQuery> pq) {
+        WarehouseInventoryQuery 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 warehouseInventoryFeign.listPage(pq);
     }
-
+    public ResultBean<PagerVo<WarehouseInventoryVo>> locationListPage(PagerQuery<WarehouseInventoryQuery> pq) {
+        WarehouseInventoryQuery 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 warehouseInventoryFeign.locationListPage(pq);
+    }
+    public ResultBean getRackCountBySid(WarehouseInventoryRackCountQuery query) {
+        return warehouseInventoryFeign.getRackCountBySid(query);
+    }
     /**
      * 入库
      *

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVo.java

@@ -4,18 +4,24 @@ 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.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:37
  */
 @Data
 public class WarehouseInventoryVo implements Vo {
-
+    private String mainSid="0";
     private String sid;
     @ApiModelProperty("商品ID")
     private String goodsID;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
+    private String goodsSkuSid;
     @ApiModelProperty("商品编码")
     private String goodsSkuCode;
     @ApiModelProperty("规格型号")
@@ -27,16 +33,35 @@ public class WarehouseInventoryVo implements Vo {
     @ApiModelProperty("库位名称")
     private String warehouseRackCode;
     @ApiModelProperty("现有库存")
-    private String count;
+    private BigDecimal count=new BigDecimal(0);
     @ApiModelProperty("分配库存")
-    private String allocateCount;
+    private BigDecimal allocateCount=new BigDecimal(0);
     @ApiModelProperty("可用库存")
-    private String useCount;
-    @ApiModelProperty("批次号")
+    private BigDecimal useCount=new BigDecimal(0);
+    @ApiModelProperty("冻结")
+    private BigDecimal freezeCount=new BigDecimal(0);
+    @ApiModelProperty("在途汇总")
+    private BigDecimal inTransitSummary=new BigDecimal(0);
+    @ApiModelProperty("采购在途")
+    private BigDecimal procurementInTransit=new BigDecimal(0);
+    @ApiModelProperty("销退在途")
+    private BigDecimal salesReturnInTransit=new BigDecimal(0);
+    @ApiModelProperty("调拨在途")
+    private BigDecimal transferInTransit=new BigDecimal(0);
+    @ApiModelProperty("其他在途")
+    private BigDecimal otherOnTheWay=new BigDecimal(0);
+    @ApiModelProperty("工单在途")
+    private BigDecimal workOrderInTransit=new BigDecimal(0);
+    @ApiModelProperty("箱单位")
+    private String boxUnit;
+    @ApiModelProperty("体积m3")
+    private String volume;
+    @ApiModelProperty("重量kg")
+    private String weight;
+    @ApiModelProperty("批次")
     private String batchNumber;
-    @ApiModelProperty("首次入库日期")
-    private String firstInDate;
-    @ApiModelProperty("库龄")
-    private String dateAge;
+    @ApiModelProperty("序列号")
+    private String serialNumber;
+    private List<WarehouseInventoryVo> warehouseInventorys=new ArrayList<>();
 
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeign.java

@@ -1,6 +1,10 @@
 package com.yxt.wms.feign.base.basegoodssku;
 
+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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.ApiOperation;
@@ -30,5 +34,8 @@ public interface BaseGoodsSkuFeign {
     @ApiOperation("查询组织下所有商品")
     @PostMapping("/listAllByOrg")
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query);
+    @ApiOperation("入库添加商品列表")
+    @PostMapping("/getSelectList")
+    ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery);
 
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

@@ -1,6 +1,10 @@
 package com.yxt.wms.feign.base.basegoodssku;
 
+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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
@@ -23,4 +27,9 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+        return null;
+    }
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java

@@ -44,5 +44,7 @@ public interface PurchaseInventoryBillFeign {
     @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")
     ResultBean delBySids(@RequestBody String[] sids);
-
+    @ApiOperation("生成验货入库")
+    @PostMapping("/inspectionWarehousing")
+    ResultBean<String> inspectionWarehousing(@RequestBody PurchaseInventoryBillDto2 dto);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java

@@ -56,4 +56,9 @@ public class PurchaseInventoryBillFeignFallback implements PurchaseInventoryBill
 	public ResultBean delBySids(String[] sids) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> inspectionWarehousing(PurchaseInventoryBillDto2 dto) {
+		return null;
+	}
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java

@@ -35,7 +35,13 @@ public interface WarehouseInventoryFeign {
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryQuery> pq);
+    @ApiOperation("分页列表")
+    @PostMapping("/locationListPage")
+    public ResultBean<PagerVo<WarehouseInventoryVo>> locationListPage(@RequestBody PagerQuery<WarehouseInventoryQuery> pq);
 
+    @ApiOperation("查询库位商品数量")
+    @PostMapping("/getRackCountBySid")
+    ResultBean getRackCountBySid(@RequestBody WarehouseInventoryRackCountQuery query);
     @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")
     ResultBean delBySids(@RequestBody String[] sids);

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java

@@ -29,6 +29,16 @@ public class WarehouseInventoryFeignFallback implements WarehouseInventoryFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<WarehouseInventoryVo>> locationListPage(PagerQuery<WarehouseInventoryQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean getRackCountBySid(WarehouseInventoryRackCountQuery query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean delBySids(String[] sids) {
 		return null;