库存

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

@@ -74,4 +74,9 @@ public class WarehouseRackRest {
     public ResultBean<List<WarehouseRackVo>> selectAll(@RequestParam("ckSid") String ckSid){
         return wmsWarehouseRackService.selectAll(ckSid);
     }
+    @ApiOperation("根据库区sid查询所有库位")
+    @GetMapping("/getAllTypeByAreaSid")
+    public ResultBean<List<WarehouseRackVo>> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) {
+        return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid);
+    }
 }

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

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

@@ -79,9 +79,9 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
             record.setSid(record.getGoodsSpuSid());
             record.setBarCode(v.getBarCode());
             record.setGoodsSpuCode(v.getGoodsCode());
-            for (WarehouseInventoryVo child : record.getChildren()) {
-                child.setSid(child.getGoodsSkuSid());
-            }
+//            for (WarehouseInventoryVo child : record.getChildren()) {
+//                child.setSid(child.getGoodsSkuSid());
+//            }
         }
         return rb.success().setData(warehouseInventoryVoPagerVo);
     }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java

@@ -10,12 +10,11 @@ import lombok.Data;
  */
 @Data
 public class WarehouseInventoryHistoryQuery implements Query {
-
     @ApiModelProperty("商品编码")
     private String goodsSkuCode;
 
     @ApiModelProperty("仓库")
-    private String warehouseSid;
+    private String goodsTypeSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuSid;
     private String brandSid;
@@ -26,7 +25,7 @@ public class WarehouseInventoryHistoryQuery implements Query {
 
     @ApiModelProperty("条码")
     private String barCode;
-    private String hh;
+    private String createDateEnd;
     private String orgLevelKey;//权限等级
     @ApiModelProperty("菜单路由")
     private String menuUrl;
@@ -37,6 +36,5 @@ public class WarehouseInventoryHistoryQuery implements Query {
     private int index;
 
 
-
     //供应商
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryhistory/WarehouseInventoryHistoryService.java

@@ -8,12 +8,20 @@ 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.basegoodsskuextend.BaseGoodsSkuExtendVo;
+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.warehouseinventory.WarehouseInventoryQuery;
 import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryService;
+import com.yxt.wms.feign.base.basegoodsskuextend.BaseGoodsSkuExtendFeign;
+import com.yxt.wms.feign.base.basegoodsspu.BaseGoodsSpuFeign;
 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 javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,12 +34,31 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou
 
     @Autowired
     WarehouseInventoryHistoryFeign warehouseInventoryHistoryFeign;
-
+    @Resource
+    private BaseGoodsSpuFeign baseGoodsSpuFeign;
+    @Autowired
+    private BaseGoodsSkuExtendFeign baseGoodsSkuExtendFeign;
+    @Autowired
+    private CommonMethod commonMethod;
     public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> 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<WarehouseInventoryHistoryVo> 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);
     }
 
 

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

wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -107,4 +107,8 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     public ResultBean<List<WarehouseRackVo>> selectAll(String ckSid){
         return warehouseRackFeign.selectAll(ckSid);
     }
+    public ResultBean<List<WarehouseRackVo>> getAllTypeByAreaSid(String areaSid) {
+        ResultBean rb = ResultBean.fireFail();
+        return warehouseRackFeign.getAllTypeByAreaSid(areaSid);
+    }
 }

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<BaseGoodsSkuExtendVo> getExtendBySkuSid(@PathVariable("sid") String sid);
+}

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<BaseGoodsSkuExtendVo> getExtendBySkuSid(String sid) {
+        return null;
+    }
+}

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<List<WarehouseRackVo>> selectAll(@RequestParam("ckSid") String ckSid);
+    @ApiOperation("根据库区sid查询所有库位")
+    @GetMapping("/getAllTypeByAreaSid")
+    public ResultBean<List<WarehouseRackVo>> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java

@@ -71,4 +71,9 @@ public class WarehouseRackFeignFallback implements WarehouseRackFeign {
 	public ResultBean<List<WarehouseRackVo>> selectAll(String ckSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<WarehouseRackVo>> getAllTypeByAreaSid(String areaSid) {
+		return null;
+	}
 }