库存调整

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

@@ -3,10 +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.inventoryadjustment.InventoryAdjustmentDto;
-import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentQuery;
-import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentService;
-import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentVo;
+import com.yxt.wms.biz.func.inventoryadjustment.*;
+import com.yxt.wms.biz.func.warehouseinventory.AvailableCountVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author wangpengfei
@@ -72,4 +71,9 @@ public class InventoryAdjustmentRest {
     public void  download(HttpServletRequest request, HttpServletResponse response) {
         inventoryAdjustmentService.download(request, response);
     }
+    @ApiOperation("调整库存")
+    @PostMapping("/adjustment")
+    public ResultBean adjustment(@RequestBody adjustmentDto dto) {
+        return inventoryAdjustmentService.adjustment(dto);
+    }
 }

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

@@ -138,4 +138,14 @@ public class WarehouseInventoryRest {
                                                                    @RequestParam("orgSid") String orgSid) {
         return warehouseInventoryService.selAvailableBySkuSid(skuSid,sourceBillSid,orgSid);
     }
+    @ApiOperation("根据skuSid查询商品可用库存")
+    @PostMapping("/selAvailBySkuSid")
+    public ResultBean<List<AvailableCountVo>> selAvailBySkuSid(@RequestBody WarehouseInventoryQuery query) {
+        return warehouseInventoryService.selAvailBySkuSid(query);
+    }
+//    @ApiOperation("根据skuSid查询商品可用库存")
+//    @PostMapping("/adjustment")
+//    public ResultBean<List<AvailableCountVo>> adjustment(@RequestBody WarehouseInventoryDto dto) {
+//        return warehouseInventoryService.adjustment(dto);
+//    }
 }

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustment/InventoryAdjustmentService.java

@@ -17,6 +17,7 @@ import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailVo;
 import com.yxt.wms.biz.func.warehouseinfo.WarehouseInfoVo;
+import com.yxt.wms.biz.func.warehouseinventory.AvailableCountVo;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
 import com.yxt.wms.feign.base.basegoodsspu.BaseGoodsSpuFeign;
@@ -191,4 +192,9 @@ public class InventoryAdjustmentService extends MybatisBaseService<InventoryAdju
         }
         return vo2;
     }
