修改wms为storage

src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java

@@ -3,7 +3,7 @@ package com.yxt.storage.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.wmsansbill.*;
+import com.yxt.storage.biz.storageansbill.*;
 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 WmsAnsBillRest {
+public class StorageAnsBillRest {
 
     @Autowired
-    private WmsAnsBillService wmsAnsBillService;
+    private StorageAnsBillService wmsAnsBillService;
 
 
     @PostMapping("saveOrUpdate")
     @ApiOperation("新增修改保存")
-    ResultBean<String> saveOrUpdate(@RequestBody WmsAnsBillDto dto) {
+    ResultBean<String> saveOrUpdate(@RequestBody StorageAnsBillDto dto) {
         return wmsAnsBillService.saveOrUpdateBill(dto);
     }
 
     @PostMapping("listPage")
     @ApiOperation("分页列表")
-    ResultBean<PagerVo<WmsAnsBillVo>> listPage(@RequestBody PagerQuery<WmsAnsBillQuery> pagerQuery) {
+    ResultBean<PagerVo<StorageAnsBillVo>> listPage(@RequestBody PagerQuery<StorageAnsBillQuery> pagerQuery) {
-        ResultBean<PagerVo<WmsAnsBillVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<StorageAnsBillVo>> rb = ResultBean.fireFail();
-        PagerVo<WmsAnsBillVo> pv = wmsAnsBillService.listPages(pagerQuery);
+        PagerVo<StorageAnsBillVo> pv = wmsAnsBillService.listPages(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @GetMapping("details")
     @ApiOperation("详情")
-    ResultBean<WmsAnsDetailsVo> details(@RequestParam("sid") String sid) {
+    ResultBean<StorageAnsDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsAnsBillService.details(sid);
     }
 

src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java

@@ -3,7 +3,7 @@ package com.yxt.storage.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.wmsdistributebill.*;
+import com.yxt.storage.biz.storagedistributebill.*;
 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/WmsDistributeBill")
-public class WmsDistributeBillRest {
+public class StorageDistributeBillRest {
 
     @Autowired
-    private WmsDistributeBillService wmsDistributeBillService;
+    private StorageDistributeBillService wmsDistributeBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    ResultBean<PagerVo<WmsDistributeBillVo>> listPage(@RequestBody PagerQuery<WmsDistributeBillQuery> pagerQuery) {
+    ResultBean<PagerVo<StorageDistributeBillVo>> listPage(@RequestBody PagerQuery<StorageDistributeBillQuery> pagerQuery) {
-        ResultBean<PagerVo<WmsDistributeBillVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<StorageDistributeBillVo>> rb = ResultBean.fireFail();
-        PagerVo<WmsDistributeBillVo> pv = wmsDistributeBillService.listPage(pagerQuery);
+        PagerVo<StorageDistributeBillVo> pv = wmsDistributeBillService.listPage(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("从出库新增配货单")
     @GetMapping("/getInit")
-    ResultBean<WmsDistributeBillInitVo> getInit(@RequestParam("sid") String sid) {
+    ResultBean<StorageDistributeBillInitVo> getInit(@RequestParam("sid") String sid) {
         return wmsDistributeBillService.getInit(sid);
     }
 
     @ApiOperation("详情/编辑初始化")
     @GetMapping("/details")
-    ResultBean<WmsDistributeBillInitVo> details(@RequestParam("sid") String sid) {
+    ResultBean<StorageDistributeBillInitVo> details(@RequestParam("sid") String sid) {
         return wmsDistributeBillService.details(sid);
     }
 
     @ApiOperation("新增修改保存")
     @PostMapping("/saveOrUpdateBill")
-    ResultBean<String> saveOrUpdateBill(@RequestBody WmsDistributeBillDto dto) {
+    ResultBean<String> saveOrUpdateBill(@RequestBody StorageDistributeBillDto dto) {
         return wmsDistributeBillService.saveOrUpdateBill(dto);
     }
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
-    ResultBean<String> confirm(@RequestBody WmsDistributeBillDto dto) {
+    ResultBean<String> confirm(@RequestBody StorageDistributeBillDto dto) {
         return wmsDistributeBillService.confirm(dto);
     }
 }

src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java

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

src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java

@@ -1,22 +1,17 @@
 package com.yxt.storage.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.wmsinventory.WmsInventory;
+import com.yxt.storage.biz.storageinventory.StorageInventoryQuery;
-import com.yxt.storage.biz.wmsinventory.WmsInventoryQuery;
+import com.yxt.storage.biz.storageinventory.StorageInventoryService;
-import com.yxt.storage.biz.wmsinventory.WmsInventoryService;
+import com.yxt.storage.biz.storageinventory.StorageInventoryVo;
-import com.yxt.storage.biz.wmsinventory.WmsInventoryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
 
 /**
  * @author wangpengfei
@@ -25,19 +20,19 @@ import java.util.List;
 @Api(tags = "库存信息")
 @RestController
 @RequestMapping("/apiadmin/inventory/wmsinventory")
-public class WmsInventoryRest {
+public class StorageInventoryRest {
 
     @Autowired
-    WmsInventoryService wmsInventoryService;
+    StorageInventoryService wmsInventoryService;
     @Autowired
     HttpServletResponse response;
 
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<WmsInventoryVo>> listPage(@RequestBody PagerQuery<WmsInventoryQuery> pq) {
+    public ResultBean<PagerVo<StorageInventoryVo>> listPage(@RequestBody PagerQuery<StorageInventoryQuery> pq) {
-        ResultBean<PagerVo<WmsInventoryVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<StorageInventoryVo>> rb = ResultBean.fireFail();
-        PagerVo<WmsInventoryVo> pv = wmsInventoryService.listPage(pq);
+        PagerVo<StorageInventoryVo> pv = wmsInventoryService.listPage(pq);
         return rb.success().setData(pv);
     }
 

src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java

@@ -3,7 +3,7 @@ package com.yxt.storage.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.wmsoutbill.*;
+import com.yxt.storage.biz.storageoutbill.*;
 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 WmsOutBillRest {
+public class StorageOutBillRest {
 
     @Autowired
-    private WmsOutBillService wmsOutBillService;
+    private StorageOutBillService wmsOutBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    ResultBean<PagerVo<WmsOutBillVo>> pageList(@RequestBody PagerQuery<WmsOutBillQuery> pagerQuery) {
+    ResultBean<PagerVo<StorageOutBillVo>> pageList(@RequestBody PagerQuery<StorageOutBillQuery> pagerQuery) {
-        ResultBean<PagerVo<WmsOutBillVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<StorageOutBillVo>> rb = ResultBean.fireFail();
-        PagerVo<WmsOutBillVo> pv = wmsOutBillService.listPage(pagerQuery);
+        PagerVo<StorageOutBillVo> pv = wmsOutBillService.listPage(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("出库保存修改")
     @PostMapping("/saveOrUpdateOutBill")
-    ResultBean saveOrUpdateOutBill(@RequestBody WmsOutBillDto dto) {
+    ResultBean saveOrUpdateOutBill(@RequestBody StorageOutBillDto dto) {
         return wmsOutBillService.saveOrUpdateOutBill(dto);
     }
 
     @ApiOperation("详情")
     @GetMapping("/details")
-    ResultBean<WmsOutBillDetailsVo> details(@RequestParam("sid") String sid) {
+    ResultBean<StorageOutBillDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsOutBillService.details(sid);
     }
 }

src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java

@@ -3,7 +3,7 @@ package com.yxt.storage.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.wmsreceiptbill.*;
+import com.yxt.storage.biz.storagereceiptbill.*;
 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 WmsReceiptBillRest {
+public class StorageReceiptBillRest {
 
     @Autowired
-    private WmsReceiptBillService wmsReceiptBillService;
+    private StorageReceiptBillService wmsReceiptBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<WmsReceiptBillPageVo>> listPage(@RequestBody PagerQuery<WmsReceiptBillQuery> pq) {
+    public ResultBean<PagerVo<StorageReceiptBillPageVo>> listPage(@RequestBody PagerQuery<StorageReceiptBillQuery> pq) {
-        ResultBean<PagerVo<WmsReceiptBillPageVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<StorageReceiptBillPageVo>> rb = ResultBean.fireFail();
-        PagerVo<WmsReceiptBillPageVo> pv = wmsReceiptBillService.listPage(pq);
+        PagerVo<StorageReceiptBillPageVo> pv = wmsReceiptBillService.listPage(pq);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("新增修改保存")
     @PostMapping("/saveOrUpdate")
-    ResultBean<String> saveOrUpdate(@RequestBody WmsReceiptBillDto2 dto) {
+    ResultBean<String> saveOrUpdate(@RequestBody StorageReceiptBillDto2 dto) {
         return wmsReceiptBillService.saveOrUpdateBill2(dto);
     }
 
     @ApiOperation("通知单收货单初始化")
     @GetMapping("/getInitDetails")
-    ResultBean<WmsReceiptBillVo> getInitDetails(@RequestParam("sourceSid") String sourceSid) {
+    ResultBean<StorageReceiptBillVo> getInitDetails(@RequestParam("sourceSid") String sourceSid) {
         return wmsReceiptBillService.getInitDetails(sourceSid);
     }
 
     @ApiOperation("收货单据编辑初始化/详情")
     @GetMapping("/getDetailsInit")
-    ResultBean<WmsReceiptBillInitVo> getDetailsInit(@RequestParam("sid") String sid) {
+    ResultBean<StorageReceiptBillInitVo> getDetailsInit(@RequestParam("sid") String sid) {
         return wmsReceiptBillService.getDetailsInit(sid);
     }
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
-    ResultBean<String> confirm(@RequestBody WmsReceiptBillDto2 dto) {
+    ResultBean<String> confirm(@RequestBody StorageReceiptBillDto2 dto) {
         return wmsReceiptBillService.confirm(dto);
     }
 

src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java

@@ -3,7 +3,7 @@ package com.yxt.storage.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.wmsshelfbill.*;
+import com.yxt.storage.biz.storageshelfbill.*;
 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 WmsShelfBillRest {
+public class StorageShelfBillRest {
 
     @Autowired
-    private WmsShelfBillService wmsShelfBillService;
+    private StorageShelfBillService wmsShelfBillService;
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<WmsShelfBillVo>> listPage(@RequestBody PagerQuery<WmsShelfBillQuery> pq) {
+    public ResultBean<PagerVo<StorageShelfBillVo>> listPage(@RequestBody PagerQuery<StorageShelfBillQuery> pq) {
-        ResultBean<PagerVo<WmsShelfBillVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<StorageShelfBillVo>> rb = ResultBean.fireFail();
-        PagerVo<WmsShelfBillVo> pv = wmsShelfBillService.listPage(pq);
+        PagerVo<StorageShelfBillVo> pv = wmsShelfBillService.listPage(pq);
         return rb.success().setData(pv);
     }
 
     @ApiOperation("新增修改保存")
     @PostMapping("/saveOrUpdate")
-    ResultBean saveOrUpdate(@RequestBody WmsShelfBillDto dto) {
+    ResultBean saveOrUpdate(@RequestBody StorageShelfBillDto dto) {
         return wmsShelfBillService.saveOrUpdateShelf(dto);
     }
 
@@ -62,7 +62,7 @@ public class WmsShelfBillRest {
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
-    ResultBean<String> confirm(@RequestBody WmsShelfBillDto dto) {
+    ResultBean<String> confirm(@RequestBody StorageShelfBillDto dto) {
         return wmsShelfBillService.confirm(dto);
     }
 

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsansbill;
+package com.yxt.storage.biz.storageansbill;
 
 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 WmsAnsBill extends BaseEntity {
+public class StorageAnsBill extends BaseEntity {
 
     @ApiModelProperty("外部单号（业务单据编号）")
     private String sourceBillNo;

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

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.wmsansbill;
+package com.yxt.storage.biz.storageansbill;
 
-import com.yxt.storage.biz.wmsansbilldetail.WmsAnsBillDetailDto;
+import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,8 +13,8 @@ import java.util.List;
  * @author: dimengzhe
  * @date: 2024/4/9
  **/
-@Data
+@Data                       
-public class WmsAnsBillDto {
+public class StorageAnsBillDto {
 
     private String sid;
 
@@ -51,5 +51,5 @@ public class WmsAnsBillDto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
 
-    private List<WmsAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
+    private List<StorageAnsBillDetailDto> StorageAnsBillDetailList = new ArrayList<>();
 }

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

@@ -0,0 +1,24 @@
+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/storageansbill/StorageAnsBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsansbill;
+package com.yxt.storage.biz.storageansbill;
 
 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 WmsAnsBillQuery implements Query {
+public class StorageAnsBillQuery implements Query {
 
     @ApiModelProperty("单据编号")
     private String billNo;

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsansbill;
+package com.yxt.storage.biz.storageansbill;
 
 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.wmsansbilldetail.*;
+import com.yxt.storage.biz.storageansbilldetail.*;
 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 WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsAnsBill> {
+public class StorageAnsBillService extends MybatisBaseService<StorageAnsBillMapper, StorageAnsBill> {
 
     @Autowired
-    private WmsAnsBillDetailService wmsAnsBillDetailService;
+    private StorageAnsBillDetailService StorageAnsBillDetailService;
 
-    public ResultBean<String> saveOrUpdateBill(WmsAnsBillDto dto) {
+    public ResultBean<String> saveOrUpdateBill(StorageAnsBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            WmsAnsBill wmsAnsBill = new WmsAnsBill();
+            StorageAnsBill StorageAnsBill = new StorageAnsBill();
-            BeanUtil.copyProperties(dto, wmsAnsBill, "sid");
+            BeanUtil.copyProperties(dto, StorageAnsBill, "sid");
-            sid = wmsAnsBill.getSid();
+            sid = StorageAnsBill.getSid();
-            List<WmsAnsBillDetailDto> wmsAnsBillDetailList = dto.getWmsAnsBillDetailList();
+            List<StorageAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
-            wmsAnsBillDetailList.removeAll(Collections.singleton(null));
+            StorageAnsBillDetailList.removeAll(Collections.singleton(null));
-            if (!wmsAnsBillDetailList.isEmpty()) {
+            if (!StorageAnsBillDetailList.isEmpty()) {
-                wmsAnsBillDetailService.saveOrUpdateDetailsList(sid, wmsAnsBillDetailList);
+                StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
             } else {
                 return rb.setMsg("单据明细不能为空");
             }
-            baseMapper.insert(wmsAnsBill);
+            baseMapper.insert(StorageAnsBill);
 
         } else {
-            WmsAnsBill wmsAnsBill = fetchBySid(sid);
+            StorageAnsBill StorageAnsBill = fetchBySid(sid);
-            if (wmsAnsBill == null) {
+            if (StorageAnsBill == null) {
                 return rb.setMsg("该单据不存在");
             }
-            BeanUtil.copyProperties(dto, wmsAnsBill, "sid");
+            BeanUtil.copyProperties(dto, StorageAnsBill, "sid");
-            List<WmsAnsBillDetailDto> wmsAnsBillDetailList = dto.getWmsAnsBillDetailList();
+            List<StorageAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
-            wmsAnsBillDetailList.removeAll(Collections.singleton(null));
+            StorageAnsBillDetailList.removeAll(Collections.singleton(null));
-            if (!wmsAnsBillDetailList.isEmpty()) {
+            if (!StorageAnsBillDetailList.isEmpty()) {
-                wmsAnsBillDetailService.saveOrUpdateDetailsList(sid, wmsAnsBillDetailList);
+                StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
             } else {
                 return rb.setMsg("单据明细不能为空");
             }
-            baseMapper.updateById(wmsAnsBill);
+            baseMapper.updateById(StorageAnsBill);
 
         }
         return rb.success().setData(sid);
     }
 
-    public PagerVo<WmsAnsBillVo> listPages(PagerQuery<WmsAnsBillQuery> pagerQuery) {
+    public PagerVo<StorageAnsBillVo> listPages(PagerQuery<StorageAnsBillQuery> pagerQuery) {
-        WmsAnsBillQuery query = pagerQuery.getParams();
+        StorageAnsBillQuery query = pagerQuery.getParams();
-        QueryWrapper<WmsAnsBill> qw = new QueryWrapper<>();
+        QueryWrapper<StorageAnsBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
         if (query != null) {
             //单据编号
@@ -102,24 +102,24 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
             }
         }
 
-        IPage<WmsAnsBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<StorageAnsBill> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<WmsAnsBillVo> pagging = baseMapper.listPages(page, qw);
+        IPage<StorageAnsBillVo> pagging = baseMapper.listPages(page, qw);
-        PagerVo<WmsAnsBillVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<StorageAnsBillVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean<WmsAnsDetailsVo> details(String sid) {
+    public ResultBean<StorageAnsDetailsVo> details(String sid) {
-        ResultBean<WmsAnsDetailsVo> rb = ResultBean.fireFail();
+        ResultBean<StorageAnsDetailsVo> rb = ResultBean.fireFail();
-        WmsAnsDetailsVo wmsAnsDetailsVo = baseMapper.details(sid);
+        StorageAnsDetailsVo StorageAnsDetailsVo = baseMapper.details(sid);
-        if (wmsAnsDetailsVo != null) {
+        if (StorageAnsDetailsVo != null) {
-            List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sid);
+            List<StorageAnsListDetailsVo> list = StorageAnsBillDetailService.selectByBillSid(sid);
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                wmsAnsDetailsVo.setList(list);
+                StorageAnsDetailsVo.setList(list);
             }
         } else {
             return rb.setMsg("该单据不存在");
         }
-        return rb.success().setData(wmsAnsDetailsVo);
+        return rb.success().setData(StorageAnsDetailsVo);
     }
 }

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsansbilldetail;
+package com.yxt.storage.biz.storageansbilldetail;
 
 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 WmsAnsBillDetail extends BaseEntity {
+public class StorageAnsBillDetail extends BaseEntity {
 
     @ApiModelProperty("单据sid")
     private String billSid;

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

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

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsansbilldetail;
+package com.yxt.storage.biz.storageansbilldetail;
 
 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 WmsAnsBillDetailMapper extends BaseMapper<WmsAnsBillDetail> {
+public interface StorageAnsBillDetailMapper extends BaseMapper<StorageAnsBillDetail> {
     int deleteDetails(String sid);
 
-    List<WmsAnsListDetailsVo> selectByBillSid(String sid);
+    List<StorageAnsListDetailsVo> selectByBillSid(String sid);
 }

src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.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.wmsansbilldetail.WmsAnsBillDetailMapper">
+<mapper namespace="com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailMapper">
     <delete id="deleteDetails">
         delete
-        from wms_ans_bill_detail
+        from storage_ans_bill_detail
         where billSid = #{sid}
     </delete>
 
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.wmsansbilldetail.WmsAnsListDetailsVo">
+    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo">
         select wd.goodsSkuTitle,
                wd.goodsSkuCode,
                wd.goodsSkuOwnSpec,
@@ -19,7 +19,7 @@
                wd.taxAmount,
                wd.taxPrice,
                wd.amount
-        from wms_ans_bill_detail wd
+        from storage_ans_bill_detail wd
         where billSid = #{sid}
     </select>
 </mapper>

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

@@ -0,0 +1,29 @@
+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/storageansbilldetail/StorageAnsBillDetailVo.java

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

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

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

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebill;
+package com.yxt.storage.biz.storagedistributebill;
 
 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 WmsDistributeBill extends BaseEntity {
+public class StorageDistributeBill extends BaseEntity {
 
     @ApiModelProperty("出库单sid")
     private String sourceBillSid;

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.wmsdistributebill;
+package com.yxt.storage.biz.storagedistributebill;
 
-import com.yxt.wms.biz.inventory.wmsdistributebilldetail.WmsDistributeBillDetailDto;
+import com.yxt.storage.biz.storagedistributebilldetail.StorageDistributeBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/24
  **/
 @Data
-public class WmsDistributeBillDto {
+public class StorageDistributeBillDto {
 
     @ApiModelProperty("出库单sid")
     private String sourceBillSid;
@@ -33,5 +33,5 @@ public class WmsDistributeBillDto {
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
 
-    private List<WmsDistributeBillDetailDto> detailList = new ArrayList<>();
+    private List<StorageDistributeBillDetailDto> detailList = new ArrayList<>();
 }

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.wmsdistributebill;
+package com.yxt.storage.biz.storagedistributebill;
 
-import com.yxt.storage.biz.wmsdistributebilldetail.WmsDistributeBillDetailVo;
+import com.yxt.storage.biz.storagedistributebilldetail.StorageDistributeBillDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date: 2024/4/24
  **/
 @Data
-public class WmsDistributeBillInitVo {
+public class StorageDistributeBillInitVo {
 
     //单据编号
     private String billNo;
@@ -37,6 +37,6 @@ public class WmsDistributeBillInitVo {
     //备注
     private String remarks;
 
-    private List<WmsDistributeBillDetailVo> detailsList = new ArrayList<>();
+    private List<StorageDistributeBillDetailVo> detailsList = new ArrayList<>();
 
 }

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebill;
+package com.yxt.storage.biz.storagedistributebill;
 
 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 WmsDistributeBillMapper extends BaseMapper<WmsDistributeBill> {
+public interface StorageDistributeBillMapper extends BaseMapper<StorageDistributeBill> {
 }

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebill;
+package com.yxt.storage.biz.storagedistributebill;
 
 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 WmsDistributeBillQuery implements Query {
+public class StorageDistributeBillQuery implements Query {
 
     //单据编号
     @ApiModelProperty("单据编号")

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java

@@ -0,0 +1,35 @@
+package com.yxt.storage.biz.storagedistributebill;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Service
+public class StorageDistributeBillService extends MybatisBaseService<StorageDistributeBillMapper, StorageDistributeBill> {
+    public PagerVo<StorageDistributeBillVo> listPage(PagerQuery<StorageDistributeBillQuery> pagerQuery) {
+        return null;
+    }
+
+    public ResultBean<StorageDistributeBillInitVo> getInit(String sid) {
+        return null;
+    }
+
+    public ResultBean<StorageDistributeBillInitVo> details(String sid) {
+        return null;
+    }
+
+    public ResultBean<String> saveOrUpdateBill(StorageDistributeBillDto dto) {
+        return null;
+    }
+
+    public ResultBean<String> confirm(StorageDistributeBillDto dto) {
+        return null;
+    }
+}

src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebill;
+package com.yxt.storage.biz.storagedistributebill;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class WmsDistributeBillVo {
+public class StorageDistributeBillVo {
 
     private String sid;
     @ApiModelProperty("单据日期")

src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebilldetail;
+package com.yxt.storage.biz.storagedistributebilldetail;
 
 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 WmsDistributeBillDetail extends BaseEntity {
+public class StorageDistributeBillDetail extends BaseEntity {
     @ApiModelProperty("出库单明细sid")
     private String outBillDetailSid;
     @ApiModelProperty("单据sid")

src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebilldetail;
+package com.yxt.storage.biz.storagedistributebilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class WmsDistributeBillDetailVo {
+public class StorageDistributeBillDetailDto {
 
     @ApiModelProperty("出库单明细sid")
     private String outBillDetailSid;

src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsdistributebilldetail;
+package com.yxt.storage.biz.storagedistributebilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/4/24
  **/
 @Data
-public class WmsDistributeBillDetailDto {
+public class StorageDistributeBillDetailVo {
 
     @ApiModelProperty("出库单明细sid")
     private String outBillDetailSid;

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventory;
+package com.yxt.storage.biz.storageinventory;
 
 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 WmsInventory extends BaseEntity {
+public class StorageInventory extends BaseEntity {
     
     @ApiModelProperty("批次号")
     private String batchNumber;

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventory;
+package com.yxt.storage.biz.storageinventory;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -7,15 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
  */
 @Mapper
-public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
+public interface StorageInventoryMapper extends BaseMapper<StorageInventory> {
 
-    IPage<WmsInventoryVo> listPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
+    IPage<StorageInventoryVo> listPage(IPage<StorageInventory> page, @Param(Constants.WRAPPER) QueryWrapper<StorageInventory> qw);
 
 }

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

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventory;
+package com.yxt.storage.biz.storageinventory;
 
 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 WmsInventoryQuery implements Query {
+public class StorageInventoryQuery implements Query {
     @ApiModelProperty("goodsID")
     private String goodsID;
 

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java

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

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventory;
+package com.yxt.storage.biz.storageinventory;
 
 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 WmsInventoryService extends MybatisBaseService<WmsInventoryMapper, WmsInventory> {
+public class StorageInventoryService extends MybatisBaseService<StorageInventoryMapper, StorageInventory> {
-    public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
+    public PagerVo<StorageInventoryVo> listPage(PagerQuery<StorageInventoryQuery> pq) {
-        WmsInventoryQuery query = pq.getParams();
+        StorageInventoryQuery query = pq.getParams();
-        QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
+        QueryWrapper<StorageInventory> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getGoodsID())) {
             qw.like("a.goodsID", query.getGoodsID());
         }
@@ -39,22 +39,22 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             qw.like("a.batchNumber", query.getBatchNumber());
         }
 
-        IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
+        IPage<StorageInventory> page = PagerUtil.queryToPage(pq);
-        IPage<WmsInventoryVo> pagging = baseMapper.listPage(page, qw);
+        IPage<StorageInventoryVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<WmsInventoryVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<StorageInventoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean<String> saveWmsInventory(WmsInventorySaveDto dto) {
+    public ResultBean<String> saveWmsInventory(StorageInventorySaveDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            WmsInventory wmsInventory = new WmsInventory();
+            StorageInventory wmsInventory = new StorageInventory();
             BeanUtil.copyProperties(dto, wmsInventory, "sid");
             sid = wmsInventory.getSid();
             baseMapper.insert(wmsInventory);
         } else {
-            WmsInventory wmsInventory = fetchBySid(sid);
+            StorageInventory wmsInventory = fetchBySid(sid);
             if (wmsInventory == null) {
                 return rb.setMsg("该商品库存不存在");
             }

src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventory;
+package com.yxt.storage.biz.storageinventory;
 
 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 WmsInventoryVo implements Vo {
+public class StorageInventoryVo implements Vo {
 
     private String sid;
     @ApiModelProperty("商品ID")

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventoryrecord;
+package com.yxt.storage.biz.storageinventoryrecord;
 
 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 WmsInventoryRecord extends BaseEntity {
+public class StorageInventoryRecord extends BaseEntity {
 
     @ApiModelProperty("库存sid")
     private String inventorySid;

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

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

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

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

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

@@ -0,0 +1,16 @@
+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,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.wmsinventoryrecord.WmsInventoryRecordMapper">
+<mapper namespace="com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordMapper">
-    <select id="getWmsInventoryRecordList" resultType="com.yxt.storage.biz.wmsinventoryrecord.WmsInventoryRecordListVo">
+    <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,
@@ -9,7 +9,7 @@
                wir.billObjName,
                wir.count,
                wir.currentCount
-        from wms_inventory_record wir
+        from storage_inventory_record wir
         where wir.inventorySid = #{sid}
         order by wir.createTime desc
     </select>

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventoryrecord;
+package com.yxt.storage.biz.storageinventoryrecord;
 
 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 WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRecordMapper, WmsInventoryRecord> {
+public class StorageInventoryRecordService extends MybatisBaseService<StorageInventoryRecordMapper, StorageInventoryRecord> {
-    public ResultBean<List<WmsInventoryRecordListVo>> getWmsInventoryRecordList(String sid) {
+    public ResultBean<List<StorageInventoryRecordListVo>> getStorageInventoryRecordList(String sid) {
-        ResultBean<List<WmsInventoryRecordListVo>> rb = ResultBean.fireFail();
+        ResultBean<List<StorageInventoryRecordListVo>> rb = ResultBean.fireFail();
-        List<WmsInventoryRecordListVo> list = baseMapper.getWmsInventoryRecordList(sid);
+        List<StorageInventoryRecordListVo> list = baseMapper.getStorageInventoryRecordList(sid);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
 
-    public void saveOrUpdateDto(WmsInventoryRecordDto dto) {
+    public void saveOrUpdateDto(StorageInventoryRecordDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
@@ -34,27 +34,27 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         this.updateByDto(dto);
     }
 
-    public void insertByDto(WmsInventoryRecordDto dto) {
+    public void insertByDto(StorageInventoryRecordDto dto) {
-        WmsInventoryRecord entity = new WmsInventoryRecord();
+        StorageInventoryRecord entity = new StorageInventoryRecord();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
     }
 
-    public void updateByDto(WmsInventoryRecordDto dto) {
+    public void updateByDto(StorageInventoryRecordDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
         }
-        WmsInventoryRecord entity = fetchBySid(dtoSid);
+        StorageInventoryRecord entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.updateById(entity);
     }
 
-    public PagerVo<WmsInventoryRecordsVo> listPage(PagerQuery<WmsInventoryRecordsQuery> pagerQuery) {
+    public PagerVo<StorageInventoryRecordsVo> listPage(PagerQuery<StorageInventoryRecordsQuery> pagerQuery) {
         return null;
     }
 
-    public List<WmsInventoryRecordsExcelVo> listExcel(WmsInventoryRecordsQuery query) {
+    public List<StorageInventoryRecordsExcelVo> listExcel(StorageInventoryRecordsQuery query) {
         return null;
     }
 }

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventoryrecord;
+package com.yxt.storage.biz.storageinventoryrecord;
 
 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 WmsInventoryRecordsExcelVo {
+public class StorageInventoryRecordsExcelVo {
 
 
     @ExportEntityMap(CnName = "序号", EnName = "rankNo")

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsinventoryrecord;
+package com.yxt.storage.biz.storageinventoryrecord;
 
 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 WmsInventoryRecordsQuery implements Query {
+public class StorageInventoryRecordsQuery implements Query {
 
     @ApiModelProperty("商品ID")
     private String goodsID;

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

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

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsoutbill;
+package com.yxt.storage.biz.storageoutbill;
 
 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 WmsOutBill extends BaseEntity {
+public class StorageOutBill extends BaseEntity {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java

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

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java

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

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsoutbill;
+package com.yxt.storage.biz.storageoutbill;
 
 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 WmsOutBillMapper extends BaseMapper<WmsOutBill> {
+public interface StorageOutBillMapper extends BaseMapper<StorageOutBill> {
 }

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.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.wmsoutbill.WmsOutBillMapper">
+<mapper namespace="com.yxt.storage.biz.storageoutbill.StorageOutBillMapper">
 </mapper>

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsoutbill;
+package com.yxt.storage.biz.storageoutbill;
 
 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 WmsOutBillQuery implements Query {
+public class StorageOutBillQuery implements Query {
 
     //单据编号
     @ApiModelProperty("单据编号")

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsoutbill;
+package com.yxt.storage.biz.storageoutbill;
 
 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 WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsOutBill> {
+public class StorageOutBillService extends MybatisBaseService<StorageOutBillMapper, StorageOutBill> {
-    public PagerVo<WmsOutBillVo> listPage(PagerQuery<WmsOutBillQuery> pagerQuery) {
+    public PagerVo<StorageOutBillVo> listPage(PagerQuery<StorageOutBillQuery> pagerQuery) {
         return null;
     }
 
-    public ResultBean saveOrUpdateOutBill(WmsOutBillDto dto) {
+    public ResultBean saveOrUpdateOutBill(StorageOutBillDto dto) {
         return null;
     }
 
-    public ResultBean<WmsOutBillDetailsVo> details(String sid) {
+    public ResultBean<StorageOutBillDetailsVo> details(String sid) {
         return null;
     }
 }

src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java

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

src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsoutbilldetail;
+package com.yxt.storage.biz.storageoutbilldetail;
 
 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 WmsOutBillDetail extends BaseEntity {
+public class StorageOutBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("商品基础信息Sid")

src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java

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

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbill;
+package com.yxt.storage.biz.storagereceiptbill;
 
 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 WmsReceiptBill extends BaseEntity {
+public class StorageReceiptBill extends BaseEntity {
 
     @ApiModelProperty("来源单sid（asn单sid）")
     private String sourceBillSid;

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java

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

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java

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

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbill;
+package com.yxt.storage.biz.storagereceiptbill;
 
 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 WmsReceiptBillMapper extends BaseMapper<WmsReceiptBill> {
+public interface StorageReceiptBillMapper extends BaseMapper<StorageReceiptBill> {
-    IPage<WmsReceiptBillPageVo> listPage(IPage<WmsReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsReceiptBill> qw);
+    IPage<StorageReceiptBillPageVo> listPage(IPage<StorageReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<StorageReceiptBill> qw);
 
-    WmsReceiptBillInitVo getDetailsInit(String sid);
+    StorageReceiptBillInitVo getDetailsInit(String sid);
 }

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.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.wmsreceiptbill.WmsReceiptBillMapper">
+<mapper namespace="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillMapper">
-    <select id="listPage" resultType="com.yxt.storage.biz.wmsreceiptbill.WmsReceiptBillPageVo">
+    <select id="listPage" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillPageVo">
         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.wmsreceiptbill.WmsReceiptBillInitVo">
+    <select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillInitVo">
         select wrb.sid,
                wrb.billNo,
                wrb.sourceBillSid,

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java

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

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbill;
+package com.yxt.storage.biz.storagereceiptbill;
 
 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 WmsReceiptBillQuery implements Query {
+public class StorageReceiptBillQuery implements Query {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbill;
+package com.yxt.storage.biz.storagereceiptbill;
 
 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.wmsansbill.WmsAnsBill;
+import com.yxt.storage.biz.storageansbill.StorageAnsBill;
-import com.yxt.storage.biz.wmsansbill.WmsAnsBillService;
+import com.yxt.storage.biz.storageansbill.StorageAnsBillService;
-import com.yxt.storage.biz.wmsansbilldetail.WmsAnsBillDetailService;
+import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailService;
-import com.yxt.storage.biz.wmsansbilldetail.WmsAnsListDetailsVo;
+import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo;
-import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailDto2;
+import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2;
-import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailMapper;
+import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper;
-import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailService;
+import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService;
-import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailVo;
+import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService;
 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 WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapper, WmsReceiptBill> {
+public class StorageReceiptBillService extends MybatisBaseService<StorageReceiptBillMapper, StorageReceiptBill> {
 
     @Autowired
-    private WmsReceiptBillDetailService wmsReceiptBillDetailService;
+    private StorageReceiptBillDetailService wmsReceiptBillDetailService;
     @Autowired
-    private WmsAnsBillService wmsAnsBillService;
+    private StorageAnsBillService wmsAnsBillService;
     @Autowired
-    private WmsAnsBillDetailService wmsAnsBillDetailService;
+    private StorageAnsBillDetailService wmsAnsBillDetailService;
     @Autowired
-    private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
+    private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
     @Autowired
-    private WmsReceiptBillDetailMapper wmsReceiptBillDetailMapper;
+    private StorageReceiptBillDetailMapper wmsReceiptBillDetailMapper;
     @Autowired
-    private WmsReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper;
+    private StorageReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper;
 
-    public PagerVo<WmsReceiptBillPageVo> listPage(PagerQuery<WmsReceiptBillQuery> pq) {
+    public PagerVo<StorageReceiptBillPageVo> listPage(PagerQuery<StorageReceiptBillQuery> pq) {
-        WmsReceiptBillQuery query = pq.getParams();
+        StorageReceiptBillQuery query = pq.getParams();
-        QueryWrapper<WmsReceiptBill> qw = new QueryWrapper<>();
+        QueryWrapper<StorageReceiptBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("wrb.billNo", query.getBillNo());
@@ -72,22 +72,22 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         if (StringUtils.isNotBlank(query.getSourceBillNo())) {
             qw.like("wrb.sourceBillNo", query.getSourceBillNo());
         }
-        IPage<WmsReceiptBill> page = PagerUtil.queryToPage(pq);
+        IPage<StorageReceiptBill> page = PagerUtil.queryToPage(pq);
-        IPage<WmsReceiptBillPageVo> pagging = baseMapper.listPage(page, qw);
+        IPage<StorageReceiptBillPageVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<WmsReceiptBillPageVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<StorageReceiptBillPageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto) {
+    public ResultBean<String> saveOrUpdateBill2(StorageReceiptBillDto2 dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            WmsReceiptBill wmsReceiptBill = new WmsReceiptBill();
+            StorageReceiptBill wmsReceiptBill = new StorageReceiptBill();
             sid = wmsReceiptBill.getSid();
             BeanUtil.copyProperties(dto, wmsReceiptBill, "sid");
-            List<WmsReceiptBillDetailDto2> list = dto.getList();
+            List<StorageReceiptBillDetailDto2> list = dto.getList();
             list.removeAll(Collections.singleton(null));
-            List<WmsReceiptBillDetailBatchDto2> pcList = dto.getPcList();
+            List<StorageReceiptBillDetailBatchDto2> pcList = dto.getPcList();
             pcList.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
@@ -95,14 +95,14 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             baseMapper.insert(wmsReceiptBill);
 
         } else {
-            WmsReceiptBill wmsReceiptBill = fetchBySid(sid);
+            StorageReceiptBill wmsReceiptBill = fetchBySid(sid);
             if (wmsReceiptBill == null) {
                 return rb.setMsg("该单据不存在");
             }
             BeanUtil.copyProperties(dto, wmsReceiptBill, "sid");
-            List<WmsReceiptBillDetailDto2> list = dto.getList();
+            List<StorageReceiptBillDetailDto2> list = dto.getList();
             list.removeAll(Collections.singleton(null));
-            List<WmsReceiptBillDetailBatchDto2> pcList = dto.getPcList();
+            List<StorageReceiptBillDetailBatchDto2> pcList = dto.getPcList();
             pcList.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
@@ -112,41 +112,41 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         return rb.success().setData(sid);
     }
 
-    public ResultBean<WmsReceiptBillVo> getInitDetails(String sourceSid) {
+    public ResultBean<StorageReceiptBillVo> getInitDetails(String sourceSid) {
-        ResultBean<WmsReceiptBillVo> rb = ResultBean.fireFail();
+        ResultBean<StorageReceiptBillVo> rb = ResultBean.fireFail();
-        WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo();
+        StorageReceiptBillVo wmsReceiptBillVo = new StorageReceiptBillVo();
-        WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid);
+        StorageAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid);
         BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid");
         wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo());
         wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid());
         wmsReceiptBillVo.setCreateTime(DateUtil.today());
-        List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
+        List<StorageAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
-            List<WmsReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList());
+            List<StorageReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StorageReceiptBillDetailVo.class)).collect(Collectors.toList());
             wmsReceiptBillVo.setList(lists);
         }
 
         return rb.success().setData(wmsReceiptBillVo);
     }
 
-    public ResultBean<WmsReceiptBillInitVo> getDetailsInit(String sid) {
+    public ResultBean<StorageReceiptBillInitVo> getDetailsInit(String sid) {
-        ResultBean<WmsReceiptBillInitVo> rb = ResultBean.fireFail();
+        ResultBean<StorageReceiptBillInitVo> rb = ResultBean.fireFail();
-        WmsReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid);
+        StorageReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid);
-        List<WmsReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
+        List<StorageReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
         if (wmsReceiptBillInitVo != null) {
-            List<WmsReceiptBillDetailDto2> list = wmsReceiptBillDetailService.getDetailsInit(sid);
+            List<StorageReceiptBillDetailDto2> list = wmsReceiptBillDetailService.getDetailsInit(sid);
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 for (int i = 0; i < list.size(); i++) {
-                    WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
+                    StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
                     int a = i + 1;
                     wmsReceiptBillDetailDto2.setXh(String.valueOf(a));
-                    List<WmsReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid());
+                    List<StorageReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid());
                     pcList2.removeAll(Collections.singleton(null));
                     if (!pcList2.isEmpty()) {
                         for (int j = 0; j < pcList2.size(); j++) {
-                            WmsReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j);
+                            StorageReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j);
                             wmsReceiptBillDetailBatchDto2.setXh(String.valueOf(a));
                         }
                         pcList.addAll(pcList2);
@@ -161,14 +161,14 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         return rb.success().setData(wmsReceiptBillInitVo);
     }
 
-    public ResultBean<String> confirm(WmsReceiptBillDto2 dto) {
+    public ResultBean<String> confirm(StorageReceiptBillDto2 dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         dto.setBillState("1");
-        List<WmsReceiptBillDetailDto2> list = dto.getList();
+        List<StorageReceiptBillDetailDto2> list = dto.getList();
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             for (int i = 0; i < list.size(); i++) {
-                WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
+                StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
                 wmsReceiptBillDetailDto2.setState(1);
             }
         }

src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java

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

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbilldetail;
+package com.yxt.storage.biz.storagereceiptbilldetail;
 
 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 WmsReceiptBillDetail extends BaseEntity {
+public class StorageReceiptBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("商品基础信息Sid")

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbilldetail;
+package com.yxt.storage.biz.storagereceiptbilldetail;
 
 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 WmsReceiptBillDetailDto2 {
+public class StorageReceiptBillDetailDto2 {
 
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;

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

@@ -0,0 +1,21 @@
+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,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.wmsreceiptbilldetail.WmsReceiptBillDetailMapper">
+<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.wmsreceiptbilldetail.WmsReceiptBillDetailDto2">
+    <select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2">
         select wrbd.goodsSkuSid,
                wrbd.goodsSkuTitle,
                wrbd.goodsSkuCode,
@@ -29,7 +29,7 @@
         where billSid = #{sid}
     </select>
 
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetail">
+    <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">

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

@@ -1,9 +1,9 @@
-package com.yxt.storage.biz.wmsreceiptbilldetail;
+package com.yxt.storage.biz.storagereceiptbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService;
 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 WmsReceiptBillDetailService extends MybatisBaseService<WmsReceiptBillDetailMapper, WmsReceiptBillDetail> {
+public class StorageReceiptBillDetailService extends MybatisBaseService<StorageReceiptBillDetailMapper, StorageReceiptBillDetail> {
 
     @Autowired
-    private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
+    private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
 
-    public void saveOrUpdateDetailsList2(String sid, List<WmsReceiptBillDetailDto2> list, List<WmsReceiptBillDetailBatchDto2> pcList) {
+    public void saveOrUpdateDetailsList2(String sid, List<StorageReceiptBillDetailDto2> list, List<StorageReceiptBillDetailBatchDto2> pcList) {
         baseMapper.deleteByBillSid(sid);
         list.forEach(v -> {
-            WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
+            StorageReceiptBillDetail wmsReceiptBillDetail = new StorageReceiptBillDetail();
             BeanUtil.copyProperties(v, wmsReceiptBillDetail, "sid");
             wmsReceiptBillDetail.setBillSid(sid);
             baseMapper.insert(wmsReceiptBillDetail);
             wmsReceiptBillDetailBatchService.deleteByDetails(sid);
             pcList.removeAll(Collections.singleton(null));
             if (!pcList.isEmpty()) {
-                List<WmsReceiptBillDetailBatchDto2> pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList());
+                List<StorageReceiptBillDetailBatchDto2> 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 WmsReceiptBillDetailService extends MybatisBaseService<WmsReceiptBi
         });
     }
 
-    public List<WmsReceiptBillDetailDto2> getDetailsInit(String sid) {
+    public List<StorageReceiptBillDetailDto2> getDetailsInit(String sid) {
         return baseMapper.getDetailsInit(sid);
     }
 
-    public List<WmsReceiptBillDetail> selectByBillSid(String sid, List<String> sidList) {
+    public List<StorageReceiptBillDetail> selectByBillSid(String sid, List<String> sidList) {
         return baseMapper.selectByBillSid(sid, sidList);
     }
 }

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

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

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbilldetailbatch;
+package com.yxt.storage.biz.storagereceiptbilldetailbatch;
 
 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 WmsReceiptBillDetailBatch extends BaseEntity {
+public class StorageReceiptBillDetailBatch extends BaseEntity {
     @ApiModelProperty("收货单sid")
     private String billSid;
     @ApiModelProperty("收货明细sid")

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

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

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

@@ -0,0 +1,21 @@
+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,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.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper">
+<mapper namespace="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper">
     <delete id="deleteByDetails">
         delete
         from wms_receipt_bill_detail_batch
@@ -8,7 +8,7 @@
     </delete>
 
     <select id="getDetailsInit"
-            resultType="com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2">
+            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,
@@ -19,7 +19,7 @@
     </select>
 
     <select id="selectByDetails"
-            resultType="com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatch">
+            resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch">
         select *
         from wms_receipt_bill_detail_batch
         where detailSid = #{sid}

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

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsreceiptbilldetailbatch;
+package com.yxt.storage.biz.storagereceiptbilldetailbatch;
 
 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 WmsReceiptBillDetailBatchService extends MybatisBaseService<WmsReceiptBillDetailBatchMapper, WmsReceiptBillDetailBatch> {
+public class StorageReceiptBillDetailBatchService extends MybatisBaseService<StorageReceiptBillDetailBatchMapper, StorageReceiptBillDetailBatch> {
     public int deleteByDetails(String sid) {
         return baseMapper.deleteByDetails(sid);
     }
 
-    public void saveBatchs2(String sid, String sid1, List<WmsReceiptBillDetailBatchDto2> list) {
+    public void saveBatchs2(String sid, String sid1, List<StorageReceiptBillDetailBatchDto2> list) {
         list.forEach(v -> {
-            WmsReceiptBillDetailBatch wmsReceiptBillDetailBatch = new WmsReceiptBillDetailBatch();
+            StorageReceiptBillDetailBatch wmsReceiptBillDetailBatch = new StorageReceiptBillDetailBatch();
             BeanUtil.copyProperties(v, wmsReceiptBillDetailBatch, "sid");
             wmsReceiptBillDetailBatch.setBillSid(sid);
             wmsReceiptBillDetailBatch.setDetailSid(sid1);
@@ -27,11 +27,11 @@ public class WmsReceiptBillDetailBatchService extends MybatisBaseService<WmsRece
         });
     }
 
-    public List<WmsReceiptBillDetailBatchDto2> getDetailsInit(String sid, String detailsSid) {
+    public List<StorageReceiptBillDetailBatchDto2> getDetailsInit(String sid, String detailsSid) {
         return baseMapper.getDetailsInit(sid, detailsSid);
     }
 
-    public WmsReceiptBillDetailBatch selectByDetails(String sid) {
+    public StorageReceiptBillDetailBatch selectByDetails(String sid) {
         return baseMapper.selectByDetails(sid);
     }
 }

src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfDetailsVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.wmsshelfbill;
+package com.yxt.storage.biz.storageshelfbill;
 
-import com.yxt.storage.biz.wmsshelfbilldetail.ShelfDetailsListVo;
+import com.yxt.storage.biz.storageshelfbilldetail.ShelfDetailsListVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfInitVo.java

@@ -1,6 +1,6 @@
-package com.yxt.storage.biz.wmsshelfbill;
+package com.yxt.storage.biz.storageshelfbill;
 
-import com.yxt.storage.biz.wmsshelfbilldetail.ShelfInitListVo;
+import com.yxt.storage.biz.storageshelfbilldetail.ShelfInitListVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBill.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbill;
+package com.yxt.storage.biz.storageshelfbill;
 
 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 WmsShelfBill extends BaseEntity {
+public class StorageShelfBill extends BaseEntity {
     @ApiModelProperty("来源单sid（收货单sid）")
     private String sourceBillSid;
     @ApiModelProperty("来源单号（收货单号）")

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillDto.java

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

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbill;
+package com.yxt.storage.biz.storageshelfbill;
 
 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/11
  **/
 @Mapper
-public interface WmsShelfBillMapper extends BaseMapper<WmsShelfBill> {
+public interface StorageShelfBillMapper extends BaseMapper<StorageShelfBill> {
-    IPage<WmsShelfBillVo> listPage(IPage<WmsShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsShelfBill> qw);
+    IPage<StorageShelfBillVo> listPage(IPage<StorageShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<StorageShelfBill> qw);
 
     ShelfDetailsVo details(String sid);
 

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.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.wmsshelfbill.WmsShelfBillMapper">
+<mapper namespace="com.yxt.storage.biz.storageshelfbill.StorageShelfBillMapper">
-    <select id="listPage" resultType="com.yxt.storage.biz.wmsshelfbill.WmsShelfBillVo">
+    <select id="listPage" resultType="com.yxt.storage.biz.storageshelfbill.StorageShelfBillVo">
         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.wmsshelfbill.ShelfDetailsVo">
+    <select id="details" resultType="com.yxt.storage.biz.storageshelfbill.ShelfDetailsVo">
         select wsb.sid,
                wsb.billNo,
                wsb.createBySid,

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbill;
+package com.yxt.storage.biz.storageshelfbill;
 
 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 WmsShelfBillQuery implements Query {
+public class StorageShelfBillQuery implements Query {
 
     @ApiModelProperty("单据编号")
     private String billNo;

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbill;
+package com.yxt.storage.biz.storageshelfbill;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -10,17 +10,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.wmsinventory.WmsInventorySaveDto;
+import com.yxt.storage.biz.storageinventory.StorageInventorySaveDto;
-import com.yxt.storage.biz.wmsinventory.WmsInventoryService;
+import com.yxt.storage.biz.storageinventory.StorageInventoryService;
-import com.yxt.storage.biz.wmsinventoryrecord.WmsInventoryRecordDto;
+import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordDto;
-import com.yxt.storage.biz.wmsinventoryrecord.WmsInventoryRecordService;
+import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordService;
-import com.yxt.storage.biz.wmsreceiptbill.WmsReceiptBill;
+import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBill;
-import com.yxt.storage.biz.wmsreceiptbill.WmsReceiptBillService;
+import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillService;
-import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetail;
+import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail;
-import com.yxt.storage.biz.wmsreceiptbilldetail.WmsReceiptBillDetailService;
+import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatch;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch;
-import com.yxt.storage.biz.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
+import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService;
-import com.yxt.storage.biz.wmsshelfbilldetail.*;
+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;
@@ -40,29 +40,29 @@ import java.util.List;
  * @date: 2024/4/11
  **/
 @Service
-public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper, WmsShelfBill> {
+public class StorageShelfBillService extends MybatisBaseService<StorageShelfBillMapper, StorageShelfBill> {
     @Autowired
-    private WmsShelfBillDetailService wmsShelfBillDetailService;
+    private StorageShelfBillDetailService wmsShelfBillDetailService;
     @Autowired
-    private WmsShelfBillDetailMapper wmsShelfBillDetailMapper;
+    private StorageShelfBillDetailMapper wmsShelfBillDetailMapper;
 
     @Autowired
-    private WmsInventoryService wmsInventoryService;
+    private StorageInventoryService wmsInventoryService;
     @Resource
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
 
     @Autowired
-    private WmsInventoryRecordService wmsInventoryRecordService;
+    private StorageInventoryRecordService wmsInventoryRecordService;
     @Autowired
-    private WmsReceiptBillService wmsReceiptBillService;
+    private StorageReceiptBillService wmsReceiptBillService;
     @Autowired
-    private WmsReceiptBillDetailService wmsReceiptBillDetailService;
+    private StorageReceiptBillDetailService wmsReceiptBillDetailService;
     @Autowired
-    private WmsReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
+    private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService;
 
-    public PagerVo<WmsShelfBillVo> listPage(PagerQuery<WmsShelfBillQuery> pq) {
+    public PagerVo<StorageShelfBillVo> listPage(PagerQuery<StorageShelfBillQuery> pq) {
-        WmsShelfBillQuery query = pq.getParams();
+        StorageShelfBillQuery query = pq.getParams();
-        QueryWrapper<WmsShelfBill> qw = new QueryWrapper<>();
+        QueryWrapper<StorageShelfBill> qw = new QueryWrapper<>();
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("wsb.billNo", query.getBillNo());
@@ -75,19 +75,19 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         if (StringUtils.isNotBlank(query.getBillState())) {
             qw.like("wsb.billState", query.getBillState());
         }
-        IPage<WmsShelfBill> page = PagerUtil.queryToPage(pq);
+        IPage<StorageShelfBill> page = PagerUtil.queryToPage(pq);
-        IPage<WmsShelfBillVo> pagging = baseMapper.listPage(page, qw);
+        IPage<StorageShelfBillVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<WmsShelfBillVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<StorageShelfBillVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean saveOrUpdateShelf(WmsShelfBillDto dto) {
+    public ResultBean saveOrUpdateShelf(StorageShelfBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
-            WmsShelfBill wmsShelfBill = new WmsShelfBill();
+            StorageShelfBill wmsShelfBill = new StorageShelfBill();
             BeanUtil.copyProperties(dto, wmsShelfBill, "sid");
-            List<WmsShelfBillDetailDto> list = dto.getList();
+            List<StorageShelfBillDetailDto> list = dto.getList();
             list.removeAll(Collections.singleton(null));
             sid = wmsShelfBill.getSid();
             if (!list.isEmpty()) {
@@ -95,12 +95,12 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
             }
             baseMapper.insert(wmsShelfBill);
         } else {
-            WmsShelfBill wmsShelfBill = fetchBySid(sid);
+            StorageShelfBill wmsShelfBill = fetchBySid(sid);
             if (wmsShelfBill == null) {
                 return rb.setMsg("该单据不存在");
             }
             BeanUtil.copyProperties(dto, wmsShelfBill, "sid");
-            List<WmsShelfBillDetailDto> list = dto.getList();
+            List<StorageShelfBillDetailDto> list = dto.getList();
             list.removeAll(Collections.singleton(null));
             sid = wmsShelfBill.getSid();
             if (!list.isEmpty()) {
@@ -116,13 +116,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
     }
 
     public void saveWmsInventory(String sid) {
-        WmsShelfBill wmsShelfBill = fetchBySid(sid);
+        StorageShelfBill wmsShelfBill = fetchBySid(sid);
-        List<WmsShelfBillDetailVos> detailList = wmsShelfBillDetailService.selectByBillSid(sid);
+        List<StorageShelfBillDetailVos> detailList = wmsShelfBillDetailService.selectByBillSid(sid);
         detailList.removeAll(Collections.singleton(null));
         if (!detailList.isEmpty()) {
             for (int i = 0; i < detailList.size(); i++) {
-                WmsShelfBillDetailVos s = detailList.get(i);
+                StorageShelfBillDetailVos s = detailList.get(i);
-                WmsInventorySaveDto dto = new WmsInventorySaveDto();
+                StorageInventorySaveDto dto = new StorageInventorySaveDto();
                 dto.setCreateBySid(wmsShelfBill.getCreateBySid());
                 dto.setBatchNumber(s.getBatchNumber());
                 dto.setGoodsID(getGoodsId(s.getGoodsSkuSid()));
@@ -143,10 +143,10 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 dto.setUseOrgSid(wmsShelfBill.getUseOrgSid());
                 dto.setSid(s.getInventorySid());
                 String inventorySid = wmsInventoryService.saveWmsInventory(dto).getData();
-                WmsShelfBillDetail wmsShelfBillDetail = wmsShelfBillDetailService.fetchBySid(s.getDetailsSid());
+                StorageShelfBillDetail wmsShelfBillDetail = wmsShelfBillDetailService.fetchBySid(s.getDetailsSid());
                 wmsShelfBillDetail.setInventorySid(inventorySid);
                 wmsShelfBillDetailService.updateById(wmsShelfBillDetail);
-                WmsInventoryRecordDto wmsInventoryRecordDto = new WmsInventoryRecordDto();
+                StorageInventoryRecordDto wmsInventoryRecordDto = new StorageInventoryRecordDto();
                 wmsInventoryRecordDto.setInventorySid(inventorySid);
                 wmsInventoryRecordDto.setGoodsID(dto.getGoodsID());
                 wmsInventoryRecordDto.setSourceBillSid(wmsShelfBill.getSourceBillSid());
@@ -224,19 +224,19 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         List<String> stringList = wmsShelfBillDetailService.selectReceiptSidList();
         stringList.removeAll(Collections.singleton(null));
         //获取收货单据
-        WmsReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid);
+        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<>();
         //获取收货单据的明细
-        List<WmsReceiptBillDetail> wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList);
+        List<StorageReceiptBillDetail> wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList);
         wmsReceiptBillDetailsList.removeAll(Collections.singleton(null));
         if (!wmsReceiptBillDetailsList.isEmpty()) {
             for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) {
-                WmsReceiptBillDetail v = wmsReceiptBillDetailsList.get(i);
+                StorageReceiptBillDetail v = wmsReceiptBillDetailsList.get(i);
-                WmsReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid());
+                StorageReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid());
                 ShelfInitListVo shelfInitListVo = new ShelfInitListVo();
                 BeanUtil.copyProperties(v, shelfInitListVo, "sid");
                 shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber());
@@ -251,7 +251,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         return rb.success().setData(shelfInitVo);
     }
 
-    public ResultBean<String> confirm(WmsShelfBillDto dto) {
+    public ResultBean<String> confirm(StorageShelfBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         dto.setBillState(1);
         ResultBean<String> resultBean = saveOrUpdateShelf(dto);

src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java

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

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbilldetail;
+package com.yxt.storage.biz.storageshelfbilldetail;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbilldetail;
+package com.yxt.storage.biz.storageshelfbilldetail;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbilldetail;
+package com.yxt.storage.biz.storageshelfbilldetail;
 
 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 WmsShelfBillDetail extends BaseEntity {
+public class StorageShelfBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("收货单明细sid")

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java

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

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbilldetail;
+package com.yxt.storage.biz.storageshelfbilldetail;
 
 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 WmsShelfBillDetailMapper extends BaseMapper<WmsShelfBillDetail> {
+public interface StorageShelfBillDetailMapper extends BaseMapper<StorageShelfBillDetail> {
     int deleteByMainSid(String sid);
 
     List<ShelfDetailsListVo> details(String sid);
 
-    List<WmsShelfBillDetailVos> selectByBillSid(String sid);
+    List<StorageShelfBillDetailVos> selectByBillSid(String sid);
 
     List<String> selectReceiptSidList();
 }

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.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.wmsshelfbilldetail.WmsShelfBillDetailMapper">
+<mapper namespace="com.yxt.storage.biz.storageshelfbilldetail.StorageShelfBillDetailMapper">
     <delete id="deleteByMainSid">
         delete
         from wms_shelf_bill_detail
         where billSid = #{sid}
     </delete>
 
-    <select id="details" resultType="com.yxt.storage.biz.wmsshelfbilldetail.ShelfDetailsListVo">
+    <select id="details" resultType="com.yxt.storage.biz.storageshelfbilldetail.ShelfDetailsListVo">
         select wsd.batchNumber,
                wsd.inventorySid,
                wsd.warehouseSid,
@@ -18,7 +18,7 @@
         where billSid = #{sid}
     </select>
 
-    <select id="selectByBillSid" resultType="com.yxt.storage.biz.wmsshelfbilldetail.WmsShelfBillDetailVos">
+    <select id="selectByBillSid" resultType="com.yxt.storage.biz.storageshelfbilldetail.StorageShelfBillDetailVos">
         select wrbd.goodSpuSid,
                wrbd.goodsSpuName,
                wrbd.goodsSkuSid,

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java

@@ -1,4 +1,4 @@
-package com.yxt.storage.biz.wmsshelfbilldetail;
+package com.yxt.storage.biz.storageshelfbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -12,11 +12,11 @@ import java.util.List;
  * @date: 2024/4/17
  **/
 @Service
-public class WmsShelfBillDetailService extends MybatisBaseService<WmsShelfBillDetailMapper, WmsShelfBillDetail> {
+public class StorageShelfBillDetailService extends MybatisBaseService<StorageShelfBillDetailMapper, StorageShelfBillDetail> {
-    public void saveShelfDetails(String sid, List<WmsShelfBillDetailDto> list) {
+    public void saveShelfDetails(String sid, List<StorageShelfBillDetailDto> list) {
         baseMapper.deleteByMainSid(sid);
         list.forEach(v -> {
-            WmsShelfBillDetail wmsShelfBillDetail = new WmsShelfBillDetail();
+            StorageShelfBillDetail wmsShelfBillDetail = new StorageShelfBillDetail();
             BeanUtil.copyProperties(v, wmsShelfBillDetail, "sid");
             wmsShelfBillDetail.setBillSid(sid);
             baseMapper.insert(wmsShelfBillDetail);
@@ -27,7 +27,7 @@ public class WmsShelfBillDetailService extends MybatisBaseService<WmsShelfBillDe
         return baseMapper.details(sid);
     }
 
-    public List<WmsShelfBillDetailVos> selectByBillSid(String sid) {
+    public List<StorageShelfBillDetailVos> selectByBillSid(String sid) {
         return baseMapper.selectByBillSid(sid);
     }
 

src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java

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

src/main/java/com/yxt/storage/biz/wmsansbill/WmsAnsBillMapper.java

@@ -1,24 +0,0 @@
-package com.yxt.storage.biz.wmsansbill;
-
-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.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail;
-import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/9
- **/
-@Mapper
-public interface WmsAnsBillMapper extends BaseMapper<WmsAnsBill> {
-    IPage<WmsAnsBillDetailVo> listPage(IPage<WmsAnsBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WmsAnsBillDetail> qw);
-
-    IPage<WmsAnsBillVo> listPages(IPage<WmsAnsBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsAnsBill> qw);
-
-    WmsAnsDetailsVo details(String sid);
-}

src/main/java/com/yxt/storage/biz/wmsansbilldetail/WmsAnsBillDetailService.java

@@ -1,29 +0,0 @@
-package com.yxt.storage.biz.wmsansbilldetail;
-
-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 WmsAnsBillDetailService extends MybatisBaseService<WmsAnsBillDetailMapper, WmsAnsBillDetail> {
-    public void saveOrUpdateDetailsList(String sid, List<WmsAnsBillDetailDto> wmsAnsBillDetailList) {
-        baseMapper.deleteDetails(sid);
-        wmsAnsBillDetailList.forEach(v->{
-            WmsAnsBillDetail wmsAnsBillDetail = new WmsAnsBillDetail();
-            BeanUtil.copyProperties(v,wmsAnsBillDetail,"sid");
-            wmsAnsBillDetail.setBillSid(sid);
-            baseMapper.insert(wmsAnsBillDetail);
-        });
-    }
-
-    public List<WmsAnsListDetailsVo> selectByBillSid(String sid) {
-        return baseMapper.selectByBillSid(sid);
-    }
-}

src/main/java/com/yxt/storage/biz/wmsdistributebill/WmsDistributeBillService.java

@@ -1,35 +0,0 @@
-package com.yxt.storage.biz.wmsdistributebill;
-
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import org.springframework.stereotype.Service;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/4/24
- **/
-@Service
-public class WmsDistributeBillService extends MybatisBaseService<WmsDistributeBillMapper, WmsDistributeBill> {
-    public PagerVo<WmsDistributeBillVo> listPage(PagerQuery<WmsDistributeBillQuery> pagerQuery) {
-        return null;
-    }
-
-    public ResultBean<WmsDistributeBillInitVo> getInit(String sid) {
-        return null;
-    }
-
-    public ResultBean<WmsDistributeBillInitVo> details(String sid) {
-        return null;
-    }
-
-    public ResultBean<String> saveOrUpdateBill(WmsDistributeBillDto dto) {
-        return null;
-    }
-
-    public ResultBean<String> confirm(WmsDistributeBillDto dto) {
-        return null;
-    }
-}

src/main/java/com/yxt/storage/biz/wmsinventoryrecord/WmsInventoryRecordMapper.java

@@ -1,16 +0,0 @@
-package com.yxt.storage.biz.wmsinventoryrecord;
-
-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 WmsInventoryRecordMapper extends BaseMapper<WmsInventoryRecord> {
-    List<WmsInventoryRecordListVo> getWmsInventoryRecordList(String sid);
-}

src/main/java/com/yxt/storage/biz/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java

@@ -1,21 +0,0 @@
-package com.yxt.storage.biz.wmsreceiptbilldetail;
-
-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 WmsReceiptBillDetailMapper extends BaseMapper<WmsReceiptBillDetail> {
-    int deleteByBillSid(String sid);
-
-    List<WmsReceiptBillDetailDto2> getDetailsInit(String sid);
-
-    List<WmsReceiptBillDetail> selectByBillSid(@Param("sid") String sid, @Param("sidList") List<String> sidList);
-}

src/main/java/com/yxt/storage/biz/wmsreceiptbilldetailbatch/WmsReceiptBillDetailBatchMapper.java

@@ -1,21 +0,0 @@
-package com.yxt.storage.biz.wmsreceiptbilldetailbatch;
-
-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 WmsReceiptBillDetailBatchMapper extends BaseMapper<WmsReceiptBillDetailBatch> {
-    int deleteByDetails(String sid);
-
-    List<WmsReceiptBillDetailBatchDto2> getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid);
-
-    WmsReceiptBillDetailBatch selectByDetails(String sid);
-}