diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseRackRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseRackRest.java index 0d48343..d34574c 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseRackRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseRackRest.java @@ -74,4 +74,9 @@ public class WarehouseRackRest { public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){ return wmsWarehouseRackService.selectAll(ckSid); } + @ApiOperation("根据库区sid查询所有库位") + @GetMapping("/getAllTypeByAreaSid") + public ResultBean> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) { + return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid); + } } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java index 6ac736f..8a0287e 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java @@ -16,6 +16,9 @@ public class WarehouseInventoryQuery implements Query { @ApiModelProperty("仓库") private String warehouseSid; + private String warehouse; + private String warehouseRackSid; + private String warehouseAreaSid; @ApiModelProperty("商品名称") private String goodsSpuSid; private String brandSid; @@ -37,5 +40,6 @@ public class WarehouseInventoryQuery implements Query { private int index; + //供应商 } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java index 871ed8c..7b26edb 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java @@ -79,9 +79,9 @@ public class WarehouseInventoryService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb =new ResultBean().fail(); WarehouseInventoryHistoryQuery query = pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + PagerVo vo=warehouseInventoryHistoryFeign.listPage(pq).getData(); + for (WarehouseInventoryHistoryVo record : vo.getRecords()) { + BaseGoodsSpuVo v=baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()).getData(); + for (WarehouseInventoryHistoryVo child : record.getChildren()) { + BaseGoodsSkuExtendVo vp=baseGoodsSkuExtendFeign.getExtendBySkuSid(child.getGoodsSkuSid()).getData(); + child.setVolume(vp.getVolume()); + child.setWeight(vp.getWeight()); + } - return warehouseInventoryHistoryFeign.listPage(pq); + record.setBarCode(v.getBarCode()); + record.setGoodsSpuCode(v.getGoodsCode()); + } + return rb.success().setData(vo); } 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 index 585abcc..34b2732 100644 --- 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 @@ -15,6 +15,8 @@ import java.util.List; */ @Data public class WarehouseInventoryHistoryVo implements Vo { + private String sid; + private String mainSid="0"; @ApiModelProperty("批次号") private String batchNumber; @ApiModelProperty("商品基础信息sid") @@ -27,14 +29,17 @@ public class WarehouseInventoryHistoryVo implements Vo { private String goodsSkuTitle; @ApiModelProperty("商品编码（图号）") private String goodsSkuCode; + private String goodsSpuCode; + private String barCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") private String unit; - @ApiModelProperty("现有量") + @ApiModelProperty("数量") private BigDecimal count; - + private double weight; + private double volume; private Date orderDate; - private List list=new ArrayList<>(); + private List children=new ArrayList<>(); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java index c2e267c..f7405c7 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java @@ -107,4 +107,8 @@ public class WarehouseRackService extends MybatisBaseService> selectAll(String ckSid){ return warehouseRackFeign.selectAll(ckSid); } + public ResultBean> getAllTypeByAreaSid(String areaSid) { + ResultBean rb = ResultBean.fireFail(); + return warehouseRackFeign.getAllTypeByAreaSid(areaSid); + } } diff --git a/wms/src/main/java/com/yxt/wms/feign/base/basegoodsskuextend/BaseGoodsSkuExtendFeign.java b/wms/src/main/java/com/yxt/wms/feign/base/basegoodsskuextend/BaseGoodsSkuExtendFeign.java new file mode 100644 index 0000000..9784ec8 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/base/basegoodsskuextend/BaseGoodsSkuExtendFeign.java @@ -0,0 +1,33 @@ +package com.yxt.wms.feign.base.basegoodsskuextend; + +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.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; +import com.yxt.wms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@FeignClient( + contextId = "yss-common-goods-GoodsSkuExtend", + name = "ss-common-goods", + path = "/apiadmin/base/basegoodsskuextend", + fallback = BaseGoodsSkuExtendFeignFallback.class) +public interface BaseGoodsSkuExtendFeign { + + @ApiOperation("获取扩展") + @GetMapping("/getExtendBySkuSid/{sid}") + public ResultBean getExtendBySkuSid(@PathVariable("sid") String sid); +} diff --git a/wms/src/main/java/com/yxt/wms/feign/base/basegoodsskuextend/BaseGoodsSkuExtendFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/base/basegoodsskuextend/BaseGoodsSkuExtendFeignFallback.java new file mode 100644 index 0000000..7fedee0 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/base/basegoodsskuextend/BaseGoodsSkuExtendFeignFallback.java @@ -0,0 +1,28 @@ +package com.yxt.wms.feign.base.basegoodsskuextend; + +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.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; +import com.yxt.wms.utils.OrgPathQuery; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@Component +public class BaseGoodsSkuExtendFeignFallback implements BaseGoodsSkuExtendFeign { + + @Override + public ResultBean getExtendBySkuSid(String sid) { + return null; + } +} diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java index cb008b2..f11f9bb 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java @@ -67,4 +67,7 @@ public interface WarehouseRackFeign { @ApiOperation("根据仓库sid查询所有库位") @GetMapping("/selectAll") public ResultBean> selectAll(@RequestParam("ckSid") String ckSid); + @ApiOperation("根据库区sid查询所有库位") + @GetMapping("/getAllTypeByAreaSid") + public ResultBean> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid); } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java index e60ac54..c03511f 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java @@ -71,4 +71,9 @@ public class WarehouseRackFeignFallback implements WarehouseRackFeign { public ResultBean> selectAll(String ckSid) { return null; } + + @Override + public ResultBean> getAllTypeByAreaSid(String areaSid) { + return null; + } } \ No newline at end of file