仓库子服务重命名

pom.xml

@@ -11,8 +11,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ss-common-storage</artifactId>
-    <groupId>ss-common-storage</groupId>
+    <artifactId>ss-common-warehouse</artifactId>
+    <groupId>ss-common-warehouse</groupId>
     <version>0.0.1</version>
 
     <dependencies>

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java

@@ -1,24 +0,0 @@
-package com.yxt.storage.biz.storageansbill;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetail;
-import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/9
- **/
-@Mapper
-public interface StorageAnsBillMapper extends BaseMapper<StorageAnsBill> {
-    IPage<StorageAnsBillDetailVo> listPage(IPage<StorageAnsBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<StorageAnsBillDetail> qw);
-
-    IPage<StorageAnsBillVo> listPages(IPage<StorageAnsBill> page, @Param(Constants.WRAPPER) QueryWrapper<StorageAnsBill> qw);
-
-    StorageAnsDetailsVo details(String sid);
-}

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml

@@ -1,25 +0,0 @@
-<?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.storage.biz.storageansbilldetail.StorageAnsBillDetailMapper">
-    <delete id="deleteDetails">
-        delete
-        from storage_ans_bill_detail
-        where billSid = #{sid}
-    </delete>
-
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo">
-        select wd.goodsSkuTitle,
-               wd.goodsSkuCode,
-               wd.goodsSkuOwnSpec,
-               wd.unit,
-               wd.orderCount,
-               wd.waitInCount,
-               wd.actualInCount,
-               wd.cost,
-               wd.taxAmount,
-               wd.taxPrice,
-               wd.amount
-        from storage_ans_bill_detail wd
-        where billSid = #{sid}
-    </select>
-</mapper>

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java

@@ -1,29 +0,0 @@
-package com.yxt.storage.biz.storageansbilldetail;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.yxt.common.base.service.MybatisBaseService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/9
- **/
-@Service
-public class StorageAnsBillDetailService extends MybatisBaseService<StorageAnsBillDetailMapper, StorageAnsBillDetail> {
-    public void saveOrUpdateDetailsList(String sid, List<StorageAnsBillDetailDto> StorageAnsBillDetailList) {
-        baseMapper.deleteDetails(sid);
-        StorageAnsBillDetailList.forEach(v->{
-            StorageAnsBillDetail StorageAnsBillDetail = new StorageAnsBillDetail();
-            BeanUtil.copyProperties(v,StorageAnsBillDetail,"sid");
-            StorageAnsBillDetail.setBillSid(sid);
-            baseMapper.insert(StorageAnsBillDetail);
-        });
-    }
-
-    public List<StorageAnsListDetailsVo> selectByBillSid(String sid) {
-        return baseMapper.selectByBillSid(sid);
-    }
-}

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java

@@ -1,16 +0,0 @@
-package com.yxt.storage.biz.storageinventoryrecord;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/24
- **/
-@Mapper
-public interface StorageInventoryRecordMapper extends BaseMapper<StorageInventoryRecord> {
-    List<StorageInventoryRecordListVo> getStorageInventoryRecordList(String sid);
-}

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml

@@ -1,16 +0,0 @@
-<?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.storage.biz.storageinventoryrecord.StorageInventoryRecordMapper">
-    <select id="getStorageInventoryRecordList" resultType="com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordListVo">
-        select wir.billNo,
-               case wir.billType when 1 then '入库' when 0 then '出库' end as billType,
-               DATE_FORMAT(wir.createTime, '%Y-%m-%d')                 as createTime,
-               wir.busTypeValue,
-               wir.billObjName,
-               wir.count,
-               wir.currentCount
-        from storage_inventory_record wir
-        where wir.inventorySid = #{sid}
-        order by wir.createTime desc
-    </select>
-</mapper>

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml

@@ -1,42 +0,0 @@
-<?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.storage.biz.storagereceiptbill.StorageReceiptBillMapper">
-    <select id="listPage" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillPageVo">
-        select wrb.sid,
-               wrb.billNo,
-               wrb.createByName,
-               wrb.sourceBillNo,
-               wrb.busTypeValue,
-               wrb.supplierName,
-               DATE_FORMAT(wrb.createTime, '%Y-%m-%d')   as createTime,
-               DATE_FORMAT(wrb.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               wrb.billState
-        from wms_receipt_bill wrb
-        <where>
-            ${ew.sqlSegment}
-        </where>
-        order by wrb.id desc
-    </select>
-
-    <select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillInitVo">
-        select wrb.sid,
-               wrb.billNo,
-               wrb.sourceBillSid,
-               wrb.sourceBillNo,
-               wrb.createBySid,
-               wrb.createByName,
-               wrb.busTypeKey,
-               wrb.busTypeValue,
-               wrb.supplierSid,
-               wrb.supplierName,
-               DATE_FORMAT(wrb.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               case wrb.billState
-                   when '0' then '新建'
-                   when '1' then '已完成' end               as billState,
-               wrb.remarks,
-               wrb.useOrgSid,
-               wrb.createOrgSid
-        from wms_receipt_bill wrb
-        where wrb.sid = #{sid}
-    </select>
-</mapper>

src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java

@@ -1,21 +0,0 @@
-package com.yxt.storage.biz.storagereceiptbilldetail;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/3
- **/
-@Mapper
-public interface StorageReceiptBillDetailMapper extends BaseMapper<StorageReceiptBillDetail> {
-    int deleteByBillSid(String sid);
-
-    List<StorageReceiptBillDetailDto2> getDetailsInit(String sid);
-
-    List<StorageReceiptBillDetail> selectByBillSid(@Param("sid") String sid, @Param("sidList") List<String> sidList);
-}

src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml

@@ -1,42 +0,0 @@
-<?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.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper">
-    <delete id="deleteByBillSid">
-        delete
-        from wms_receipt_bill_detail
-        where billSid = #{sid}
-    </delete>
-
-    <select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2">
-        select wrbd.goodsSkuSid,
-               wrbd.goodsSkuTitle,
-               wrbd.goodsSkuCode,
-               wrbd.goodsSkuOwnSpec,
-               wrbd.unit,
-               wrbd.warehouseSid,
-               wrbd.warehouseName,
-               wrbd.warehouseRackSid,
-               wrbd.warehouseRackName,
-               wrbd.actualInCount,
-               wrbd.rejectCount,
-               wrbd.rejectReason,
-               wrbd.isQuality,
-               wrbd.qualityState,
-               wrbd.packageRemark,
-               wrbd.state,
-               wrbd.sid detailsSid
-        from wms_receipt_bill_detail wrbd
-        where billSid = #{sid}
-    </select>
-
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail">
-        select *
-        from wms_receipt_bill_detail where billSid = #{sid}
-        <if test="sidList != null and sidList.size() != 0">
-            and sid not in
-            <foreach collection="sidList" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-    </select>
-</mapper>

src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java

@@ -1,21 +0,0 @@
-package com.yxt.storage.biz.storagereceiptbilldetailbatch;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/12
- **/
-@Mapper
-public interface StorageReceiptBillDetailBatchMapper extends BaseMapper<StorageReceiptBillDetailBatch> {
-    int deleteByDetails(String sid);
-
-    List<StorageReceiptBillDetailBatchDto2> getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid);
-
-    StorageReceiptBillDetailBatch selectByDetails(String sid);
-}

src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml

@@ -1,27 +0,0 @@
-<?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.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper">
-    <delete id="deleteByDetails">
-        delete
-        from wms_receipt_bill_detail_batch
-        where billSid = #{sid}
-    </delete>
-
-    <select id="getDetailsInit"
-            resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2">
-        select wb.batchNumber,
-               DATE_FORMAT(wb.manufactureDate, '%Y-%m-%d') as manufactureDate,
-               DATE_FORMAT(wb.expirationDate, '%Y-%m-%d')  as expirationDate,
-               wb.batchCount
-        from wms_receipt_bill_detail_batch wb
-        where wb.billSid = #{sid}
-          and wb.detailSid = #{detailsSid}
-    </select>
-
-    <select id="selectByDetails"
-            resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch">
-        select *
-        from wms_receipt_bill_detail_batch
-        where detailSid = #{sid}
-    </select>
-</mapper>

src/main/java/com/yxt/storage/StorageApplication.java → src/main/java/com/yxt/warehouse/WarehouseApplication.java

@@ -1,4 +1,4 @@
-package com.yxt.storage;
+package com.yxt.warehouse;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,9 +17,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 // 启用自带定时任务
 @EnableScheduling
 @EnableFeignClients(basePackages = {"com.yxt.*.*"})
-public class StorageApplication {
+public class WarehouseApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(StorageApplication.class, args);
+        SpringApplication.run(WarehouseApplication.class, args);
     }
 }

src/main/java/com/yxt/storage/apiadmin/AdminHomeRest.java → src/main/java/com/yxt/warehouse/apiadmin/AdminHomeRest.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java

@@ -1,9 +1,9 @@
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.storage.biz.storageansbill.*;
+import com.yxt.warehouse.biz.warehouseansbill.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,29 +17,29 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "预期到货通知单")
 @RestController
 @RequestMapping("/apiadmin/WmsAnsBill")