+    public ResultBean adjustment(adjustmentDto dto) {
+        ResultBean rb =new ResultBean().fail();
+        inventoryAdjustmentFeign.adjustment(dto);
+        return rb.success().setData("成功");
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustment/InventoryAdjustmentVo.java

@@ -25,8 +25,10 @@ public class InventoryAdjustmentVo implements Vo {
     private String remarks;
     private String isEnable;
     private String state;
+    private String stateValue;
     private String isDelete;
     private String type;//库位名称
+    private String typeValue;//库位
     private String billNo;//库位编码
     private String warehouseSid;//仓库sid
     private String warehouseName;//库位容量

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetail.java

@@ -26,4 +26,8 @@ public class InventoryAdjustmentDetail extends BaseEntity {
     private String goodsSkuOwnSpec;//商品规格
     private String count;
     private String unit;
+    private String brandSid;
+    private String brandName;
+    private String typeSid;
+    private String typeName;
 }

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetailDto.java

@@ -35,5 +35,9 @@ public class InventoryAdjustmentDetailDto implements Dto {
     private String count;
     private String unit;
     private String userSid;
+    private String brandSid;
+    private String brandName;
+    private String typeSid;
+    private String typeName;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetailQuery.java

@@ -12,10 +12,10 @@ import lombok.Data;
 public class InventoryAdjustmentDetailQuery implements Query {
     private String end;//结束
     private String start;//开始
-    private String brandSid;//单据
+    private String warehouseSid;//单据
     private String goodsSkuSid;//商品
-    private String type;//类型
-    private String operator;//操作员
+    private String typeSid;//类型
+    private String brandSid;//操作员
 
 
     private String orgLevelKey;//

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetailVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -39,5 +40,11 @@ public class InventoryAdjustmentDetailVo implements Vo {
     private String goodsSkuOwnSpec;//商品规格
     private String count;
     private String unit;
+    private BigDecimal useCount;
+    private String brandSid;
+    private String brandName;
+    private String typeSid;
+    private String typeName;
+
 
 }

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

@@ -14,15 +14,20 @@ public class AvailableCountVo {
     private String inventorySid;//库存sid
     private String locationSid;//分配明细sid
     private String goodsSkuSid;//skusid
+    private String goodsSpuSid;//skusid
     private String goodsSpuName;//名
     private String goodsSkuTitle;//title
     private String goodsSkuOwnSpec;//商品规格
+
     private String warehouseName;//仓库名
     private String warehouseSid;//仓库sid
     private String areaName;//库区名
     private String rackSid;//库位sid
     private String rackName;//库位名
     private String rackCode;//库位
+    private String goodsSkuCode;//库位
+    private String goodsSpuCode;//库位
+    private String barCode;//库位
     private BigDecimal useCount;//可用
     private BigDecimal initialCount=new BigDecimal(0);//原分配数
     private BigDecimal count=new BigDecimal(0);//分配数

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

@@ -30,6 +30,9 @@ public class WarehouseInventoryQuery implements Query {
     private String ifWarning;
     private String createTime;
 
+    private String goodsSkuSid; //0 未设置 1 设置
+    private String rackSid; //0 未设置 1 设置
+    private String orgSid; //0 未设置 1 设置
     @ApiModelProperty("条码")
     private String barCode;
     private String itemNumber;

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

@@ -291,4 +291,15 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     public ResultBean<List<AvailableCountVo>> selAvailableBySkuSid(String skuSid,String sourceBillSid,String orgSid) {
         return warehouseInventoryFeign.selAvailableBySkuSid(skuSid,sourceBillSid,orgSid);
     }
+    public ResultBean<List<AvailableCountVo>> selAvailBySkuSid(WarehouseInventoryQuery query) {
+        ResultBean rb =new ResultBean().fail();
+        List<AvailableCountVo>availableCountVos=warehouseInventoryFeign.selAvailBySkuSid(query).getData();
+        for (AvailableCountVo record : availableCountVos) {
+            BaseGoodsSpuVo v=baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()).getData();
+            record.setBarCode(v.getBarCode());
+            record.setGoodsSpuCode(v.getGoodsCode());
+        }
+        return rb.success().setData(availableCountVos);
+    }
+
 }

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

@@ -70,7 +70,9 @@ public class WarehouseInventoryVo implements Vo {
     @ApiModelProperty("序列号")
     private String serialNumber;
     private String brandName;
+    private String brandSid;
     private String typeName;
+    private String typeSid;
     private String alertUpperLimit;//上限
     private String warningLowerLimit;//下限
     private List<WarehouseInventoryVo> children=new ArrayList<>();

wms/src/main/java/com/yxt/wms/biz/func/warehousezone/WarehouseZoneInitVo.java

@@ -19,6 +19,8 @@ public class WarehouseZoneInitVo {
     private String volume;//区域面积
     private String unit;//计量单位
     private String userSid; //用户sid
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
 
 
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/inventoryadjustment/InventoryAdjustmentFeign.java

@@ -6,7 +6,9 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentDto;
 import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentQuery;
 import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentVo;
+import com.yxt.wms.biz.func.inventoryadjustment.adjustmentDto;
 import com.yxt.wms.biz.func.warehousearea.*;
+import com.yxt.wms.biz.func.warehouseinventory.AvailableCountVo;
 import com.yxt.wms.feign.warehouse.warehousearea.WarehouseAreaFeignFallback;
 import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
@@ -57,4 +59,7 @@ public interface InventoryAdjustmentFeign {
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids);
+    @ApiOperation("调整库存")
+    @PostMapping("/adjustment")
+    public ResultBean adjustment(@RequestBody adjustmentDto dto);
 }

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

@@ -104,4 +104,8 @@ public interface WarehouseInventoryFeign {
     public ResultBean<List<AvailableCountVo>> selAvailableBySkuSid(@RequestParam("skuSid") String skuSid,
                                                                    @RequestParam("sourceBillSid") String sourceBillSid,
                                                                    @RequestParam("orgSid") String orgSid) ;
+
+    @ApiOperation("根据skuSid查询商品可用库存")
+    @PostMapping("/selAvailBySkuSid")
+    public ResultBean<List<AvailableCountVo>> selAvailBySkuSid(@RequestBody WarehouseInventoryQuery query);
 }

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

@@ -119,4 +119,11 @@ public class WarehouseInventoryFeignFallback implements WarehouseInventoryFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<AvailableCountVo>> selAvailBySkuSid(WarehouseInventoryQuery query) {
+		return null;
+	}
+
+
+
 }