diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java index ba7703f..83f5727 100644 --- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java @@ -1,19 +1,15 @@ package com.yxt.wms.apiadmin.aggregation; -import com.yxt.common.base.utils.ExportExcelUtils; 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.warehousesinventory.*; +import com.yxt.wms.biz.func.warehouseinventory.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.List; /** * @author wangpengfei diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseGoodsInventoryVo.java similarity index 89% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseGoodsInventoryVo.java index 8703347..8adb5b6 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseGoodsInventoryVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventory.java similarity index 97% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventory.java index b879850..c453fe0 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventory.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeExportVo.java similarity index 96% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeExportVo.java index fab4d0a..894cd73 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeExportVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.utils.ExportEntityMap; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeQuery.java similarity index 94% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeQuery.java index f6f70d8..c10b1ca 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeVo.java similarity index 94% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeVo.java index 39c1e4a..92f2cc5 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAgeVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAlloSelectList.java similarity index 93% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAlloSelectList.java index a3749d5..231bc1b 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAlloSelectList.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAlloSelectQuery.java similarity index 92% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAlloSelectQuery.java index 8defb34..af4bc04 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryAlloSelectQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryBillListQuery.java similarity index 88% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryBillListQuery.java index 380af19..56d5d90 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryBillListQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryBillListVo.java similarity index 95% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryBillListVo.java index 0db7a74..fe15b27 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryBillListVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryDto.java similarity index 97% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryDto.java index 17b6f06..b5ea30d 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryDto.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryHandleSelectList.java similarity index 93% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryHandleSelectList.java index b8583fe..de5d483 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryHandleSelectList.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryHandleSelectQuery.java similarity index 90% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryHandleSelectQuery.java index 9142321..8e7b4b7 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryHandleSelectQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInitVo.java similarity index 94% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInitVo.java index 0b93aca..d176228 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInitVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInvenSelectList.java similarity index 93% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInvenSelectList.java index cf46599..4fc7f49 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInvenSelectList.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInvenSelectQuery.java similarity index 92% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInvenSelectQuery.java index 83baf75..94db20d 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryInvenSelectQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.java index 9c5404d..33baa57 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.xml similarity index 85% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.xml index c8fac9c..10bf435 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.xml @@ -1,10 +1,10 @@ - + - select a.goodsID, a.sid, a.goodsSpuName, @@ -22,7 +22,7 @@ ${ew.sqlSegment} - select a.*, b.goodsName as goodsName from wms_inventory a @@ -70,7 +70,7 @@ - select * from (select wd.goodsSpuName, wd.goodsSkuTitle, @@ -123,7 +123,7 @@ - select a.*, (@rank := @rank + 1) rankNo from (SELECT @rank := 0) t, @@ -132,7 +132,7 @@ ${ew.sqlSegment} - SELECT i.sid AS inventorySid, i.goodsID, i.goodSpuSid, @@ -150,7 +150,7 @@ ${ew.sqlSegment} - SELECT v.goodSpuSid goodsSid, v.goodsSpuName goodsName, v.goodsSkuCode goodsCode, @@ -168,7 +168,7 @@ ${ew.sqlSegment} - SELECT sid, goodsSpuName, goodsSkuTitle, @@ -186,7 +186,7 @@ ${ew.sqlSegment} - SELECT ( @rank := @rank + 1 ) rankNo, w.sid, @@ -205,7 +205,7 @@ ${ew.sqlSegment} - SELECT goodsSkuOwnSpec, warehouseSid, warehouseName, @@ -215,7 +215,7 @@ WHERE goodsSkuSid = #{skuSid} - SELECT wi.sid, wi.goodsSpuName, wi.goodsSkuCode, @@ -235,7 +235,7 @@ - SELECT wi.sid, wi.goodsSpuName, wi.goodsSkuCode, @@ -255,7 +255,7 @@ - SELECT wi.goodsSpuName, wi.goodsSkuCode, @@ -268,7 +268,7 @@ - SELECT wi.goodsID, wi.goodsSpuName, diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryPackageQuery.java similarity index 94% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryPackageQuery.java index bea29e1..d48c940 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryPackageQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryPackageVo.java similarity index 96% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryPackageVo.java index 25ba73f..b53bb01 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryPackageVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java similarity index 92% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java index 9819943..5e6c781 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryReturnSelectList.java similarity index 86% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryReturnSelectList.java index 56582d3..99b100a 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryReturnSelectList.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryReturnSelectQuery.java similarity index 92% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryReturnSelectQuery.java index 3503b23..3abc7eb 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryReturnSelectQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySalesQuery.java similarity index 84% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySalesQuery.java index c9027aa..cdc6567 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySalesQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySalesVo.java similarity index 93% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySalesVo.java index 3a1d1de..dc68b77 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySalesVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySaveDto.java similarity index 97% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySaveDto.java index 7a10147..e846653 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventorySaveDto.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java index a4e160f..6ed5713 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java @@ -1,23 +1,19 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; 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.sysorganization.SysOrganizationVo; -import com.yxt.wms.biz.func.warehousesinventory.*; 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; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryUpdateDto.java similarity index 93% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryUpdateDto.java index c0f9913..5c05693 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryUpdateDto.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryUpdatePrice.java similarity index 88% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryUpdatePrice.java index 5a519d1..f3f250e 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryUpdatePrice.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVo.java similarity index 95% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVo.java index 5f777ca..d8b9e4d 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVoExcelVo.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVoExcelVo.java index 12c49dd..95e3cb1 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVoExcelVo.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import com.yxt.common.core.utils.ExportEntityMap; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseUpdateCountQuery.java similarity index 84% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseUpdateCountQuery.java index 08de11b..6cdecc3 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseUpdateCountQuery.java @@ -1,4 +1,4 @@ -package com.yxt.wms.biz.func.warehousesinventory; +package com.yxt.wms.biz.func.warehouseinventory; import lombok.Data; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java index 63bb745..cf7d351 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordService.java @@ -25,32 +25,19 @@ *********************************************************/ package com.yxt.wms.biz.func.warehouseinventoryrecord; -import cn.hutool.core.bean.BeanUtil; -import com.alibaba.nacos.common.model.RestResult; 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.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.warehouseinventoryrecord.*; import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; import com.yxt.wms.biz.func.warehouseoldinventory.WarehouseOldInventoryDetailsListVo; -import com.yxt.wms.biz.func.warehousesinventory.WarehouseInventory; -import com.yxt.wms.biz.func.warehousesinventory.WarehouseInventoryService; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.portal.sysuser.SysUserVo; import com.yxt.wms.feign.warehouse.warehouseinventoryrecord.WarehouseInventoryRecordFeign; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; import java.util.List; /** diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml index b840e7d..2a7847b 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml @@ -1,7 +1,7 @@ - - select wob.sid, wob.billNo, DATE_FORMAT(wob.createTime, '%Y-%m-%d') as createTime, @@ -16,7 +16,7 @@ order by wob.id desc - select wob.sid, wob.createBySid, wob.createByName, @@ -30,7 +30,7 @@ where sid = #{sid} - select wi.goodsID, wi.goodSpuSid, wi.goodsSpuName, diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java index 2381b4a..a0738c7 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java @@ -7,7 +7,6 @@ import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckb import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillDto; import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillQuery; import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillVo; -import com.yxt.wms.biz.func.warehousesinventory.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java index 52d6dea..ee967ab 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java @@ -7,7 +7,6 @@ import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckb import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillDto; import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillQuery; import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillVo; -import com.yxt.wms.biz.func.warehousesinventory.*; import org.springframework.stereotype.Component; /** diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java index d2e4348..bcd6de7 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java @@ -1,19 +1,15 @@ package com.yxt.wms.feign.warehouse.warehouseinventoryrecord; -import com.yxt.common.base.utils.ExportExcelUtils; 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.warehouseinventoryrecord.*; import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; -import com.yxt.wms.biz.func.warehousesinventory.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.util.List; /** diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java index 0fe7b6d..3613e34 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeignFallback.java @@ -5,7 +5,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.warehouseinventoryrecord.*; import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; -import com.yxt.wms.biz.func.warehousesinventory.*; import org.springframework.stereotype.Component; import java.util.List; diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java index 0c9ceb2..4dbdab1 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java @@ -1,20 +1,14 @@ package com.yxt.wms.feign.warehouse.warehousesinventory; -import com.yxt.common.base.utils.ExportExcelUtils; 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.warehouseshelfbill.*; -import com.yxt.wms.biz.func.warehousesinventory.*; +import com.yxt.wms.biz.func.warehouseinventory.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.List; - /** * Project: anrui_portal(门户建设)
* File: SysRoleFeign.java
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java index 44a99c1..d292f12 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java @@ -3,8 +3,7 @@ package com.yxt.wms.feign.warehouse.warehousesinventory; 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.warehouseshelfbill.*; -import com.yxt.wms.biz.func.warehousesinventory.*; +import com.yxt.wms.biz.func.warehouseinventory.*; import org.springframework.stereotype.Component; /**