6/26

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

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryMapper">
+<mapper namespace="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryVo">
         select a.goodsID,
         a.sid,
         a.goodsSpuName,
@@ -22,7 +22,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="initialization" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo">
+    <select id="initialization" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryVo">
         select a.*,
                b.goodsName as goodsName
         from wms_inventory a
@@ -70,7 +70,7 @@
         </foreach>
     </update>
 
-    <select id="getBillList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillListVo">
+    <select id="getBillList" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryBillListVo">
         select *
         from (select wd.goodsSpuName,
         wd.goodsSkuTitle,
@@ -123,7 +123,7 @@
         </where>
     </select>
 
-    <select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo">
+    <select id="listExcel" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryVoExcelVo">
         select a.*,
         (@rank := @rank + 1) rankNo
         from (SELECT @rank := 0) t,
@@ -132,7 +132,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="listPageSales" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySalesVo">
+    <select id="listPageSales" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventorySalesVo">
         SELECT i.sid AS inventorySid,
         i.goodsID,
         i.goodSpuSid,
@@ -150,7 +150,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getPackageGoodsVo" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryPackageVo">
+    <select id="getPackageGoodsVo" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryPackageVo">
         SELECT v.goodSpuSid goodsSid,
         v.goodsSpuName goodsName,
         v.goodsSkuCode goodsCode,
@@ -168,7 +168,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="inventoryAgeList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAgeVo">
+    <select id="inventoryAgeList" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryAgeVo">
         SELECT sid,
         goodsSpuName,
         goodsSkuTitle,
@@ -186,7 +186,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="ageExportExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAgeExportVo">
+    <select id="ageExportExcel" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryAgeExportVo">
         SELECT
         ( @rank := @rank + 1 ) rankNo,
         w.sid,
@@ -205,7 +205,7 @@
         <where>${ew.sqlSegment}</where>
     </select>
 
-    <select id="selectInvenBySkuSid" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsGoodsInventoryVo">
+    <select id="selectInvenBySkuSid" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseGoodsInventoryVo">
         SELECT goodsSkuOwnSpec,
                warehouseSid,
                warehouseName,
@@ -215,7 +215,7 @@
         WHERE goodsSkuSid = #{skuSid}
     </select>
 
-    <select id="invenGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryInvenSelectList">
+    <select id="invenGoodsListPage" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryInvenSelectList">
         SELECT wi.sid,
         wi.goodsSpuName,
         wi.goodsSkuCode,
@@ -235,7 +235,7 @@
         </where>
     </select>
 
-    <select id="alloGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAlloSelectList">
+    <select id="alloGoodsListPage" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryAlloSelectList">
         SELECT wi.sid,
         wi.goodsSpuName,
         wi.goodsSkuCode,
@@ -255,7 +255,7 @@
         </where>
     </select>
 
-    <select id="returnGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryReturnSelectList">
+    <select id="returnGoodsListPage" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryReturnSelectList">
         SELECT
         wi.goodsSpuName,
         wi.goodsSkuCode,
@@ -268,7 +268,7 @@
         </where>
     </select>
 
-    <select id="handleGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryHandleSelectList">
+    <select id="handleGoodsListPage" resultType="com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryHandleSelectList">
         SELECT
         wi.goodsID,
         wi.goodsSpuName,

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java → 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;
 

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java → 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;
 

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;
 
 /**

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillMapper">
-    <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillVo">
+<mapper namespace="com.yxt.wms.biz.func.warehouseoutbill.WarehouseOutBillMapper">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.warehouseoutbill.WarehouseOutBillVo">
         select wob.sid,
                wob.billNo,
                DATE_FORMAT(wob.createTime, '%Y-%m-%d') as createTime,
@@ -16,7 +16,7 @@
         order by wob.id desc
     </select>
 
-    <select id="details" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillDetailsVo">
+    <select id="details" resultType="com.yxt.wms.biz.func.warehouseoutbill.WarehouseOutBillDetailsVo">
         select wob.sid,
                wob.createBySid,
                wob.createByName,
@@ -30,7 +30,7 @@
         where sid = #{sid}
     </select>
 
-    <select id="getInventoryList" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillInventoryVo">
+    <select id="getInventoryList" resultType="com.yxt.wms.biz.func.warehouseoutbill.WarehouseOutBillInventoryVo">
         select wi.goodsID,
         wi.goodSpuSid,
         wi.goodsSpuName,

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;

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;
 
 /**

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;
 
 /**

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;

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(门户建设) <br/>
  * File: SysRoleFeign.java <br/>

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;
 
 /**