-public class StorageAnsBillRest {
+public class WarehouseAnsBillRest {
 
     @Autowired
-    private StorageAnsBillService wmsAnsBillService;
+    private WarehouseAnsBillService wmsAnsBillService;
 
 
     @PostMapping("saveOrUpdate")
     @ApiOperation("新增修改保存")
-    ResultBean<String> saveOrUpdate(@RequestBody StorageAnsBillDto dto) {
+    ResultBean<String> saveOrUpdate(@RequestBody WarehouseAnsBillDto dto) {
         return wmsAnsBillService.saveOrUpdateBill(dto);
     }
 
     @PostMapping("listPage")
     @ApiOperation("分页列表")
-    ResultBean<PagerVo<StorageAnsBillVo>> listPage(@RequestBody PagerQuery<StorageAnsBillQuery> pagerQuery) {
-        ResultBean<PagerVo<StorageAnsBillVo>> rb = ResultBean.fireFail();
-        PagerVo<StorageAnsBillVo> pv = wmsAnsBillService.listPages(pagerQuery);
+    ResultBean<PagerVo<WarehouseAnsBillVo>> listPage(@RequestBody PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
+        ResultBean<PagerVo<WarehouseAnsBillVo>> rb = ResultBean.fireFail();
+        PagerVo<WarehouseAnsBillVo> pv = wmsAnsBillService.listPages(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @GetMapping("details")
     @ApiOperation("详情")
-    ResultBean<StorageAnsDetailsVo> details(@RequestParam("sid") String sid) {
+    ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsAnsBillService.details(sid);
     }
 

src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java

@@ -1,12 +1,12 @@
 
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 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.storage.biz.storageinventoryrecord.*;
+import com.yxt.warehouse.biz.warehouseinventoryrecord.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,33 +20,33 @@ import java.util.List;
 @Api(tags = "库存出入库记录")
 @RestController
 @RequestMapping("/apiadmin/inventory/Storageinventoryrecord")
-public class StorageInventoryRecordRest {
+public class WarehouseInventoryRecordRest {
 
     @Autowired
-    private StorageInventoryRecordService storageInventoryRecordService;
+    private WarehouseInventoryRecordService warehouseInventoryRecordService;
 
     @Autowired
     HttpServletResponse response;
 
     @ApiOperation("根据库存sid获取出入库记录")
     @GetMapping("/getStorageInventoryRecordList")
-    ResultBean<List<StorageInventoryRecordListVo>> getStorageInventoryRecordList(@RequestParam("sid") String sid) {
-        return storageInventoryRecordService.getStorageInventoryRecordList(sid);
+    ResultBean<List<WarehouseInventoryRecordListVo>> getStorageInventoryRecordList(@RequestParam("sid") String sid) {
+        return warehouseInventoryRecordService.getStorageInventoryRecordList(sid);
     }
 
     @ApiOperation("出入库查询")
     @PostMapping("/pageList")
-    ResultBean<PagerVo<StorageInventoryRecordsVo>> pageList(@RequestBody PagerQuery<StorageInventoryRecordsQuery> pagerQuery) {
-        ResultBean<PagerVo<StorageInventoryRecordsVo>> rb = ResultBean.fireFail();
-        PagerVo<StorageInventoryRecordsVo> pv = storageInventoryRecordService.listPage(pagerQuery);
+    ResultBean<PagerVo<WarehouseInventoryRecordsVo>> pageList(@RequestBody PagerQuery<WarehouseInventoryRecordsQuery> pagerQuery) {
+        ResultBean<PagerVo<WarehouseInventoryRecordsVo>> rb = ResultBean.fireFail();
+        PagerVo<WarehouseInventoryRecordsVo> pv = warehouseInventoryRecordService.listPage(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @PostMapping("/exportExcel")
     @ApiOperation(value = "导出")
-    public void exportExcel(@RequestBody StorageInventoryRecordsQuery query) {
+    public void exportExcel(@RequestBody WarehouseInventoryRecordsQuery query) {
         //得到所有要导出的数据
-        List<StorageInventoryRecordsExcelVo> exportVoList = storageInventoryRecordService.listExcel(query);
+        List<WarehouseInventoryRecordsExcelVo> exportVoList = warehouseInventoryRecordService.listExcel(query);
         //定义导出的excel名字
         String excelName = "出入库查询";
         String fileNameURL = "";
@@ -55,7 +55,7 @@ public class StorageInventoryRecordRest {
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        ExportExcelUtils.export(fileNameURL, exportVoList, StorageInventoryRecordsExcelVo.class, response);
+        ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseInventoryRecordsExcelVo.class, response);
 
     }
 }

src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java

@@ -1,11 +1,11 @@
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.storage.biz.storageinventory.StorageInventoryQuery;
-import com.yxt.storage.biz.storageinventory.StorageInventoryService;
-import com.yxt.storage.biz.storageinventory.StorageInventoryVo;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryQuery;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryService;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,19 +20,19 @@ import javax.servlet.http.HttpServletResponse;
 @Api(tags = "库存信息")
 @RestController
 @RequestMapping("/apiadmin/inventory/wmsinventory")
-public class StorageInventoryRest {
+public class WarehouseInventoryRest {
 
     @Autowired
-    StorageInventoryService wmsInventoryService;
+    WarehouseInventoryService wmsInventoryService;
     @Autowired
     HttpServletResponse response;
 
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<StorageInventoryVo>> listPage(@RequestBody PagerQuery<StorageInventoryQuery> pq) {
-        ResultBean<PagerVo<StorageInventoryVo>> rb = ResultBean.fireFail();
-        PagerVo<StorageInventoryVo> pv = wmsInventoryService.listPage(pq);
+    public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryQuery> pq) {
+        ResultBean<PagerVo<WarehouseInventoryVo>> rb = ResultBean.fireFail();
+        PagerVo<WarehouseInventoryVo> pv = wmsInventoryService.listPage(pq);
         return rb.success().setData(pv);
     }
 

src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillRest.java

@@ -1,9 +1,9 @@
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.storage.biz.storageoutbill.*;
+import com.yxt.warehouse.biz.warehouseoutbill.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,28 +17,28 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "出库单据")
 @RestController
 @RequestMapping("/apiadmin/WmsOutBill")
-public class StorageOutBillRest {
+public class WarehouseOutBillRest {
 
     @Autowired
-    private StorageOutBillService wmsOutBillService;
+    private WarehouseOutBillService wmsOutBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    ResultBean<PagerVo<StorageOutBillVo>> pageList(@RequestBody PagerQuery<StorageOutBillQuery> pagerQuery) {
-        ResultBean<PagerVo<StorageOutBillVo>> rb = ResultBean.fireFail();
-        PagerVo<StorageOutBillVo> pv = wmsOutBillService.listPage(pagerQuery);
+    ResultBean<PagerVo<WarehouseOutBillVo>> pageList(@RequestBody PagerQuery<WarehouseOutBillQuery> pagerQuery) {
+        ResultBean<PagerVo<WarehouseOutBillVo>> rb = ResultBean.fireFail();
+        PagerVo<WarehouseOutBillVo> pv = wmsOutBillService.listPage(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("出库保存修改")
     @PostMapping("/saveOrUpdateOutBill")
-    ResultBean saveOrUpdateOutBill(@RequestBody StorageOutBillDto dto) {
+    ResultBean saveOrUpdateOutBill(@RequestBody WarehouseOutBillDto dto) {
         return wmsOutBillService.saveOrUpdateOutBill(dto);
     }
 
     @ApiOperation("详情")
     @GetMapping("/details")
-    ResultBean<StorageOutBillDetailsVo> details(@RequestParam("sid") String sid) {
+    ResultBean<WarehouseOutBillDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsOutBillService.details(sid);
     }
 }

src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseReceiptBillRest.java

@@ -1,9 +1,9 @@
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.storage.biz.storagereceiptbill.*;
+import com.yxt.warehouse.biz.warehousereceiptbill.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,40 +17,40 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "收货单据")
 @RestController
 @RequestMapping("/apiadmin/inventory/WmsReceiptBill")
-public class StorageReceiptBillRest {
+public class WarehouseReceiptBillRest {
 
     @Autowired
-    private StorageReceiptBillService wmsReceiptBillService;
+    private WarehouseReceiptBillService wmsReceiptBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<StorageReceiptBillPageVo>> listPage(@RequestBody PagerQuery<StorageReceiptBillQuery> pq) {
-        ResultBean<PagerVo<StorageReceiptBillPageVo>> rb = ResultBean.fireFail();
-        PagerVo<StorageReceiptBillPageVo> pv = wmsReceiptBillService.listPage(pq);
+    public ResultBean<PagerVo<WarehouseReceiptBillPageVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillQuery> pq) {
+        ResultBean<PagerVo<WarehouseReceiptBillPageVo>> rb = ResultBean.fireFail();
+        PagerVo<WarehouseReceiptBillPageVo> pv = wmsReceiptBillService.listPage(pq);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("新增修改保存")
     @PostMapping("/saveOrUpdate")
-    ResultBean<String> saveOrUpdate(@RequestBody StorageReceiptBillDto2 dto) {
+    ResultBean<String> saveOrUpdate(@RequestBody WarehouseReceiptBillDto2 dto) {
         return wmsReceiptBillService.saveOrUpdateBill2(dto);
     }
 
     @ApiOperation("通知单收货单初始化")
     @GetMapping("/getInitDetails")
-    ResultBean<StorageReceiptBillVo> getInitDetails(@RequestParam("sourceSid") String sourceSid) {
+    ResultBean<WarehouseReceiptBillVo> getInitDetails(@RequestParam("sourceSid") String sourceSid) {
         return wmsReceiptBillService.getInitDetails(sourceSid);
     }
 
     @ApiOperation("收货单据编辑初始化/详情")
     @GetMapping("/getDetailsInit")
-    ResultBean<StorageReceiptBillInitVo> getDetailsInit(@RequestParam("sid") String sid) {
+    ResultBean<WarehouseReceiptBillInitVo> getDetailsInit(@RequestParam("sid") String sid) {
         return wmsReceiptBillService.getDetailsInit(sid);
     }
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
-    ResultBean<String> confirm(@RequestBody StorageReceiptBillDto2 dto) {
+    ResultBean<String> confirm(@RequestBody WarehouseReceiptBillDto2 dto) {
         return wmsReceiptBillService.confirm(dto);
     }
 

src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseShelfBillRest.java

@@ -1,9 +1,9 @@
-package com.yxt.storage.apiadmin;
+package com.yxt.warehouse.apiadmin;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.storage.biz.storageshelfbill.*;
+import com.yxt.warehouse.biz.warehouseshelfbill.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,22 +17,22 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "上货架")
 @RestController
 @RequestMapping("/apiadmin/WmsShelfBill")
-public class StorageShelfBillRest {
+public class WarehouseShelfBillRest {
 
     @Autowired
-    private StorageShelfBillService wmsShelfBillService;
+    private WarehouseShelfBillService wmsShelfBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<StorageShelfBillVo>> listPage(@RequestBody PagerQuery<StorageShelfBillQuery> pq) {
-        ResultBean<PagerVo<StorageShelfBillVo>> rb = ResultBean.fireFail();
-        PagerVo<StorageShelfBillVo> pv = wmsShelfBillService.listPage(pq);
+    public ResultBean<PagerVo<WarehouseShelfBillVo>> listPage(@RequestBody PagerQuery<WarehouseShelfBillQuery> pq) {
+        ResultBean<PagerVo<WarehouseShelfBillVo>> rb = ResultBean.fireFail();
+        PagerVo<WarehouseShelfBillVo> pv = wmsShelfBillService.listPage(pq);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("新增修改保存")
     @PostMapping("/saveOrUpdate")
-    ResultBean saveOrUpdate(@RequestBody StorageShelfBillDto dto) {
+    ResultBean saveOrUpdate(@RequestBody WarehouseShelfBillDto dto) {
         return wmsShelfBillService.saveOrUpdateShelf(dto);
     }
 
@@ -44,7 +44,7 @@ public class StorageShelfBillRest {
 
     @ApiOperation("详情")
     @GetMapping("/details")
-    ResultBean<ShelfDetailsVo> details(@RequestParam("sid") String sid) {
+    ResultBean<WarehouseShelfDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsShelfBillService.details(sid);
     }
 
@@ -56,13 +56,13 @@ public class StorageShelfBillRest {
      */
     @ApiOperation("新增初始化")
     @GetMapping("/getInit")
-    ResultBean<ShelfInitVo> getInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid) {
+    ResultBean<WarehouseShelfInitVo> getInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid) {
         return wmsShelfBillService.getInit(sid, orgPath, userSid);
     }
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
-    ResultBean<String> confirm(@RequestBody StorageShelfBillDto dto) {
+    ResultBean<String> confirm(@RequestBody WarehouseShelfBillDto dto) {
         return wmsShelfBillService.confirm(dto);
     }
 

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbill;
+package com.yxt.warehouse.biz.warehouseansbill;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date: 2024/4/9
  **/
 @Data
-public class StorageAnsBill extends BaseEntity {
+public class WarehouseAnsBill extends BaseEntity {
 
     @ApiModelProperty("外部单号（业务单据编号）")
     private String sourceBillNo;

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageansbill;
+package com.yxt.warehouse.biz.warehouseansbill;
 
-import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailDto;
+import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @date: 2024/4/9
  **/
 @Data                       
-public class StorageAnsBillDto {
+public class WarehouseAnsBillDto {
 
     private String sid;
 
@@ -51,5 +51,5 @@ public class StorageAnsBillDto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
 
-    private List<StorageAnsBillDetailDto> StorageAnsBillDetailList = new ArrayList<>();
+    private List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = new ArrayList<>();
 }

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java

@@ -0,0 +1,24 @@
+package com.yxt.warehouse.biz.warehouseansbill;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail;
+import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/9
+ **/
+@Mapper
+public interface WarehouseAnsBillMapper extends BaseMapper<WarehouseAnsBill> {
+    IPage<WarehouseAnsBillDetailVo> listPage(IPage<WarehouseAnsBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBillDetail> qw);
+
+    IPage<WarehouseAnsBillVo> listPages(IPage<WarehouseAnsBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBill> qw);
+
+    WarehouseAnsDetailsVo details(String sid);
+}

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.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.storage.biz.storageansbill.StorageAnsBillMapper">
-    <select id="listPage" resultType="com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailVo">
+<mapper namespace="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillMapper">
+    <select id="listPage" resultType="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo">
         select wd.goodsSkuSid, wd.goodsSpuName, wd.goodsSkuCode, wd.goodsSkuTitle, wd.goodSpuSid
         from storage_ans_bill_detail wd
         <where>
@@ -9,7 +9,7 @@
         </where>
     </select>
 
-    <select id="listPages" resultType="com.yxt.storage.biz.storageansbill.StorageAnsBillVo">
+    <select id="listPages" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
         select wab.sid,
                wab.billNo,
                DATE_FORMAT(wab.createTime, '%Y-%m-%d')   as createTime,
@@ -30,7 +30,7 @@
         order by wab.id desc
     </select>
 
-    <select id="details" resultType="com.yxt.storage.biz.storageansbill.StorageAnsDetailsVo">
+    <select id="details" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsDetailsVo">
         select wab.billNo,
                wab.createByName,
                DATE_FORMAT(wab.createTime, '%Y-%m-%d')   as createTime,

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbill;
+package com.yxt.warehouse.biz.warehouseansbill;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/11
  **/
 @Data
-public class StorageAnsBillQuery implements Query {
+public class WarehouseAnsBillQuery implements Query {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbill;
+package com.yxt.warehouse.biz.warehouseansbill;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +9,7 @@ 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.storage.biz.storageansbilldetail.*;
+import com.yxt.warehouse.biz.warehouseansbilldetail.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,49 +22,49 @@ import java.util.List;
  * @date: 2024/4/9
  **/
 @Service
-public class StorageAnsBillService extends MybatisBaseService<StorageAnsBillMapper, StorageAnsBill> {
+public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBillMapper, WarehouseAnsBill> {
 
     @Autowired
-    private StorageAnsBillDetailService StorageAnsBillDetailService;
+    private WarehouseAnsBillDetailService WarehouseAnsBillDetailService;
 
-    public ResultBean<String> saveOrUpdateBill(StorageAnsBillDto dto) {
+    public ResultBean<String> saveOrUpdateBill(WarehouseAnsBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            StorageAnsBill StorageAnsBill = new StorageAnsBill();
-            BeanUtil.copyProperties(dto, StorageAnsBill, "sid");
-            sid = StorageAnsBill.getSid();
-            List<StorageAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
+            WarehouseAnsBill WarehouseAnsBill = new WarehouseAnsBill();
+            BeanUtil.copyProperties(dto, WarehouseAnsBill, "sid");
+            sid = WarehouseAnsBill.getSid();
+            List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
             StorageAnsBillDetailList.removeAll(Collections.singleton(null));
             if (!StorageAnsBillDetailList.isEmpty()) {
-                StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
+                WarehouseAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
             } else {
                 return rb.setMsg("单据明细不能为空");
             }
-            baseMapper.insert(StorageAnsBill);
+            baseMapper.insert(WarehouseAnsBill);
 
         } else {
-            StorageAnsBill StorageAnsBill = fetchBySid(sid);
-            if (StorageAnsBill == null) {
+            WarehouseAnsBill WarehouseAnsBill = fetchBySid(sid);
+            if (WarehouseAnsBill == null) {
                 return rb.setMsg("该单据不存在");
             }
-            BeanUtil.copyProperties(dto, StorageAnsBill, "sid");
-            List<StorageAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
+            BeanUtil.copyProperties(dto, WarehouseAnsBill, "sid");
+            List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
             StorageAnsBillDetailList.removeAll(Collections.singleton(null));
             if (!StorageAnsBillDetailList.isEmpty()) {
-                StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
+                WarehouseAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
             } else {
                 return rb.setMsg("单据明细不能为空");
             }
-            baseMapper.updateById(StorageAnsBill);
+            baseMapper.updateById(WarehouseAnsBill);
 
         }
         return rb.success().setData(sid);
     }
 
-    public PagerVo<StorageAnsBillVo> listPages(PagerQuery<StorageAnsBillQuery> pagerQuery) {
-        StorageAnsBillQuery query = pagerQuery.getParams();
-        QueryWrapper<StorageAnsBill> qw = new QueryWrapper<>();
+    public PagerVo<WarehouseAnsBillVo> listPages(PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
+        WarehouseAnsBillQuery query = pagerQuery.getParams();
+        QueryWrapper<WarehouseAnsBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
         if (query != null) {
             //单据编号
@@ -102,24 +102,24 @@ public class StorageAnsBillService extends MybatisBaseService<StorageAnsBillMapp
             }
         }
 
-        IPage<StorageAnsBill> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<StorageAnsBillVo> pagging = baseMapper.listPages(page, qw);
-        PagerVo<StorageAnsBillVo> p = PagerUtil.pageToVo(pagging, null);
+        IPage<WarehouseAnsBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<WarehouseAnsBillVo> pagging = baseMapper.listPages(page, qw);
+        PagerVo<WarehouseAnsBillVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean<StorageAnsDetailsVo> details(String sid) {
-        ResultBean<StorageAnsDetailsVo> rb = ResultBean.fireFail();
-        StorageAnsDetailsVo StorageAnsDetailsVo = baseMapper.details(sid);
-        if (StorageAnsDetailsVo != null) {
-            List<StorageAnsListDetailsVo> list = StorageAnsBillDetailService.selectByBillSid(sid);
+    public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
+        ResultBean<WarehouseAnsDetailsVo> rb = ResultBean.fireFail();
+        WarehouseAnsDetailsVo WarehouseAnsDetailsVo = baseMapper.details(sid);
+        if (WarehouseAnsDetailsVo != null) {
+            List<WarehouseAnsListDetailsVo> list = WarehouseAnsBillDetailService.selectByBillSid(sid);
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                StorageAnsDetailsVo.setList(list);
+                WarehouseAnsDetailsVo.setList(list);
             }
         } else {
             return rb.setMsg("该单据不存在");
         }
-        return rb.success().setData(StorageAnsDetailsVo);
+        return rb.success().setData(WarehouseAnsDetailsVo);
     }
 }

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbill;
+package com.yxt.warehouse.biz.warehouseansbill;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/11
  **/
 @Data
-public class StorageAnsBillVo {
+public class WarehouseAnsBillVo {
 
 
     private String sid;

src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageansbill;
+package com.yxt.warehouse.biz.warehouseansbill;
 
-import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo;
+import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/12
  **/
 @Data
-public class StorageAnsDetailsVo {
+public class WarehouseAnsDetailsVo {
     private String billNo;
     @ApiModelProperty("制单人姓名")
     private String createByName;
@@ -40,5 +40,5 @@ public class StorageAnsDetailsVo {
     @ApiModelProperty("拒绝原因")
     private String refuseReason;
     
-    private List<StorageAnsListDetailsVo> list = new ArrayList<>();
+    private List<WarehouseAnsListDetailsVo> list = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java → src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbilldetail;
+package com.yxt.warehouse.biz.warehouseansbilldetail;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @date: 2024/4/9
  **/
 @Data
-public class StorageAnsBillDetail extends BaseEntity {
+public class WarehouseAnsBillDetail extends BaseEntity {
 
     @ApiModelProperty("单据sid")
     private String billSid;

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java → src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbilldetail;
+package com.yxt.warehouse.biz.warehouseansbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/9
  **/
 @Data
-public class StorageAnsBillDetailDto {
+public class WarehouseAnsBillDetailDto {
 
     @ApiModelProperty("商品基础信息sid")
     private String goodSpuSid;

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbilldetail;
+package com.yxt.warehouse.biz.warehouseansbilldetail;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,8 +11,8 @@ import java.util.List;
  * @date: 2024/4/9
  **/
 @Mapper
-public interface StorageAnsBillDetailMapper extends BaseMapper<StorageAnsBillDetail> {
+public interface WarehouseAnsBillDetailMapper extends BaseMapper<WarehouseAnsBillDetail> {
     int deleteDetails(String sid);
 
-    List<StorageAnsListDetailsVo> selectByBillSid(String sid);
+    List<WarehouseAnsListDetailsVo> selectByBillSid(String sid);
 }

target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml

@@ -1,13 +1,13 @@
 <?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.storage.biz.storageansbilldetail.StorageAnsBillDetailMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailMapper">
     <delete id="deleteDetails">
         delete
         from storage_ans_bill_detail
         where billSid = #{sid}
     </delete>
 
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo">
+    <select id="selectByBillSid" resultType="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo">
         select wd.goodsSkuTitle,
                wd.goodsSkuCode,
                wd.goodsSkuOwnSpec,

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java

@@ -0,0 +1,29 @@
+package com.yxt.warehouse.biz.warehouseansbilldetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/9
+ **/
+@Service
+public class WarehouseAnsBillDetailService extends MybatisBaseService<WarehouseAnsBillDetailMapper, WarehouseAnsBillDetail> {
+    public void saveOrUpdateDetailsList(String sid, List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList) {
+        baseMapper.deleteDetails(sid);
+        StorageAnsBillDetailList.forEach(v->{
+            WarehouseAnsBillDetail WarehouseAnsBillDetail = new WarehouseAnsBillDetail();
+            BeanUtil.copyProperties(v, WarehouseAnsBillDetail,"sid");
+            WarehouseAnsBillDetail.setBillSid(sid);
+            baseMapper.insert(WarehouseAnsBillDetail);
+        });
+    }
+
+    public List<WarehouseAnsListDetailsVo> selectByBillSid(String sid) {
+        return baseMapper.selectByBillSid(sid);
+    }
+}

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java → src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbilldetail;
+package com.yxt.warehouse.biz.warehouseansbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/10
  **/
 @Data
-public class StorageAnsBillDetailVo {
+public class WarehouseAnsBillDetailVo {
 
     @ApiModelProperty("来源单sid")
     private String sourceBillSid;

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageansbilldetail;
+package com.yxt.warehouse.biz.warehouseansbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/11
  **/
 @Data
-public class StorageAnsListDetailsVo {
+public class WarehouseAnsListDetailsVo {
     @ApiModelProperty("商品名称")
     private String goodsSkuTitle;
     @ApiModelProperty("商品编码（图号）")

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java → src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventory;
+package com.yxt.warehouse.biz.warehouseinventory;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2024/2/28 8:38
  */
 @Data
-public class StorageInventory extends BaseEntity {
+public class WarehouseInventory extends BaseEntity {
     
     @ApiModelProperty("批次号")
     private String batchNumber;

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventory;
+package com.yxt.warehouse.biz.warehouseinventory;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Param;
  * @date 2024/2/26 13:40
  */
 @Mapper
-public interface StorageInventoryMapper extends BaseMapper<StorageInventory> {
+public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory> {
 
-    IPage<StorageInventoryVo> listPage(IPage<StorageInventory> page, @Param(Constants.WRAPPER) QueryWrapper<StorageInventory> qw);
+    IPage<WarehouseInventoryVo> listPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
 
 }

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml → src/main/java/com/yxt/warehouse/biz/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.storage.biz.storageinventory.StorageInventoryMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.storage.biz.storageinventory.StorageInventoryVo">
+    <select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
         select a.goodsID,
                a.sid,
                a.goodsSpuName,

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventory;
+package com.yxt.warehouse.biz.warehouseinventory;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2024/2/26 13:37
  */
 @Data
-public class StorageInventoryQuery implements Query {
+public class WarehouseInventoryQuery implements Query {
     @ApiModelProperty("goodsID")
     private String goodsID;
 

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventorySaveDto.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventory;
+package com.yxt.warehouse.biz.warehouseinventory;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/19
  **/
 @Data
-public class StorageInventorySaveDto {
+public class WarehouseInventorySaveDto {
 
     private String sid;
     @ApiModelProperty("创建者sid")

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventory;
+package com.yxt.warehouse.biz.warehouseinventory;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,10 +19,10 @@ import java.util.List;
  * @date 2024/2/26 13:40
  */
 @Service
-public class StorageInventoryService extends MybatisBaseService<StorageInventoryMapper, StorageInventory> {
-    public PagerVo<StorageInventoryVo> listPage(PagerQuery<StorageInventoryQuery> pq) {
-        StorageInventoryQuery query = pq.getParams();
-        QueryWrapper<StorageInventory> qw = new QueryWrapper<>();
+public class WarehouseInventoryService extends MybatisBaseService<WarehouseInventoryMapper, WarehouseInventory> {
+    public PagerVo<WarehouseInventoryVo> listPage(PagerQuery<WarehouseInventoryQuery> pq) {
+        WarehouseInventoryQuery query = pq.getParams();
+        QueryWrapper<WarehouseInventory> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getGoodsID())) {
             qw.like("a.goodsID", query.getGoodsID());
         }
@@ -39,22 +39,22 @@ public class StorageInventoryService extends MybatisBaseService<StorageInventory
             qw.like("a.batchNumber", query.getBatchNumber());
         }
 
-        IPage<StorageInventory> page = PagerUtil.queryToPage(pq);
-        IPage<StorageInventoryVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<StorageInventoryVo> p = PagerUtil.pageToVo(pagging, null);
+        IPage<WarehouseInventory> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseInventoryVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean<String> saveWmsInventory(StorageInventorySaveDto dto) {
+    public ResultBean<String> saveWmsInventory(WarehouseInventorySaveDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            StorageInventory wmsInventory = new StorageInventory();
+            WarehouseInventory wmsInventory = new WarehouseInventory();
             BeanUtil.copyProperties(dto, wmsInventory, "sid");
             sid = wmsInventory.getSid();
             baseMapper.insert(wmsInventory);
         } else {
-            StorageInventory wmsInventory = fetchBySid(sid);
+            WarehouseInventory wmsInventory = fetchBySid(sid);
             if (wmsInventory == null) {
                 return rb.setMsg("该商品库存不存在");
             }

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventory;
+package com.yxt.warehouse.biz.warehouseinventory;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2024/2/26 13:37
  */
 @Data
-public class StorageInventoryVo implements Vo {
+public class WarehouseInventoryVo implements Vo {
 
     private String sid;
     @ApiModelProperty("商品ID")

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageInventoryRecord extends BaseEntity {
+public class WarehouseInventoryRecord extends BaseEntity {
 
     @ApiModelProperty("库存sid")
     private String inventorySid;

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 
 import com.yxt.common.core.dto.Dto;
@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 
 @Data
 @ApiModel(value = "库存出入库记录 数据传输对象", description = "库存出入库记录 数据传输对象")
-public class StorageInventoryRecordDto implements Dto {
+public class WarehouseInventoryRecordDto implements Dto {
 
     private String sid;
     @ApiModelProperty("库存sid")

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageInventoryRecordListVo {
+public class WarehouseInventoryRecordListVo {
 
     @ApiModelProperty("来源单编号")
     private String billNo;

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.java

@@ -0,0 +1,16 @@
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Mapper
+public interface WarehouseInventoryRecordMapper extends BaseMapper<WarehouseInventoryRecord> {
+    List<WarehouseInventoryRecordListVo> getStorageInventoryRecordList(String sid);
+}

target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.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.storage.biz.storageinventoryrecord.StorageInventoryRecordMapper">
-    <select id="getStorageInventoryRecordList" resultType="com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordListVo">
+<mapper namespace="com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordMapper">
+    <select id="getStorageInventoryRecordList" resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordListVo">
         select wir.billNo,
                case wir.billType when 1 then '入库' when 0 then '出库' end as billType,
                DATE_FORMAT(wir.createTime, '%Y-%m-%d')                 as createTime,

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -17,15 +17,15 @@ import java.util.List;
  * @date: 2024/4/24
  **/
 @Service
-public class StorageInventoryRecordService extends MybatisBaseService<StorageInventoryRecordMapper, StorageInventoryRecord> {
-    public ResultBean<List<StorageInventoryRecordListVo>> getStorageInventoryRecordList(String sid) {
-        ResultBean<List<StorageInventoryRecordListVo>> rb = ResultBean.fireFail();
-        List<StorageInventoryRecordListVo> list = baseMapper.getStorageInventoryRecordList(sid);
+public class WarehouseInventoryRecordService extends MybatisBaseService<WarehouseInventoryRecordMapper, WarehouseInventoryRecord> {
+    public ResultBean<List<WarehouseInventoryRecordListVo>> getStorageInventoryRecordList(String sid) {
+        ResultBean<List<WarehouseInventoryRecordListVo>> rb = ResultBean.fireFail();
+        List<WarehouseInventoryRecordListVo> list = baseMapper.getStorageInventoryRecordList(sid);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
 
-    public void saveOrUpdateDto(StorageInventoryRecordDto dto) {
+    public void saveOrUpdateDto(WarehouseInventoryRecordDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
@@ -34,27 +34,27 @@ public class StorageInventoryRecordService extends MybatisBaseService<StorageInv
         this.updateByDto(dto);
     }
 
-    public void insertByDto(StorageInventoryRecordDto dto) {
-        StorageInventoryRecord entity = new StorageInventoryRecord();
+    public void insertByDto(WarehouseInventoryRecordDto dto) {
+        WarehouseInventoryRecord entity = new WarehouseInventoryRecord();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
     }
 
-    public void updateByDto(StorageInventoryRecordDto dto) {
+    public void updateByDto(WarehouseInventoryRecordDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
         }
-        StorageInventoryRecord entity = fetchBySid(dtoSid);
+        WarehouseInventoryRecord entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.updateById(entity);
     }
 
-    public PagerVo<StorageInventoryRecordsVo> listPage(PagerQuery<StorageInventoryRecordsQuery> pagerQuery) {
+    public PagerVo<WarehouseInventoryRecordsVo> listPage(PagerQuery<WarehouseInventoryRecordsQuery> pagerQuery) {
         return null;
     }
 
-    public List<StorageInventoryRecordsExcelVo> listExcel(StorageInventoryRecordsQuery query) {
+    public List<WarehouseInventoryRecordsExcelVo> listExcel(WarehouseInventoryRecordsQuery query) {
         return null;
     }
 }

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsExcelVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 import com.yxt.common.core.utils.ExportEntityMap;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageInventoryRecordsExcelVo {
+public class WarehouseInventoryRecordsExcelVo {
 
 
     @ExportEntityMap(CnName = "序号", EnName = "rankNo")

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageInventoryRecordsQuery implements Query {
+public class WarehouseInventoryRecordsQuery implements Query {
 
     @ApiModelProperty("商品ID")
     private String goodsID;

src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageinventoryrecord;
+package com.yxt.warehouse.biz.warehouseinventoryrecord;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageInventoryRecordsVo {
+public class WarehouseInventoryRecordsVo {
 
     @ApiModelProperty("商品ID")
     private String goodsID;

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBill extends BaseEntity {
+public class WarehouseOutBill extends BaseEntity {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDetailsVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
-import com.yxt.storage.biz.storageoutbilldetail.StorageOutBillDetailDto;
+import com.yxt.warehouse.biz.warehouseoutbilldetail.WarehouseOutBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBillDetailsVo {
+public class WarehouseOutBillDetailsVo {
 
     private String sid;
     @ApiModelProperty("创建人sid")
@@ -35,5 +35,5 @@ public class StorageOutBillDetailsVo {
     @ApiModelProperty("备注")
     private String remarks;
 
-    private List<StorageOutBillDetailDto> detailsList = new ArrayList<>();
+    private List<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDto.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
-import com.yxt.storage.biz.storageoutbilldetail.StorageOutBillDetailDto;
+import com.yxt.warehouse.biz.warehouseoutbilldetail.WarehouseOutBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBillDto {
+public class WarehouseOutBillDto {
 
     private String sid;
     @ApiModelProperty("创建人sid")
@@ -35,7 +35,7 @@ public class StorageOutBillDto {
     @ApiModelProperty("备注")
     private String remarks;
 
-    private List<StorageOutBillDetailDto> detailsList = new ArrayList<>();
+    private List<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();
 
 
 }

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date: 2024/4/24
  **/
 @Mapper
-public interface StorageOutBillMapper extends BaseMapper<StorageOutBill> {
+public interface WarehouseOutBillMapper extends BaseMapper<WarehouseOutBill> {
 }

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.xml

@@ -1,4 +1,4 @@
 <?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.storage.biz.storageoutbill.StorageOutBillMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehouseoutbill.WarehouseOutBillMapper">
 </mapper>

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBillQuery implements Query {
+public class WarehouseOutBillQuery implements Query {
 
     //单据编号
     @ApiModelProperty("单据编号")

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
@@ -12,16 +12,16 @@ import org.springframework.stereotype.Service;
  * @date: 2024/4/24
  **/
 @Service
-public class StorageOutBillService extends MybatisBaseService<StorageOutBillMapper, StorageOutBill> {
-    public PagerVo<StorageOutBillVo> listPage(PagerQuery<StorageOutBillQuery> pagerQuery) {
+public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBillMapper, WarehouseOutBill> {
+    public PagerVo<WarehouseOutBillVo> listPage(PagerQuery<WarehouseOutBillQuery> pagerQuery) {
         return null;
     }
 
-    public ResultBean saveOrUpdateOutBill(StorageOutBillDto dto) {
+    public ResultBean saveOrUpdateOutBill(WarehouseOutBillDto dto) {
         return null;
     }
 
-    public ResultBean<StorageOutBillDetailsVo> details(String sid) {
+    public ResultBean<WarehouseOutBillDetailsVo> details(String sid) {
         return null;
     }
 }

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbill;
+package com.yxt.warehouse.biz.warehouseoutbill;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBillVo {
+public class WarehouseOutBillVo {
 
     private String sid;
 

src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbilldetail;
+package com.yxt.warehouse.biz.warehouseoutbilldetail;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import java.util.Date;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBillDetail extends BaseEntity {
+public class WarehouseOutBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("商品基础信息Sid")

src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java → src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageoutbilldetail;
+package com.yxt.warehouse.biz.warehouseoutbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class StorageOutBillDetailDto {
+public class WarehouseOutBillDetailDto {
 
     @ApiModelProperty("商品基础信息Sid")
     private String goodSpuSid;

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date: 2024/4/3
  **/
 @Data
-public class StorageReceiptBill extends BaseEntity {
+public class WarehouseReceiptBill extends BaseEntity {
 
     @ApiModelProperty("来源单sid（asn单sid）")
     private String sourceBillSid;

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillDto2.java

@@ -1,7 +1,7 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageReceiptBillDto2 {
+public class WarehouseReceiptBillDto2 {
 
     private String sid;
     @ApiModelProperty("来源单sid（asn单sid）")
@@ -47,7 +47,7 @@ public class StorageReceiptBillDto2 {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("商品列表")
-    private List<StorageReceiptBillDetailDto2> list = new ArrayList<>();
+    private List<WarehouseReceiptBillDetailDto2> list = new ArrayList<>();
     @ApiModelProperty("批次列表")
-    private List<StorageReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
+    private List<WarehouseReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillInitVo.java

@@ -1,7 +1,7 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageReceiptBillInitVo {
+public class WarehouseReceiptBillInitVo {
 
     private String sid;
     @ApiModelProperty("单据编号")
@@ -49,7 +49,7 @@ public class StorageReceiptBillInitVo {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("商品列表")
-    private List<StorageReceiptBillDetailDto2> list = new ArrayList<>();
+    private List<WarehouseReceiptBillDetailDto2> list = new ArrayList<>();
     @ApiModelProperty("批次列表")
-    private List<StorageReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
+    private List<WarehouseReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,8 +13,8 @@ import org.apache.ibatis.annotations.Param;
  * @date: 2024/4/3
  **/
 @Mapper
-public interface StorageReceiptBillMapper extends BaseMapper<StorageReceiptBill> {
-    IPage<StorageReceiptBillPageVo> listPage(IPage<StorageReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<StorageReceiptBill> qw);
+public interface WarehouseReceiptBillMapper extends BaseMapper<WarehouseReceiptBill> {
+    IPage<WarehouseReceiptBillPageVo> listPage(IPage<WarehouseReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseReceiptBill> qw);
 
-    StorageReceiptBillInitVo getDetailsInit(String sid);
+    WarehouseReceiptBillInitVo getDetailsInit(String sid);
 }

target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.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.storage.biz.storagereceiptbill.StorageReceiptBillMapper">
-    <select id="listPage" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillPageVo">
+<mapper namespace="com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBillMapper">
+    <select id="listPage" resultType="com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBillPageVo">
         select wrb.sid,
                wrb.billNo,
                wrb.createByName,
@@ -18,7 +18,7 @@
         order by wrb.id desc
     </select>
 
-    <select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillInitVo">
+    <select id="getDetailsInit" resultType="com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBillInitVo">
         select wrb.sid,
                wrb.billNo,
                wrb.sourceBillSid,

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillPageVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/12
  **/
 @Data
-public class StorageReceiptBillPageVo {
+public class WarehouseReceiptBillPageVo {
 
     private String sid;
     @ApiModelProperty("单据编号")

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/3
  **/
 @Data
-public class StorageReceiptBillQuery implements Query {
+public class WarehouseReceiptBillQuery implements Query {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -11,17 +11,17 @@ 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.storage.biz.storageansbill.StorageAnsBill;
-import com.yxt.storage.biz.storageansbill.StorageAnsBillService;
-import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailService;
-import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo;
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2;
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper;
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService;
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService;
+import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBill;
+import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillService;
+import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService;
+import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailMapper;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailService;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchMapper;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,24 +34,24 @@ import java.util.stream.Collectors;
  * @date: 2024/4/3
  **/
 @Service
-public class StorageReceiptBillService extends MybatisBaseService<StorageReceiptBillMapper, StorageReceiptBill> {
+public class WarehouseReceiptBillService extends MybatisBaseService<WarehouseReceiptBillMapper, WarehouseReceiptBill> {
 
     @Autowired
-    private StorageReceiptBillDetailService wmsReceiptBillDetailService;
+    private WarehouseReceiptBillDetailService wmsReceiptBillDetailService;
     @Autowired
-    private StorageAnsBillService wmsAnsBillService;
+    private WarehouseAnsBillService wmsAnsBillService;
     @Autowired
-    private StorageAnsBillDetailService wmsAnsBillDetailService;
+    private WarehouseAnsBillDetailService wmsAnsBillDetailService;
     @Autowired
-    private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
+    private WarehouseReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
     @Autowired
-    private StorageReceiptBillDetailMapper wmsReceiptBillDetailMapper;
+    private WarehouseReceiptBillDetailMapper wmsReceiptBillDetailMapper;
     @Autowired
-    private StorageReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper;
+    private WarehouseReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper;
 
-    public PagerVo<StorageReceiptBillPageVo> listPage(PagerQuery<StorageReceiptBillQuery> pq) {
-        StorageReceiptBillQuery query = pq.getParams();
-        QueryWrapper<StorageReceiptBill> qw = new QueryWrapper<>();
+    public PagerVo<WarehouseReceiptBillPageVo> listPage(PagerQuery<WarehouseReceiptBillQuery> pq) {
+        WarehouseReceiptBillQuery query = pq.getParams();
+        QueryWrapper<WarehouseReceiptBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("wrb.billNo", query.getBillNo());
@@ -72,22 +72,22 @@ public class StorageReceiptBillService extends MybatisBaseService<StorageReceipt
         if (StringUtils.isNotBlank(query.getSourceBillNo())) {
             qw.like("wrb.sourceBillNo", query.getSourceBillNo());
         }
-        IPage<StorageReceiptBill> page = PagerUtil.queryToPage(pq);
-        IPage<StorageReceiptBillPageVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<StorageReceiptBillPageVo> p = PagerUtil.pageToVo(pagging, null);
+        IPage<WarehouseReceiptBill> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseReceiptBillPageVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseReceiptBillPageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean<String> saveOrUpdateBill2(StorageReceiptBillDto2 dto) {
+    public ResultBean<String> saveOrUpdateBill2(WarehouseReceiptBillDto2 dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            StorageReceiptBill wmsReceiptBill = new StorageReceiptBill();
+            WarehouseReceiptBill wmsReceiptBill = new WarehouseReceiptBill();
             sid = wmsReceiptBill.getSid();
             BeanUtil.copyProperties(dto, wmsReceiptBill, "sid");
-            List<StorageReceiptBillDetailDto2> list = dto.getList();
+            List<WarehouseReceiptBillDetailDto2> list = dto.getList();
             list.removeAll(Collections.singleton(null));
-            List<StorageReceiptBillDetailBatchDto2> pcList = dto.getPcList();
+            List<WarehouseReceiptBillDetailBatchDto2> pcList = dto.getPcList();
             pcList.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
@@ -95,14 +95,14 @@ public class StorageReceiptBillService extends MybatisBaseService<StorageReceipt
             baseMapper.insert(wmsReceiptBill);
 
         } else {
-            StorageReceiptBill wmsReceiptBill = fetchBySid(sid);
+            WarehouseReceiptBill wmsReceiptBill = fetchBySid(sid);
             if (wmsReceiptBill == null) {
                 return rb.setMsg("该单据不存在");
             }
             BeanUtil.copyProperties(dto, wmsReceiptBill, "sid");
-            List<StorageReceiptBillDetailDto2> list = dto.getList();
+            List<WarehouseReceiptBillDetailDto2> list = dto.getList();
             list.removeAll(Collections.singleton(null));
-            List<StorageReceiptBillDetailBatchDto2> pcList = dto.getPcList();
+            List<WarehouseReceiptBillDetailBatchDto2> pcList = dto.getPcList();
             pcList.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
@@ -112,41 +112,41 @@ public class StorageReceiptBillService extends MybatisBaseService<StorageReceipt
         return rb.success().setData(sid);
     }
 
-    public ResultBean<StorageReceiptBillVo> getInitDetails(String sourceSid) {
-        ResultBean<StorageReceiptBillVo> rb = ResultBean.fireFail();
-        StorageReceiptBillVo wmsReceiptBillVo = new StorageReceiptBillVo();
-        StorageAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid);
+    public ResultBean<WarehouseReceiptBillVo> getInitDetails(String sourceSid) {
+        ResultBean<WarehouseReceiptBillVo> rb = ResultBean.fireFail();
+        WarehouseReceiptBillVo wmsReceiptBillVo = new WarehouseReceiptBillVo();
+        WarehouseAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid);
         BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid");
         wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo());
         wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid());
         wmsReceiptBillVo.setCreateTime(DateUtil.today());
-        List<StorageAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
+        List<WarehouseAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
-            List<StorageReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StorageReceiptBillDetailVo.class)).collect(Collectors.toList());
+            List<WarehouseReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WarehouseReceiptBillDetailVo.class)).collect(Collectors.toList());
             wmsReceiptBillVo.setList(lists);
         }
 
         return rb.success().setData(wmsReceiptBillVo);
     }
 
-    public ResultBean<StorageReceiptBillInitVo> getDetailsInit(String sid) {
-        ResultBean<StorageReceiptBillInitVo> rb = ResultBean.fireFail();
-        StorageReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid);
-        List<StorageReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
+    public ResultBean<WarehouseReceiptBillInitVo> getDetailsInit(String sid) {
+        ResultBean<WarehouseReceiptBillInitVo> rb = ResultBean.fireFail();
+        WarehouseReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid);
+        List<WarehouseReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
         if (wmsReceiptBillInitVo != null) {
-            List<StorageReceiptBillDetailDto2> list = wmsReceiptBillDetailService.getDetailsInit(sid);
+            List<WarehouseReceiptBillDetailDto2> list = wmsReceiptBillDetailService.getDetailsInit(sid);
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 for (int i = 0; i < list.size(); i++) {
-                    StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
+                    WarehouseReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
                     int a = i + 1;
                     wmsReceiptBillDetailDto2.setXh(String.valueOf(a));
-                    List<StorageReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid());
+                    List<WarehouseReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid());
                     pcList2.removeAll(Collections.singleton(null));
                     if (!pcList2.isEmpty()) {
                         for (int j = 0; j < pcList2.size(); j++) {
-                            StorageReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j);
+                            WarehouseReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j);
                             wmsReceiptBillDetailBatchDto2.setXh(String.valueOf(a));
                         }
                         pcList.addAll(pcList2);
@@ -161,14 +161,14 @@ public class StorageReceiptBillService extends MybatisBaseService<StorageReceipt
         return rb.success().setData(wmsReceiptBillInitVo);
     }
 
-    public ResultBean<String> confirm(StorageReceiptBillDto2 dto) {
+    public ResultBean<String> confirm(WarehouseReceiptBillDto2 dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         dto.setBillState("1");
-        List<StorageReceiptBillDetailDto2> list = dto.getList();
+        List<WarehouseReceiptBillDetailDto2> list = dto.getList();
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             for (int i = 0; i < list.size(); i++) {
-                StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
+                WarehouseReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
                 wmsReceiptBillDetailDto2.setState(1);
             }
         }

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storagereceiptbill;
+package com.yxt.warehouse.biz.warehousereceiptbill;
 
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @date: 2024/4/3
  **/
 @Data
-public class StorageReceiptBillVo {
+public class WarehouseReceiptBillVo {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("来源单sid（asn单sid）")
@@ -47,5 +47,5 @@ public class StorageReceiptBillVo {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
 
-    private List<StorageReceiptBillDetailVo> list = new ArrayList<>();
+    private List<WarehouseReceiptBillDetailVo> list = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbilldetail;
+package com.yxt.warehouse.biz.warehousereceiptbilldetail;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import java.util.Date;
  * @date: 2024/4/3
  **/
 @Data
-public class StorageReceiptBillDetail extends BaseEntity {
+public class WarehouseReceiptBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("商品基础信息Sid")

src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailDto2.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbilldetail;
+package com.yxt.warehouse.biz.warehousereceiptbilldetail;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageReceiptBillDetailDto2 {
+public class WarehouseReceiptBillDetailDto2 {
 
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;

src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.java

@@ -0,0 +1,21 @@
+package com.yxt.warehouse.biz.warehousereceiptbilldetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/3
+ **/
+@Mapper
+public interface WarehouseReceiptBillDetailMapper extends BaseMapper<WarehouseReceiptBillDetail> {
+    int deleteByBillSid(String sid);
+
+    List<WarehouseReceiptBillDetailDto2> getDetailsInit(String sid);
+
+    List<WarehouseReceiptBillDetail> selectByBillSid(@Param("sid") String sid, @Param("sidList") List<String> sidList);
+}

target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.xml

@@ -1,13 +1,13 @@
 <?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.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailMapper">
     <delete id="deleteByBillSid">
         delete
         from wms_receipt_bill_detail
         where billSid = #{sid}
     </delete>
 
-    <select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2">
+    <select id="getDetailsInit" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2">
         select wrbd.goodsSkuSid,
                wrbd.goodsSkuTitle,
                wrbd.goodsSkuCode,
@@ -29,7 +29,7 @@
         where billSid = #{sid}
     </select>
 
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail">
+    <select id="selectByBillSid" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetail">
         select *
         from wms_receipt_bill_detail where billSid = #{sid}
         <if test="sidList != null and sidList.size() != 0">

src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailService.java

@@ -1,9 +1,9 @@
-package com.yxt.storage.biz.storagereceiptbilldetail;
+package com.yxt.warehouse.biz.warehousereceiptbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,22 +17,22 @@ import java.util.stream.Collectors;
  * @date: 2024/4/3
  **/
 @Service
-public class StorageReceiptBillDetailService extends MybatisBaseService<StorageReceiptBillDetailMapper, StorageReceiptBillDetail> {
+public class WarehouseReceiptBillDetailService extends MybatisBaseService<WarehouseReceiptBillDetailMapper, WarehouseReceiptBillDetail> {
 
     @Autowired
-    private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
+    private WarehouseReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
 
-    public void saveOrUpdateDetailsList2(String sid, List<StorageReceiptBillDetailDto2> list, List<StorageReceiptBillDetailBatchDto2> pcList) {
+    public void saveOrUpdateDetailsList2(String sid, List<WarehouseReceiptBillDetailDto2> list, List<WarehouseReceiptBillDetailBatchDto2> pcList) {
         baseMapper.deleteByBillSid(sid);
         list.forEach(v -> {
-            StorageReceiptBillDetail wmsReceiptBillDetail = new StorageReceiptBillDetail();
+            WarehouseReceiptBillDetail wmsReceiptBillDetail = new WarehouseReceiptBillDetail();
             BeanUtil.copyProperties(v, wmsReceiptBillDetail, "sid");
             wmsReceiptBillDetail.setBillSid(sid);
             baseMapper.insert(wmsReceiptBillDetail);
             wmsReceiptBillDetailBatchService.deleteByDetails(sid);
             pcList.removeAll(Collections.singleton(null));
             if (!pcList.isEmpty()) {
-                List<StorageReceiptBillDetailBatchDto2> pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList());
+                List<WarehouseReceiptBillDetailBatchDto2> pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList());
                 pcList2.removeAll(Collections.singleton(null));
                 if (!pcList2.isEmpty()) {
                     wmsReceiptBillDetailBatchService.saveBatchs2(sid, wmsReceiptBillDetail.getSid(), pcList2);
@@ -43,11 +43,11 @@ public class StorageReceiptBillDetailService extends MybatisBaseService<StorageR
         });
     }
 
-    public List<StorageReceiptBillDetailDto2> getDetailsInit(String sid) {
+    public List<WarehouseReceiptBillDetailDto2> getDetailsInit(String sid) {
         return baseMapper.getDetailsInit(sid);
     }
 
-    public List<StorageReceiptBillDetail> selectByBillSid(String sid, List<String> sidList) {
+    public List<WarehouseReceiptBillDetail> selectByBillSid(String sid, List<String> sidList) {
         return baseMapper.selectByBillSid(sid, sidList);
     }
 }

src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbilldetail;
+package com.yxt.warehouse.biz.warehousereceiptbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/12
  **/
 @Data
-public class StorageReceiptBillDetailVo {
+public class WarehouseReceiptBillDetailVo {
 
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;

src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatch.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbilldetailbatch;
+package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import java.util.Date;
  * @date: 2024/4/10
  **/
 @Data
-public class StorageReceiptBillDetailBatch extends BaseEntity {
+public class WarehouseReceiptBillDetailBatch extends BaseEntity {
     @ApiModelProperty("收货单sid")
     private String billSid;
     @ApiModelProperty("收货明细sid")

src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchDto2.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbilldetailbatch;
+package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageReceiptBillDetailBatchDto2 {
+public class WarehouseReceiptBillDetailBatchDto2 {
 
     @ApiModelProperty("批次号（收货日期+有效日期，如240320-241009）")
     private String batchNumber;

src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.java

@@ -0,0 +1,21 @@
+package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/12
+ **/
+@Mapper
+public interface WarehouseReceiptBillDetailBatchMapper extends BaseMapper<WarehouseReceiptBillDetailBatch> {
+    int deleteByDetails(String sid);
+
+    List<WarehouseReceiptBillDetailBatchDto2> getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid);
+
+    WarehouseReceiptBillDetailBatch selectByDetails(String sid);
+}

target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.xml

@@ -1,6 +1,6 @@
 <?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.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchMapper">
     <delete id="deleteByDetails">
         delete
         from wms_receipt_bill_detail_batch
@@ -8,7 +8,7 @@
     </delete>
 
     <select id="getDetailsInit"
-            resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2">
+            resultType="com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2">
         select wb.batchNumber,
                DATE_FORMAT(wb.manufactureDate, '%Y-%m-%d') as manufactureDate,
                DATE_FORMAT(wb.expirationDate, '%Y-%m-%d')  as expirationDate,
@@ -19,7 +19,7 @@
     </select>
 
     <select id="selectByDetails"
-            resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch">
+            resultType="com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatch">
         select *
         from wms_receipt_bill_detail_batch
         where detailSid = #{sid}

src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchService.java → src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storagereceiptbilldetailbatch;
+package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -12,14 +12,14 @@ import java.util.List;
  * @date: 2024/4/12
  **/
 @Service
-public class StorageReceiptBillDetailBatchService extends MybatisBaseService<StorageReceiptBillDetailBatchMapper, StorageReceiptBillDetailBatch> {
+public class WarehouseReceiptBillDetailBatchService extends MybatisBaseService<WarehouseReceiptBillDetailBatchMapper, WarehouseReceiptBillDetailBatch> {
     public int deleteByDetails(String sid) {
         return baseMapper.deleteByDetails(sid);
     }
 
-    public void saveBatchs2(String sid, String sid1, List<StorageReceiptBillDetailBatchDto2> list) {
+    public void saveBatchs2(String sid, String sid1, List<WarehouseReceiptBillDetailBatchDto2> list) {
         list.forEach(v -> {
-            StorageReceiptBillDetailBatch wmsReceiptBillDetailBatch = new StorageReceiptBillDetailBatch();
+            WarehouseReceiptBillDetailBatch wmsReceiptBillDetailBatch = new WarehouseReceiptBillDetailBatch();
             BeanUtil.copyProperties(v, wmsReceiptBillDetailBatch, "sid");
             wmsReceiptBillDetailBatch.setBillSid(sid);
             wmsReceiptBillDetailBatch.setDetailSid(sid1);
@@ -27,11 +27,11 @@ public class StorageReceiptBillDetailBatchService extends MybatisBaseService<Sto
         });
     }
 
-    public List<StorageReceiptBillDetailBatchDto2> getDetailsInit(String sid, String detailsSid) {
+    public List<WarehouseReceiptBillDetailBatchDto2> getDetailsInit(String sid, String detailsSid) {
         return baseMapper.getDetailsInit(sid, detailsSid);
     }
 
-    public StorageReceiptBillDetailBatch selectByDetails(String sid) {
+    public WarehouseReceiptBillDetailBatch selectByDetails(String sid) {
         return baseMapper.selectByDetails(sid);
     }
 }

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBill.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/10
  **/
 @Data
-public class StorageShelfBill extends BaseEntity {
+public class WarehouseShelfBill extends BaseEntity {
     @ApiModelProperty("来源单sid（收货单sid）")
     private String sourceBillSid;
     @ApiModelProperty("来源单号（收货单号）")

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillDto.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillDto.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
-import com.yxt.storage.biz.storageshelfbilldetail.StorageShelfBillDetailDto;
+import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageShelfBillDto {
+public class WarehouseShelfBillDto {
     private String sid;
     @ApiModelProperty("单据编号")
     private String billNo;
@@ -32,5 +32,5 @@ public class StorageShelfBillDto {
 
     private String remarks;
 
-    private List<StorageShelfBillDetailDto> list = new ArrayList<>();
+    private List<WarehouseShelfBillDetailDto> list = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,10 +13,10 @@ import org.apache.ibatis.annotations.Param;
  * @date: 2024/4/11
  **/
 @Mapper
-public interface StorageShelfBillMapper extends BaseMapper<StorageShelfBill> {
-    IPage<StorageShelfBillVo> listPage(IPage<StorageShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<StorageShelfBill> qw);
+public interface WarehouseShelfBillMapper extends BaseMapper<WarehouseShelfBill> {
+    IPage<WarehouseShelfBillVo> listPage(IPage<WarehouseShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseShelfBill> qw);
 
-    ShelfDetailsVo details(String sid);
+    WarehouseShelfDetailsVo details(String sid);
 
     String selectNum(String goodsId);
 }

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillMapper.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.storage.biz.storageshelfbill.StorageShelfBillMapper">
-    <select id="listPage" resultType="com.yxt.storage.biz.storageshelfbill.StorageShelfBillVo">
+<mapper namespace="com.yxt.warehouse.biz.warehouseshelfbill.WarehouseShelfBillMapper">
+    <select id="listPage" resultType="com.yxt.warehouse.biz.warehouseshelfbill.WarehouseShelfBillVo">
         select wsb.sid,
                wsb.billNo,
                DATE_FORMAT(wsb.createTime, '%Y-%m-%d') as createTime,
@@ -16,7 +16,7 @@
         </where>
     </select>
 
-    <select id="details" resultType="com.yxt.storage.biz.storageshelfbill.ShelfDetailsVo">
+    <select id="details" resultType="com.yxt.warehouse.biz.warehouseshelfbill.WarehouseShelfDetailsVo">
         select wsb.sid,
                wsb.billNo,
                wsb.createBySid,

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageShelfBillQuery implements Query {
+public class WarehouseShelfBillQuery implements Query {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -10,20 +10,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.storage.biz.storageinventory.StorageInventorySaveDto;
-import com.yxt.storage.biz.storageinventory.StorageInventoryService;
-import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordDto;
-import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordService;
-import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBill;
-import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillService;
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail;
-import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch;
-import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService;
-import com.yxt.storage.biz.storageshelfbilldetail.*;
-import com.yxt.storage.feign.goods.basegoodssku.BaseGoodsSkuDetailsVo;
-import com.yxt.storage.feign.goods.basegoodssku.BaseGoodsSkuFeign;
-import com.yxt.storage.utils.Rule;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventorySaveDto;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryService;
+import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordDto;
+import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordService;
+import com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBill;
+import com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBillService;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetail;
+import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailService;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatch;
+import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService;
+import com.yxt.warehouse.biz.warehouseshelfbilldetail.*;
+import com.yxt.warehouse.feign.goods.basegoodssku.BaseGoodsSkuDetailsVo;
+import com.yxt.warehouse.feign.goods.basegoodssku.BaseGoodsSkuFeign;
+import com.yxt.warehouse.utils.Rule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,29 +40,29 @@ import java.util.List;
  * @date: 2024/4/11
  **/
 @Service
-public class StorageShelfBillService extends MybatisBaseService<StorageShelfBillMapper, StorageShelfBill> {
+public class WarehouseShelfBillService extends MybatisBaseService<WarehouseShelfBillMapper, WarehouseShelfBill> {
     @Autowired
-    private StorageShelfBillDetailService wmsShelfBillDetailService;
+    private WarehouseShelfBillDetailService wmsShelfBillDetailService;
     @Autowired
-    private StorageShelfBillDetailMapper wmsShelfBillDetailMapper;
+    private WarehouseShelfBillDetailMapper wmsShelfBillDetailMapper;
 
     @Autowired
-    private StorageInventoryService wmsInventoryService;
+    private WarehouseInventoryService wmsInventoryService;
     @Resource
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
 
     @Autowired
-    private StorageInventoryRecordService wmsInventoryRecordService;
+    private WarehouseInventoryRecordService wmsInventoryRecordService;
     @Autowired
-    private StorageReceiptBillService wmsReceiptBillService;
+    private WarehouseReceiptBillService wmsReceiptBillService;
     @Autowired
-    private StorageReceiptBillDetailService wmsReceiptBillDetailService;
+    private WarehouseReceiptBillDetailService wmsReceiptBillDetailService;
     @Autowired
-    private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
+    private WarehouseReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
 
-    public PagerVo<StorageShelfBillVo> listPage(PagerQuery<StorageShelfBillQuery> pq) {
-        StorageShelfBillQuery query = pq.getParams();
-        QueryWrapper<StorageShelfBill> qw = new QueryWrapper<>();
+    public PagerVo<WarehouseShelfBillVo> listPage(PagerQuery<WarehouseShelfBillQuery> pq) {
+        WarehouseShelfBillQuery query = pq.getParams();
+        QueryWrapper<WarehouseShelfBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("wsb.billNo", query.getBillNo());
@@ -75,19 +75,19 @@ public class StorageShelfBillService extends MybatisBaseService<StorageShelfBill
         if (StringUtils.isNotBlank(query.getBillState())) {
             qw.like("wsb.billState", query.getBillState());
         }
-        IPage<StorageShelfBill> page = PagerUtil.queryToPage(pq);
-        IPage<StorageShelfBillVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<StorageShelfBillVo> p = PagerUtil.pageToVo(pagging, null);
+        IPage<WarehouseShelfBill> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseShelfBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseShelfBillVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean saveOrUpdateShelf(StorageShelfBillDto dto) {
+    public ResultBean saveOrUpdateShelf(WarehouseShelfBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            StorageShelfBill wmsShelfBill = new StorageShelfBill();
+            WarehouseShelfBill wmsShelfBill = new WarehouseShelfBill();
             BeanUtil.copyProperties(dto, wmsShelfBill, "sid");
-            List<StorageShelfBillDetailDto> list = dto.getList();
+            List<WarehouseShelfBillDetailDto> list = dto.getList();
             list.removeAll(Collections.singleton(null));
             sid = wmsShelfBill.getSid();
             if (!list.isEmpty()) {
@@ -95,12 +95,12 @@ public class StorageShelfBillService extends MybatisBaseService<StorageShelfBill
             }
             baseMapper.insert(wmsShelfBill);
         } else {
-            StorageShelfBill wmsShelfBill = fetchBySid(sid);
+            WarehouseShelfBill wmsShelfBill = fetchBySid(sid);
             if (wmsShelfBill == null) {
                 return rb.setMsg("该单据不存在");
             }
             BeanUtil.copyProperties(dto, wmsShelfBill, "sid");
-            List<StorageShelfBillDetailDto> list = dto.getList();
+            List<WarehouseShelfBillDetailDto> list = dto.getList();
             list.removeAll(Collections.singleton(null));
             sid = wmsShelfBill.getSid();
             if (!list.isEmpty()) {
@@ -116,13 +116,13 @@ public class StorageShelfBillService extends MybatisBaseService<StorageShelfBill
     }
 
     public void saveWmsInventory(String sid) {
-        StorageShelfBill wmsShelfBill = fetchBySid(sid);
-        List<StorageShelfBillDetailVos> detailList = wmsShelfBillDetailService.selectByBillSid(sid);
+        WarehouseShelfBill wmsShelfBill = fetchBySid(sid);
+        List<WarehouseShelfBillDetailVos> detailList = wmsShelfBillDetailService.selectByBillSid(sid);
         detailList.removeAll(Collections.singleton(null));
         if (!detailList.isEmpty()) {
             for (int i = 0; i < detailList.size(); i++) {
-                StorageShelfBillDetailVos s = detailList.get(i);
-                StorageInventorySaveDto dto = new StorageInventorySaveDto();
+                WarehouseShelfBillDetailVos s = detailList.get(i);
+                WarehouseInventorySaveDto dto = new WarehouseInventorySaveDto();
                 dto.setCreateBySid(wmsShelfBill.getCreateBySid());
                 dto.setBatchNumber(s.getBatchNumber());
                 dto.setGoodsID(getGoodsId(s.getGoodsSkuSid()));
@@ -143,10 +143,10 @@ public class StorageShelfBillService extends MybatisBaseService<StorageShelfBill
                 dto.setUseOrgSid(wmsShelfBill.getUseOrgSid());
                 dto.setSid(s.getInventorySid());
                 String inventorySid = wmsInventoryService.saveWmsInventory(dto).getData();
-                StorageShelfBillDetail wmsShelfBillDetail = wmsShelfBillDetailService.fetchBySid(s.getDetailsSid());
+                WarehouseShelfBillDetail wmsShelfBillDetail = wmsShelfBillDetailService.fetchBySid(s.getDetailsSid());
                 wmsShelfBillDetail.setInventorySid(inventorySid);
                 wmsShelfBillDetailService.updateById(wmsShelfBillDetail);
-                StorageInventoryRecordDto wmsInventoryRecordDto = new StorageInventoryRecordDto();
+                WarehouseInventoryRecordDto wmsInventoryRecordDto = new WarehouseInventoryRecordDto();
                 wmsInventoryRecordDto.setInventorySid(inventorySid);
                 wmsInventoryRecordDto.setGoodsID(dto.getGoodsID());
                 wmsInventoryRecordDto.setSourceBillSid(wmsShelfBill.getSourceBillSid());
@@ -203,55 +203,55 @@ public class StorageShelfBillService extends MybatisBaseService<StorageShelfBill
         return rb.success().setMsg("删除成功");
     }
 
-    public ResultBean<ShelfDetailsVo> details(String sid) {
-        ResultBean<ShelfDetailsVo> rb = ResultBean.fireFail();
-        ShelfDetailsVo shelfDetailsVo = baseMapper.details(sid);
-        if (shelfDetailsVo == null) {
+    public ResultBean<WarehouseShelfDetailsVo> details(String sid) {
+        ResultBean<WarehouseShelfDetailsVo> rb = ResultBean.fireFail();
+        WarehouseShelfDetailsVo warehouseShelfDetailsVo = baseMapper.details(sid);
+        if (warehouseShelfDetailsVo == null) {
             return rb.setMsg("该单据不存在");
         }
-        List<ShelfDetailsListVo> list = wmsShelfBillDetailService.details(sid);
+        List<WarehouseShelfDetailsListVo> list = wmsShelfBillDetailService.details(sid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
-            shelfDetailsVo.setList(list);
+            warehouseShelfDetailsVo.setList(list);
         }
-        return rb.success().setData(shelfDetailsVo);
+        return rb.success().setData(warehouseShelfDetailsVo);
     }
 
-    public ResultBean<ShelfInitVo> getInit(String sid, String orgPath, String userSid) {
-        ResultBean<ShelfInitVo> rb = ResultBean.fireFail();
-        ShelfInitVo shelfInitVo = new ShelfInitVo();
+    public ResultBean<WarehouseShelfInitVo> getInit(String sid, String orgPath, String userSid) {
+        ResultBean<WarehouseShelfInitVo> rb = ResultBean.fireFail();
+        WarehouseShelfInitVo warehouseShelfInitVo = new WarehouseShelfInitVo();
         //查询所有已上架的商品
         List<String> stringList = wmsShelfBillDetailService.selectReceiptSidList();
         stringList.removeAll(Collections.singleton(null));
         //获取收货单据
-        StorageReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid);
-        shelfInitVo.setCreateTime(DateUtil.today());//单据日期
-        shelfInitVo.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号
-        shelfInitVo.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid
-        shelfInitVo.setBillState(0);
-        List<ShelfInitListVo> list = new ArrayList<>();
+        WarehouseReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid);
+        warehouseShelfInitVo.setCreateTime(DateUtil.today());//单据日期
+        warehouseShelfInitVo.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号
+        warehouseShelfInitVo.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid
+        warehouseShelfInitVo.setBillState(0);
+        List<WarehouseShelfInitListVo> list = new ArrayList<>();
         //获取收货单据的明细
-        List<StorageReceiptBillDetail> wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList);
+        List<WarehouseReceiptBillDetail> wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList);
         wmsReceiptBillDetailsList.removeAll(Collections.singleton(null));
         if (!wmsReceiptBillDetailsList.isEmpty()) {
             for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) {
-                StorageReceiptBillDetail v = wmsReceiptBillDetailsList.get(i);
-                StorageReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid());
-                ShelfInitListVo shelfInitListVo = new ShelfInitListVo();
-                BeanUtil.copyProperties(v, shelfInitListVo, "sid");
-                shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber());
-                shelfInitListVo.setWarehouseSid(v.getWarehouseSid());
-                shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid());
-                shelfInitListVo.setWarehouseRackCode("");
-                list.add(shelfInitListVo);
+                WarehouseReceiptBillDetail v = wmsReceiptBillDetailsList.get(i);
+                WarehouseReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid());
+                WarehouseShelfInitListVo warehouseShelfInitListVo = new WarehouseShelfInitListVo();
+                BeanUtil.copyProperties(v, warehouseShelfInitListVo, "sid");
+                warehouseShelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber());
+                warehouseShelfInitListVo.setWarehouseSid(v.getWarehouseSid());
+                warehouseShelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid());
+                warehouseShelfInitListVo.setWarehouseRackCode("");
+                list.add(warehouseShelfInitListVo);
             }
         }
-        shelfInitVo.setList(list);
+        warehouseShelfInitVo.setList(list);
 
-        return rb.success().setData(shelfInitVo);
+        return rb.success().setData(warehouseShelfInitVo);
     }
 
-    public ResultBean<String> confirm(StorageShelfBillDto dto) {
+    public ResultBean<String> confirm(WarehouseShelfBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         dto.setBillState(1);
         ResultBean<String> resultBean = saveOrUpdateShelf(dto);

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageShelfBillVo {
+public class WarehouseShelfBillVo {
 
     private String sid;
     @ApiModelProperty("单据编号")

src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfDetailsVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
-import com.yxt.storage.biz.storageshelfbilldetail.ShelfDetailsListVo;
+import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfDetailsListVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/17
  **/
 @Data
-public class ShelfDetailsVo {
+public class WarehouseShelfDetailsVo {
 
     private String sid;
     @ApiModelProperty("单据编号")
@@ -33,5 +33,5 @@ public class ShelfDetailsVo {
 
     private String remarks;
 
-    private List<ShelfDetailsListVo> list = new ArrayList<>();
+    private List<WarehouseShelfDetailsListVo> list = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfInitVo.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfInitVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.storageshelfbill;
+package com.yxt.warehouse.biz.warehouseshelfbill;
 
-import com.yxt.storage.biz.storageshelfbilldetail.ShelfInitListVo;
+import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfInitListVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/23
  **/
 @Data
-public class ShelfInitVo {
+public class WarehouseShelfInitVo {
 
     private String sid;
     @ApiModelProperty("单据编号")
@@ -33,5 +33,5 @@ public class ShelfInitVo {
 
     private String remarks;
 
-    private List<ShelfInitListVo> list = new ArrayList<>();
+    private List<WarehouseShelfInitListVo> list = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @date: 2024/4/10
  **/
 @Data
-public class StorageShelfBillDetail extends BaseEntity {
+public class WarehouseShelfBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("收货单明细sid")

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailDto.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/15
  **/
 @Data
-public class StorageShelfBillDetailDto {
+public class WarehouseShelfBillDetailDto {
 
     @ApiModelProperty("收货单明细sid")
     private String receiptDetailSid;

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,12 +11,12 @@ import java.util.List;
  * @date: 2024/4/17
  **/
 @Mapper
-public interface StorageShelfBillDetailMapper extends BaseMapper<StorageShelfBillDetail> {
+public interface WarehouseShelfBillDetailMapper extends BaseMapper<WarehouseShelfBillDetail> {
     int deleteByMainSid(String sid);
 
-    List<ShelfDetailsListVo> details(String sid);
+    List<WarehouseShelfDetailsListVo> details(String sid);
 
-    List<StorageShelfBillDetailVos> selectByBillSid(String sid);
+    List<WarehouseShelfBillDetailVos> selectByBillSid(String sid);
 
     List<String> selectReceiptSidList();
 }

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.xml

@@ -1,13 +1,13 @@
 <?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.storage.biz.storageshelfbilldetail.StorageShelfBillDetailMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailMapper">
     <delete id="deleteByMainSid">
         delete
         from wms_shelf_bill_detail
         where billSid = #{sid}
     </delete>
 
-    <select id="details" resultType="com.yxt.storage.biz.storageshelfbilldetail.ShelfDetailsListVo">
+    <select id="details" resultType="com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfDetailsListVo">
         select wsd.batchNumber,
                wsd.inventorySid,
                wsd.warehouseSid,
@@ -18,7 +18,7 @@
         where billSid = #{sid}
     </select>
 
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storageshelfbilldetail.StorageShelfBillDetailVos">
+    <select id="selectByBillSid" resultType="com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailVos">
         select wrbd.goodSpuSid,
                wrbd.goodsSpuName,
                wrbd.goodsSkuSid,

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -12,22 +12,22 @@ import java.util.List;
  * @date: 2024/4/17
  **/
 @Service
-public class StorageShelfBillDetailService extends MybatisBaseService<StorageShelfBillDetailMapper, StorageShelfBillDetail> {
-    public void saveShelfDetails(String sid, List<StorageShelfBillDetailDto> list) {
+public class WarehouseShelfBillDetailService extends MybatisBaseService<WarehouseShelfBillDetailMapper, WarehouseShelfBillDetail> {
+    public void saveShelfDetails(String sid, List<WarehouseShelfBillDetailDto> list) {
         baseMapper.deleteByMainSid(sid);
         list.forEach(v -> {
-            StorageShelfBillDetail wmsShelfBillDetail = new StorageShelfBillDetail();
+            WarehouseShelfBillDetail wmsShelfBillDetail = new WarehouseShelfBillDetail();
             BeanUtil.copyProperties(v, wmsShelfBillDetail, "sid");
             wmsShelfBillDetail.setBillSid(sid);
             baseMapper.insert(wmsShelfBillDetail);
         });
     }
 
-    public List<ShelfDetailsListVo> details(String sid) {
+    public List<WarehouseShelfDetailsListVo> details(String sid) {
         return baseMapper.details(sid);
     }
 
-    public List<StorageShelfBillDetailVos> selectByBillSid(String sid) {
+    public List<WarehouseShelfBillDetailVos> selectByBillSid(String sid) {
         return baseMapper.selectByBillSid(sid);
     }
 

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailVos.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/19
  **/
 @Data
-public class StorageShelfBillDetailVos {
+public class WarehouseShelfBillDetailVos {
 
     private String detailsSid;
 

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfDetailsListVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date: 2024/4/18
  **/
 @Data
-public class ShelfDetailsListVo implements Vo {
+public class WarehouseShelfDetailsListVo implements Vo {
 
     @ApiModelProperty("批次号")
     private String batchNumber;

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java → src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfInitListVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.storageshelfbilldetail;
+package com.yxt.warehouse.biz.warehouseshelfbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/23
  **/
 @Data
-public class ShelfInitListVo {
+public class WarehouseShelfInitListVo {
 
     @ApiModelProperty("批次号")
     private String batchNumber;

src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java → src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.feign.goods.basegoodssku;
+package com.yxt.warehouse.feign.goods.basegoodssku;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeign.java → src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeign.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.feign.goods.basegoodssku;
+package com.yxt.warehouse.feign.goods.basegoodssku;
 
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;