diff --git a/target/classes/application-pro.yml b/README.md similarity index 100% rename from target/classes/application-pro.yml rename to README.md diff --git a/pom.xml b/pom.xml index f063bab..be5c678 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ 4.0.0 - ss-common-storage - ss-common-storage + ss-common-warehouse + ss-common-warehouse 0.0.1 diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java b/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java deleted file mode 100644 index 7a2b557..0000000 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yxt.storage.biz.storageansbill; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetail; -import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/9 - **/ -@Mapper -public interface StorageAnsBillMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - StorageAnsDetailsVo details(String sid); -} diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml deleted file mode 100644 index 57b8972..0000000 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - delete - from storage_ans_bill_detail - where billSid = #{sid} - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java b/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java deleted file mode 100644 index 155c699..0000000 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yxt.storage.biz.storageansbilldetail; - -import cn.hutool.core.bean.BeanUtil; -import com.yxt.common.base.service.MybatisBaseService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/9 - **/ -@Service -public class StorageAnsBillDetailService extends MybatisBaseService { - public void saveOrUpdateDetailsList(String sid, List StorageAnsBillDetailList) { - baseMapper.deleteDetails(sid); - StorageAnsBillDetailList.forEach(v->{ - StorageAnsBillDetail StorageAnsBillDetail = new StorageAnsBillDetail(); - BeanUtil.copyProperties(v,StorageAnsBillDetail,"sid"); - StorageAnsBillDetail.setBillSid(sid); - baseMapper.insert(StorageAnsBillDetail); - }); - } - - public List selectByBillSid(String sid) { - return baseMapper.selectByBillSid(sid); - } -} diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java deleted file mode 100644 index 72faef5..0000000 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yxt.storage.biz.storageinventoryrecord; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/24 - **/ -@Mapper -public interface StorageInventoryRecordMapper extends BaseMapper { - List getStorageInventoryRecordList(String sid); -} diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml b/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml deleted file mode 100644 index c7f6fb1..0000000 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml b/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml deleted file mode 100644 index 19fcf7e..0000000 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java deleted file mode 100644 index 57b3f4c..0000000 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.storage.biz.storagereceiptbilldetail; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/3 - **/ -@Mapper -public interface StorageReceiptBillDetailMapper extends BaseMapper { - int deleteByBillSid(String sid); - - List getDetailsInit(String sid); - - List selectByBillSid(@Param("sid") String sid, @Param("sidList") List sidList); -} diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml deleted file mode 100644 index 79d48f0..0000000 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - delete - from wms_receipt_bill_detail - where billSid = #{sid} - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java deleted file mode 100644 index 9c51284..0000000 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.storage.biz.storagereceiptbilldetailbatch; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @description: - * @author: dimengzhe - * @date: 2024/4/12 - **/ -@Mapper -public interface StorageReceiptBillDetailBatchMapper extends BaseMapper { - int deleteByDetails(String sid); - - List getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid); - - StorageReceiptBillDetailBatch selectByDetails(String sid); -} diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml b/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml deleted file mode 100644 index 73e1056..0000000 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - delete - from wms_receipt_bill_detail_batch - where billSid = #{sid} - - - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/StorageApplication.java b/src/main/java/com/yxt/warehouse/WarehouseApplication.java similarity index 82% rename from src/main/java/com/yxt/storage/StorageApplication.java rename to src/main/java/com/yxt/warehouse/WarehouseApplication.java index 7a9b6f0..3167b52 100644 --- a/src/main/java/com/yxt/storage/StorageApplication.java +++ b/src/main/java/com/yxt/warehouse/WarehouseApplication.java @@ -1,4 +1,4 @@ -package com.yxt.storage; +package com.yxt.warehouse; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,9 +17,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; // 启用自带定时任务 @EnableScheduling @EnableFeignClients(basePackages = {"com.yxt.*.*"}) -public class StorageApplication { +public class WarehouseApplication { public static void main(String[] args) { - SpringApplication.run(StorageApplication.class, args); + SpringApplication.run(WarehouseApplication.class, args); } } diff --git a/src/main/java/com/yxt/storage/apiadmin/AdminHomeRest.java b/src/main/java/com/yxt/warehouse/apiadmin/AdminHomeRest.java similarity index 87% rename from src/main/java/com/yxt/storage/apiadmin/AdminHomeRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/AdminHomeRest.java index 8e1b450..c88ffaf 100644 --- a/src/main/java/com/yxt/storage/apiadmin/AdminHomeRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/AdminHomeRest.java @@ -1,4 +1,4 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java similarity index 58% rename from src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java index d79d272..f11ebca 100644 --- a/src/main/java/com/yxt/storage/apiadmin/StorageAnsBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java @@ -1,9 +1,9 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageansbill.*; +import com.yxt.warehouse.biz.warehouseansbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,29 +17,29 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "预期到货通知单") @RestController @RequestMapping("/apiadmin/WmsAnsBill") -public class StorageAnsBillRest { +public class WarehouseAnsBillRest { @Autowired - private StorageAnsBillService wmsAnsBillService; + private WarehouseAnsBillService wmsAnsBillService; @PostMapping("saveOrUpdate") @ApiOperation("新增修改保存") - ResultBean saveOrUpdate(@RequestBody StorageAnsBillDto dto) { + ResultBean saveOrUpdate(@RequestBody WarehouseAnsBillDto dto) { return wmsAnsBillService.saveOrUpdateBill(dto); } @PostMapping("listPage") @ApiOperation("分页列表") - ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsAnsBillService.listPages(pagerQuery); + ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsAnsBillService.listPages(pagerQuery); return rb.success().setData(pv); } @GetMapping("details") @ApiOperation("详情") - ResultBean details(@RequestParam("sid") String sid) { + ResultBean details(@RequestParam("sid") String sid) { return wmsAnsBillService.details(sid); } diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java similarity index 56% rename from src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java index eb582ad..a256028 100644 --- a/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRecordRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java @@ -1,12 +1,12 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageinventoryrecord.*; +import com.yxt.warehouse.biz.warehouseinventoryrecord.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -20,33 +20,33 @@ import java.util.List; @Api(tags = "库存出入库记录") @RestController @RequestMapping("/apiadmin/inventory/Storageinventoryrecord") -public class StorageInventoryRecordRest { +public class WarehouseInventoryRecordRest { @Autowired - private StorageInventoryRecordService storageInventoryRecordService; + private WarehouseInventoryRecordService warehouseInventoryRecordService; @Autowired HttpServletResponse response; @ApiOperation("根据库存sid获取出入库记录") @GetMapping("/getStorageInventoryRecordList") - ResultBean> getStorageInventoryRecordList(@RequestParam("sid") String sid) { - return storageInventoryRecordService.getStorageInventoryRecordList(sid); + ResultBean> getStorageInventoryRecordList(@RequestParam("sid") String sid) { + return warehouseInventoryRecordService.getStorageInventoryRecordList(sid); } @ApiOperation("出入库查询") @PostMapping("/pageList") - ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = storageInventoryRecordService.listPage(pagerQuery); + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = warehouseInventoryRecordService.listPage(pagerQuery); return rb.success().setData(pv); } @PostMapping("/exportExcel") @ApiOperation(value = "导出") - public void exportExcel(@RequestBody StorageInventoryRecordsQuery query) { + public void exportExcel(@RequestBody WarehouseInventoryRecordsQuery query) { //得到所有要导出的数据 - List exportVoList = storageInventoryRecordService.listExcel(query); + List exportVoList = warehouseInventoryRecordService.listExcel(query); //定义导出的excel名字 String excelName = "出入库查询"; String fileNameURL = ""; @@ -55,7 +55,7 @@ public class StorageInventoryRecordRest { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } - ExportExcelUtils.export(fileNameURL, exportVoList, StorageInventoryRecordsExcelVo.class, response); + ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseInventoryRecordsExcelVo.class, response); } } diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java similarity index 59% rename from src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java index ff8adad..3203ada 100644 --- a/src/main/java/com/yxt/storage/apiadmin/StorageInventoryRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java @@ -1,11 +1,11 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageinventory.StorageInventoryQuery; -import com.yxt.storage.biz.storageinventory.StorageInventoryService; -import com.yxt.storage.biz.storageinventory.StorageInventoryVo; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryQuery; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryService; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -20,19 +20,19 @@ import javax.servlet.http.HttpServletResponse; @Api(tags = "库存信息") @RestController @RequestMapping("/apiadmin/inventory/wmsinventory") -public class StorageInventoryRest { +public class WarehouseInventoryRest { @Autowired - StorageInventoryService wmsInventoryService; + WarehouseInventoryService wmsInventoryService; @Autowired HttpServletResponse response; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryService.listPage(pq); return rb.success().setData(pv); } diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillRest.java similarity index 58% rename from src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillRest.java index 0ea32d0..476ceca 100644 --- a/src/main/java/com/yxt/storage/apiadmin/StorageOutBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillRest.java @@ -1,9 +1,9 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageoutbill.*; +import com.yxt.warehouse.biz.warehouseoutbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,28 +17,28 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "出库单据") @RestController @RequestMapping("/apiadmin/WmsOutBill") -public class StorageOutBillRest { +public class WarehouseOutBillRest { @Autowired - private StorageOutBillService wmsOutBillService; + private WarehouseOutBillService wmsOutBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsOutBillService.listPage(pagerQuery); + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsOutBillService.listPage(pagerQuery); return rb.success().setData(pv); } @ApiOperation("出库保存修改") @PostMapping("/saveOrUpdateOutBill") - ResultBean saveOrUpdateOutBill(@RequestBody StorageOutBillDto dto) { + ResultBean saveOrUpdateOutBill(@RequestBody WarehouseOutBillDto dto) { return wmsOutBillService.saveOrUpdateOutBill(dto); } @ApiOperation("详情") @GetMapping("/details") - ResultBean details(@RequestParam("sid") String sid) { + ResultBean details(@RequestParam("sid") String sid) { return wmsOutBillService.details(sid); } } diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReceiptBillRest.java similarity index 62% rename from src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseReceiptBillRest.java index 29f3c3a..86c98e1 100644 --- a/src/main/java/com/yxt/storage/apiadmin/StorageReceiptBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseReceiptBillRest.java @@ -1,9 +1,9 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storagereceiptbill.*; +import com.yxt.warehouse.biz.warehousereceiptbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,40 +17,40 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "收货单据") @RestController @RequestMapping("/apiadmin/inventory/WmsReceiptBill") -public class StorageReceiptBillRest { +public class WarehouseReceiptBillRest { @Autowired - private StorageReceiptBillService wmsReceiptBillService; + private WarehouseReceiptBillService wmsReceiptBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsReceiptBillService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsReceiptBillService.listPage(pq); return rb.success().setData(pv); } @ApiOperation("新增修改保存") @PostMapping("/saveOrUpdate") - ResultBean saveOrUpdate(@RequestBody StorageReceiptBillDto2 dto) { + ResultBean saveOrUpdate(@RequestBody WarehouseReceiptBillDto2 dto) { return wmsReceiptBillService.saveOrUpdateBill2(dto); } @ApiOperation("通知单收货单初始化") @GetMapping("/getInitDetails") - ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) { + ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) { return wmsReceiptBillService.getInitDetails(sourceSid); } @ApiOperation("收货单据编辑初始化/详情") @GetMapping("/getDetailsInit") - ResultBean getDetailsInit(@RequestParam("sid") String sid) { + ResultBean getDetailsInit(@RequestParam("sid") String sid) { return wmsReceiptBillService.getDetailsInit(sid); } @ApiOperation("确认") @PostMapping("/confirm") - ResultBean confirm(@RequestBody StorageReceiptBillDto2 dto) { + ResultBean confirm(@RequestBody WarehouseReceiptBillDto2 dto) { return wmsReceiptBillService.confirm(dto); } diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseShelfBillRest.java similarity index 62% rename from src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java rename to src/main/java/com/yxt/warehouse/apiadmin/WarehouseShelfBillRest.java index 3adad7f..d3231c0 100644 --- a/src/main/java/com/yxt/storage/apiadmin/StorageShelfBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseShelfBillRest.java @@ -1,9 +1,9 @@ -package com.yxt.storage.apiadmin; +package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageshelfbill.*; +import com.yxt.warehouse.biz.warehouseshelfbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,22 +17,22 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "上货架") @RestController @RequestMapping("/apiadmin/WmsShelfBill") -public class StorageShelfBillRest { +public class WarehouseShelfBillRest { @Autowired - private StorageShelfBillService wmsShelfBillService; + private WarehouseShelfBillService wmsShelfBillService; @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsShelfBillService.listPage(pq); + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsShelfBillService.listPage(pq); return rb.success().setData(pv); } @ApiOperation("新增修改保存") @PostMapping("/saveOrUpdate") - ResultBean saveOrUpdate(@RequestBody StorageShelfBillDto dto) { + ResultBean saveOrUpdate(@RequestBody WarehouseShelfBillDto dto) { return wmsShelfBillService.saveOrUpdateShelf(dto); } @@ -44,7 +44,7 @@ public class StorageShelfBillRest { @ApiOperation("详情") @GetMapping("/details") - ResultBean details(@RequestParam("sid") String sid) { + ResultBean details(@RequestParam("sid") String sid) { return wmsShelfBillService.details(sid); } @@ -56,13 +56,13 @@ public class StorageShelfBillRest { */ @ApiOperation("新增初始化") @GetMapping("/getInit") - ResultBean getInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid) { + ResultBean getInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid) { return wmsShelfBillService.getInit(sid, orgPath, userSid); } @ApiOperation("确认") @PostMapping("/confirm") - ResultBean confirm(@RequestBody StorageShelfBillDto dto) { + ResultBean confirm(@RequestBody WarehouseShelfBillDto dto) { return wmsShelfBillService.confirm(dto); } diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBill.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBill.java index cbb6d60..264f5c3 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBill.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbill; +package com.yxt.warehouse.biz.warehouseansbill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/9 **/ @Data -public class StorageAnsBill extends BaseEntity { +public class WarehouseAnsBill extends BaseEntity { @ApiModelProperty("外部单号（业务单据编号）") private String sourceBillNo; diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java similarity index 86% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java index 1b93405..c87c39a 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storageansbill; +package com.yxt.warehouse.biz.warehouseansbill; -import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailDto; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/9 **/ @Data -public class StorageAnsBillDto { +public class WarehouseAnsBillDto { private String sid; @@ -51,5 +51,5 @@ public class StorageAnsBillDto { @ApiModelProperty("创建组织sid") private String createOrgSid; - private List StorageAnsBillDetailList = new ArrayList<>(); + private List StorageAnsBillDetailList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java new file mode 100644 index 0000000..7d1260c --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java @@ -0,0 +1,24 @@ +package com.yxt.warehouse.biz.warehouseansbill; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/9 + **/ +@Mapper +public interface WarehouseAnsBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + WarehouseAnsDetailsVo details(String sid); +} diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml similarity index 78% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml index 07f352c..5ebd646 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml @@ -1,7 +1,7 @@ - - select wd.goodsSkuSid, wd.goodsSpuName, wd.goodsSkuCode, wd.goodsSkuTitle, wd.goodSpuSid from storage_ans_bill_detail wd @@ -9,7 +9,7 @@ - select wab.sid, wab.billNo, DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime, @@ -30,7 +30,7 @@ order by wab.id desc - select wab.billNo, wab.createByName, DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime, diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java index f8a4f81..68b62ed 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbill; +package com.yxt.warehouse.biz.warehouseansbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/11 **/ @Data -public class StorageAnsBillQuery implements Query { +public class WarehouseAnsBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java similarity index 62% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java index f3ee3ff..fe52a9a 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbill; +package com.yxt.warehouse.biz.warehouseansbill; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,7 +9,7 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageansbilldetail.*; +import com.yxt.warehouse.biz.warehouseansbilldetail.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,49 +22,49 @@ import java.util.List; * @date: 2024/4/9 **/ @Service -public class StorageAnsBillService extends MybatisBaseService { +public class WarehouseAnsBillService extends MybatisBaseService { @Autowired - private StorageAnsBillDetailService StorageAnsBillDetailService; + private WarehouseAnsBillDetailService WarehouseAnsBillDetailService; - public ResultBean saveOrUpdateBill(StorageAnsBillDto dto) { + public ResultBean saveOrUpdateBill(WarehouseAnsBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - StorageAnsBill StorageAnsBill = new StorageAnsBill(); - BeanUtil.copyProperties(dto, StorageAnsBill, "sid"); - sid = StorageAnsBill.getSid(); - List StorageAnsBillDetailList = dto.getStorageAnsBillDetailList(); + WarehouseAnsBill WarehouseAnsBill = new WarehouseAnsBill(); + BeanUtil.copyProperties(dto, WarehouseAnsBill, "sid"); + sid = WarehouseAnsBill.getSid(); + List StorageAnsBillDetailList = dto.getStorageAnsBillDetailList(); StorageAnsBillDetailList.removeAll(Collections.singleton(null)); if (!StorageAnsBillDetailList.isEmpty()) { - StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList); + WarehouseAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList); } else { return rb.setMsg("单据明细不能为空"); } - baseMapper.insert(StorageAnsBill); + baseMapper.insert(WarehouseAnsBill); } else { - StorageAnsBill StorageAnsBill = fetchBySid(sid); - if (StorageAnsBill == null) { + WarehouseAnsBill WarehouseAnsBill = fetchBySid(sid); + if (WarehouseAnsBill == null) { return rb.setMsg("该单据不存在"); } - BeanUtil.copyProperties(dto, StorageAnsBill, "sid"); - List StorageAnsBillDetailList = dto.getStorageAnsBillDetailList(); + BeanUtil.copyProperties(dto, WarehouseAnsBill, "sid"); + List StorageAnsBillDetailList = dto.getStorageAnsBillDetailList(); StorageAnsBillDetailList.removeAll(Collections.singleton(null)); if (!StorageAnsBillDetailList.isEmpty()) { - StorageAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList); + WarehouseAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList); } else { return rb.setMsg("单据明细不能为空"); } - baseMapper.updateById(StorageAnsBill); + baseMapper.updateById(WarehouseAnsBill); } return rb.success().setData(sid); } - public PagerVo listPages(PagerQuery pagerQuery) { - StorageAnsBillQuery query = pagerQuery.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPages(PagerQuery pagerQuery) { + WarehouseAnsBillQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (query != null) { //单据编号 @@ -102,24 +102,24 @@ public class StorageAnsBillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.listPages(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPages(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean details(String sid) { - ResultBean rb = ResultBean.fireFail(); - StorageAnsDetailsVo StorageAnsDetailsVo = baseMapper.details(sid); - if (StorageAnsDetailsVo != null) { - List list = StorageAnsBillDetailService.selectByBillSid(sid); + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsDetailsVo WarehouseAnsDetailsVo = baseMapper.details(sid); + if (WarehouseAnsDetailsVo != null) { + List list = WarehouseAnsBillDetailService.selectByBillSid(sid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - StorageAnsDetailsVo.setList(list); + WarehouseAnsDetailsVo.setList(list); } } else { return rb.setMsg("该单据不存在"); } - return rb.success().setData(StorageAnsDetailsVo); + return rb.success().setData(WarehouseAnsDetailsVo); } } diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java index f0ecd11..5240505 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsBillVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbill; +package com.yxt.warehouse.biz.warehouseansbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/11 **/ @Data -public class StorageAnsBillVo { +public class WarehouseAnsBillVo { private String sid; diff --git a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java similarity index 83% rename from src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java index be3bcfb..d3f7cb0 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbill/StorageAnsDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storageansbill; +package com.yxt.warehouse.biz.warehouseansbill; -import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/12 **/ @Data -public class StorageAnsDetailsVo { +public class WarehouseAnsDetailsVo { private String billNo; @ApiModelProperty("制单人姓名") private String createByName; @@ -40,5 +40,5 @@ public class StorageAnsDetailsVo { @ApiModelProperty("拒绝原因") private String refuseReason; - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java index 022c094..7a3bebf 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetail.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbilldetail; +package com.yxt.warehouse.biz.warehouseansbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/9 **/ @Data -public class StorageAnsBillDetail extends BaseEntity { +public class WarehouseAnsBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java index 0e42e87..717b46c 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbilldetail; +package com.yxt.warehouse.biz.warehouseansbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/9 **/ @Data -public class StorageAnsBillDetailDto { +public class WarehouseAnsBillDetailDto { @ApiModelProperty("商品基础信息sid") private String goodSpuSid; diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java similarity index 53% rename from src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java index 7216ded..a2e94a2 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbilldetail; +package com.yxt.warehouse.biz.warehouseansbilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -11,8 +11,8 @@ import java.util.List; * @date: 2024/4/9 **/ @Mapper -public interface StorageAnsBillDetailMapper extends BaseMapper { +public interface WarehouseAnsBillDetailMapper extends BaseMapper { int deleteDetails(String sid); - List selectByBillSid(String sid); + List selectByBillSid(String sid); } diff --git a/target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml similarity index 75% rename from target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml index 57b8972..d591fca 100644 --- a/target/classes/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml @@ -1,13 +1,13 @@ - + delete from storage_ans_bill_detail where billSid = #{sid} - select wd.goodsSkuTitle, wd.goodsSkuCode, wd.goodsSkuOwnSpec, diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java new file mode 100644 index 0000000..f3b9cbc --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java @@ -0,0 +1,29 @@ +package com.yxt.warehouse.biz.warehouseansbilldetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/9 + **/ +@Service +public class WarehouseAnsBillDetailService extends MybatisBaseService { + public void saveOrUpdateDetailsList(String sid, List StorageAnsBillDetailList) { + baseMapper.deleteDetails(sid); + StorageAnsBillDetailList.forEach(v->{ + WarehouseAnsBillDetail WarehouseAnsBillDetail = new WarehouseAnsBillDetail(); + BeanUtil.copyProperties(v, WarehouseAnsBillDetail,"sid"); + WarehouseAnsBillDetail.setBillSid(sid); + baseMapper.insert(WarehouseAnsBillDetail); + }); + } + + public List selectByBillSid(String sid) { + return baseMapper.selectByBillSid(sid); + } +} diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java similarity index 88% rename from src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java index d0c2659..a2b082c 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsBillDetailVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbilldetail; +package com.yxt.warehouse.biz.warehouseansbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/10 **/ @Data -public class StorageAnsBillDetailVo { +public class WarehouseAnsBillDetailVo { @ApiModelProperty("来源单sid") private String sourceBillSid; diff --git a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java index 5b6da0e..c1dfc0d 100644 --- a/src/main/java/com/yxt/storage/biz/storageansbilldetail/StorageAnsListDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageansbilldetail; +package com.yxt.warehouse.biz.warehouseansbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/11 **/ @Data -public class StorageAnsListDetailsVo { +public class WarehouseAnsListDetailsVo { @ApiModelProperty("商品名称") private String goodsSkuTitle; @ApiModelProperty("商品编码（图号）") diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java index 8c18184..8cee30e 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventory.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventory; +package com.yxt.warehouse.biz.warehouseinventory; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date 2024/2/28 8:38 */ @Data -public class StorageInventory extends BaseEntity { +public class WarehouseInventory extends BaseEntity { @ApiModelProperty("批次号") private String batchNumber; diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java similarity index 59% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java index 5109e34..ed509e6 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventory; +package com.yxt.warehouse.biz.warehouseinventory; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Param; * @date 2024/2/26 13:40 */ @Mapper -public interface StorageInventoryMapper extends BaseMapper { +public interface WarehouseInventoryMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml similarity index 78% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml index c55663b..2c8c5d6 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -1,10 +1,10 @@ - + - select a.goodsID, a.sid, a.goodsSpuName, diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java similarity index 85% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java index 0b086e9..ecddc37 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventory; +package com.yxt.warehouse.biz.warehouseinventory; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class StorageInventoryQuery implements Query { +public class WarehouseInventoryQuery implements Query { @ApiModelProperty("goodsID") private String goodsID; diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventorySaveDto.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventorySaveDto.java index e877375..e11d41a 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventorySaveDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventorySaveDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventory; +package com.yxt.warehouse.biz.warehouseinventory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/19 **/ @Data -public class StorageInventorySaveDto { +public class WarehouseInventorySaveDto { private String sid; @ApiModelProperty("创建者sid") diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java similarity index 72% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java index 66ba108..348ddf9 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventory; +package com.yxt.warehouse.biz.warehouseinventory; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,10 +19,10 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class StorageInventoryService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - StorageInventoryQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); +public class WarehouseInventoryService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + WarehouseInventoryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getGoodsID())) { qw.like("a.goodsID", query.getGoodsID()); } @@ -39,22 +39,22 @@ public class StorageInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveWmsInventory(StorageInventorySaveDto dto) { + public ResultBean saveWmsInventory(WarehouseInventorySaveDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - StorageInventory wmsInventory = new StorageInventory(); + WarehouseInventory wmsInventory = new WarehouseInventory(); BeanUtil.copyProperties(dto, wmsInventory, "sid"); sid = wmsInventory.getSid(); baseMapper.insert(wmsInventory); } else { - StorageInventory wmsInventory = fetchBySid(sid); + WarehouseInventory wmsInventory = fetchBySid(sid); if (wmsInventory == null) { return rb.setMsg("该商品库存不存在"); } diff --git a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java index 6a9ec87..4750328 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventory/StorageInventoryVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventory; +package com.yxt.warehouse.biz.warehouseinventory; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +9,7 @@ import lombok.Data; * @date 2024/2/26 13:37 */ @Data -public class StorageInventoryVo implements Vo { +public class WarehouseInventoryVo implements Vo { private String sid; @ApiModelProperty("商品ID") diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java index 286f5d0..93c1250 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecord.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/24 **/ @Data -public class StorageInventoryRecord extends BaseEntity { +public class WarehouseInventoryRecord extends BaseEntity { @ApiModelProperty("库存sid") private String inventorySid; diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java index 0f478a1..6302b3f 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import com.yxt.common.core.dto.Dto; @@ -10,7 +10,7 @@ import java.math.BigDecimal; @Data @ApiModel(value = "库存出入库记录 数据传输对象", description = "库存出入库记录 数据传输对象") -public class StorageInventoryRecordDto implements Dto { +public class WarehouseInventoryRecordDto implements Dto { private String sid; @ApiModelProperty("库存sid") diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java similarity index 87% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java index c4f9b36..83e47f3 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordListVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageInventoryRecordListVo { +public class WarehouseInventoryRecordListVo { @ApiModelProperty("来源单编号") private String billNo; diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.java new file mode 100644 index 0000000..db040df --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.java @@ -0,0 +1,16 @@ +package com.yxt.warehouse.biz.warehouseinventoryrecord; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseInventoryRecordMapper extends BaseMapper { + List getStorageInventoryRecordList(String sid); +} diff --git a/target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml similarity index 78% rename from target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml index c7f6fb1..1140fae 100644 --- a/target/classes/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml @@ -1,7 +1,7 @@ - - select wir.billNo, case wir.billType when 1 then '入库' when 0 then '出库' end as billType, DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java similarity index 52% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java index a1c066c..3a10614 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; @@ -17,15 +17,15 @@ import java.util.List; * @date: 2024/4/24 **/ @Service -public class StorageInventoryRecordService extends MybatisBaseService { - public ResultBean> getStorageInventoryRecordList(String sid) { - ResultBean> rb = ResultBean.fireFail(); - List list = baseMapper.getStorageInventoryRecordList(sid); +public class WarehouseInventoryRecordService extends MybatisBaseService { + public ResultBean> getStorageInventoryRecordList(String sid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getStorageInventoryRecordList(sid); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); } - public void saveOrUpdateDto(StorageInventoryRecordDto dto) { + public void saveOrUpdateDto(WarehouseInventoryRecordDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -34,27 +34,27 @@ public class StorageInventoryRecordService extends MybatisBaseService listPage(PagerQuery pagerQuery) { + public PagerVo listPage(PagerQuery pagerQuery) { return null; } - public List listExcel(StorageInventoryRecordsQuery query) { + public List listExcel(WarehouseInventoryRecordsQuery query) { return null; } } diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsExcelVo.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsExcelVo.java index b946cc1..a17ef94 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsExcelVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsExcelVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import com.yxt.common.core.utils.ExportEntityMap; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageInventoryRecordsExcelVo { +public class WarehouseInventoryRecordsExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsQuery.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsQuery.java index 991c3e1..0ba923a 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageInventoryRecordsQuery implements Query { +public class WarehouseInventoryRecordsQuery implements Query { @ApiModelProperty("商品ID") private String goodsID; diff --git a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java index 227989f..13c4cb5 100644 --- a/src/main/java/com/yxt/storage/biz/storageinventoryrecord/StorageInventoryRecordsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageinventoryrecord; +package com.yxt.warehouse.biz.warehouseinventoryrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageInventoryRecordsVo { +public class WarehouseInventoryRecordsVo { @ApiModelProperty("商品ID") private String goodsID; diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBill.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBill.java index 28a3d08..48c7d61 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBill.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/24 **/ @Data -public class StorageOutBill extends BaseEntity { +public class WarehouseOutBill extends BaseEntity { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDetailsVo.java similarity index 77% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDetailsVo.java index 81fbc93..9b335d7 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDetailsVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; -import com.yxt.storage.biz.storageoutbilldetail.StorageOutBillDetailDto; +import com.yxt.warehouse.biz.warehouseoutbilldetail.WarehouseOutBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/24 **/ @Data -public class StorageOutBillDetailsVo { +public class WarehouseOutBillDetailsVo { private String sid; @ApiModelProperty("创建人sid") @@ -35,5 +35,5 @@ public class StorageOutBillDetailsVo { @ApiModelProperty("备注") private String remarks; - private List detailsList = new ArrayList<>(); + private List detailsList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDto.java similarity index 77% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDto.java index b53e89d..b2a1365 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillDto.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; -import com.yxt.storage.biz.storageoutbilldetail.StorageOutBillDetailDto; +import com.yxt.warehouse.biz.warehouseoutbilldetail.WarehouseOutBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/24 **/ @Data -public class StorageOutBillDto { +public class WarehouseOutBillDto { private String sid; @ApiModelProperty("创建人sid") @@ -35,7 +35,7 @@ public class StorageOutBillDto { @ApiModelProperty("备注") private String remarks; - private List detailsList = new ArrayList<>(); + private List detailsList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.java similarity index 58% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.java index 31a21c8..92aedcb 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper; * @date: 2024/4/24 **/ @Mapper -public interface StorageOutBillMapper extends BaseMapper { +public interface WarehouseOutBillMapper extends BaseMapper { } diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.xml similarity index 61% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.xml index cdf61a6..2f865b5 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillQuery.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillQuery.java index bf184d3..34e3592 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageOutBillQuery implements Query { +public class WarehouseOutBillQuery implements Query { //单据编号 @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java similarity index 50% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java index bab3a1e..b4e6436 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; @@ -12,16 +12,16 @@ import org.springframework.stereotype.Service; * @date: 2024/4/24 **/ @Service -public class StorageOutBillService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pagerQuery) { +public class WarehouseOutBillService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pagerQuery) { return null; } - public ResultBean saveOrUpdateOutBill(StorageOutBillDto dto) { + public ResultBean saveOrUpdateOutBill(WarehouseOutBillDto dto) { return null; } - public ResultBean details(String sid) { + public ResultBean details(String sid) { return null; } } diff --git a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillVo.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillVo.java index 8818d58..dfbc95a 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbill/StorageOutBillVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbill; +package com.yxt.warehouse.biz.warehouseoutbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageOutBillVo { +public class WarehouseOutBillVo { private String sid; diff --git a/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetail.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetail.java index 0eff094..85b0ff1 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetail.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbilldetail; +package com.yxt.warehouse.biz.warehouseoutbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; * @date: 2024/4/24 **/ @Data -public class StorageOutBillDetail extends BaseEntity { +public class WarehouseOutBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("商品基础信息Sid") diff --git a/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java similarity index 88% rename from src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java index 103394c..68408d7 100644 --- a/src/main/java/com/yxt/storage/biz/storageoutbilldetail/StorageOutBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageoutbilldetail; +package com.yxt.warehouse.biz.warehouseoutbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/24 **/ @Data -public class StorageOutBillDetailDto { +public class WarehouseOutBillDetailDto { @ApiModelProperty("商品基础信息Sid") private String goodSpuSid; diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBill.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBill.java index 085c9bd..648a731 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBill.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBill.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2024/4/3 **/ @Data -public class StorageReceiptBill extends BaseEntity { +public class WarehouseReceiptBill extends BaseEntity { @ApiModelProperty("来源单sid（asn单sid）") private String sourceBillSid; diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillDto2.java similarity index 77% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillDto2.java index d0c53d9..b72d48e 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillDto2.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillDto2.java @@ -1,7 +1,7 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/15 **/ @Data -public class StorageReceiptBillDto2 { +public class WarehouseReceiptBillDto2 { private String sid; @ApiModelProperty("来源单sid（asn单sid）") @@ -47,7 +47,7 @@ public class StorageReceiptBillDto2 { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("商品列表") - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); @ApiModelProperty("批次列表") - private List pcList = new ArrayList<>(); + private List pcList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillInitVo.java similarity index 77% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillInitVo.java index b953f73..cf42f70 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillInitVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillInitVo.java @@ -1,7 +1,7 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/15 **/ @Data -public class StorageReceiptBillInitVo { +public class WarehouseReceiptBillInitVo { private String sid; @ApiModelProperty("单据编号") @@ -49,7 +49,7 @@ public class StorageReceiptBillInitVo { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("商品列表") - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); @ApiModelProperty("批次列表") - private List pcList = new ArrayList<>(); + private List pcList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.java similarity index 53% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.java index 1390a6c..105f2b5 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -13,8 +13,8 @@ import org.apache.ibatis.annotations.Param; * @date: 2024/4/3 **/ @Mapper -public interface StorageReceiptBillMapper extends BaseMapper { - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface WarehouseReceiptBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - StorageReceiptBillInitVo getDetailsInit(String sid); + WarehouseReceiptBillInitVo getDetailsInit(String sid); } diff --git a/target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.xml similarity index 80% rename from target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.xml index 19fcf7e..2269e39 100644 --- a/target/classes/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillMapper.xml @@ -1,7 +1,7 @@ - - select wrb.sid, wrb.billNo, wrb.createByName, @@ -18,7 +18,7 @@ order by wrb.id desc - select wrb.sid, wrb.billNo, wrb.sourceBillSid, diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillPageVo.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillPageVo.java index 12cb18e..ed1c837 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillPageVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillPageVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/12 **/ @Data -public class StorageReceiptBillPageVo { +public class WarehouseReceiptBillPageVo { private String sid; @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillQuery.java similarity index 88% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillQuery.java index bec90ca..b90d651 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/3 **/ @Data -public class StorageReceiptBillQuery implements Query { +public class WarehouseReceiptBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillService.java similarity index 57% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillService.java index d6b8028..7b2160c 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -11,17 +11,17 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageansbill.StorageAnsBill; -import com.yxt.storage.biz.storageansbill.StorageAnsBillService; -import com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailService; -import com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; +import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBill; +import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillService; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailMapper; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailService; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchMapper; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,24 +34,24 @@ import java.util.stream.Collectors; * @date: 2024/4/3 **/ @Service -public class StorageReceiptBillService extends MybatisBaseService { +public class WarehouseReceiptBillService extends MybatisBaseService { @Autowired - private StorageReceiptBillDetailService wmsReceiptBillDetailService; + private WarehouseReceiptBillDetailService wmsReceiptBillDetailService; @Autowired - private StorageAnsBillService wmsAnsBillService; + private WarehouseAnsBillService wmsAnsBillService; @Autowired - private StorageAnsBillDetailService wmsAnsBillDetailService; + private WarehouseAnsBillDetailService wmsAnsBillDetailService; @Autowired - private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; + private WarehouseReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; @Autowired - private StorageReceiptBillDetailMapper wmsReceiptBillDetailMapper; + private WarehouseReceiptBillDetailMapper wmsReceiptBillDetailMapper; @Autowired - private StorageReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper; + private WarehouseReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper; - public PagerVo listPage(PagerQuery pq) { - StorageReceiptBillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPage(PagerQuery pq) { + WarehouseReceiptBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wrb.billNo", query.getBillNo()); @@ -72,22 +72,22 @@ public class StorageReceiptBillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveOrUpdateBill2(StorageReceiptBillDto2 dto) { + public ResultBean saveOrUpdateBill2(WarehouseReceiptBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - StorageReceiptBill wmsReceiptBill = new StorageReceiptBill(); + WarehouseReceiptBill wmsReceiptBill = new WarehouseReceiptBill(); sid = wmsReceiptBill.getSid(); BeanUtil.copyProperties(dto, wmsReceiptBill, "sid"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); - List pcList = dto.getPcList(); + List pcList = dto.getPcList(); pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); @@ -95,14 +95,14 @@ public class StorageReceiptBillService extends MybatisBaseService list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); - List pcList = dto.getPcList(); + List pcList = dto.getPcList(); pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); @@ -112,41 +112,41 @@ public class StorageReceiptBillService extends MybatisBaseService getInitDetails(String sourceSid) { - ResultBean rb = ResultBean.fireFail(); - StorageReceiptBillVo wmsReceiptBillVo = new StorageReceiptBillVo(); - StorageAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); + public ResultBean getInitDetails(String sourceSid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReceiptBillVo wmsReceiptBillVo = new WarehouseReceiptBillVo(); + WarehouseAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid"); wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo()); wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid()); wmsReceiptBillVo.setCreateTime(DateUtil.today()); - List list = wmsAnsBillDetailService.selectByBillSid(sourceSid); + List list = wmsAnsBillDetailService.selectByBillSid(sourceSid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - List lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), StorageReceiptBillDetailVo.class)).collect(Collectors.toList()); + List lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WarehouseReceiptBillDetailVo.class)).collect(Collectors.toList()); wmsReceiptBillVo.setList(lists); } return rb.success().setData(wmsReceiptBillVo); } - public ResultBean getDetailsInit(String sid) { - ResultBean rb = ResultBean.fireFail(); - StorageReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid); - List pcList = new ArrayList<>(); + public ResultBean getDetailsInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReceiptBillInitVo wmsReceiptBillInitVo = baseMapper.getDetailsInit(sid); + List pcList = new ArrayList<>(); if (wmsReceiptBillInitVo != null) { - List list = wmsReceiptBillDetailService.getDetailsInit(sid); + List list = wmsReceiptBillDetailService.getDetailsInit(sid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); + WarehouseReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); int a = i + 1; wmsReceiptBillDetailDto2.setXh(String.valueOf(a)); - List pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); + List pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); pcList2.removeAll(Collections.singleton(null)); if (!pcList2.isEmpty()) { for (int j = 0; j < pcList2.size(); j++) { - StorageReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j); + WarehouseReceiptBillDetailBatchDto2 wmsReceiptBillDetailBatchDto2 = pcList2.get(j); wmsReceiptBillDetailBatchDto2.setXh(String.valueOf(a)); } pcList.addAll(pcList2); @@ -161,14 +161,14 @@ public class StorageReceiptBillService extends MybatisBaseService confirm(StorageReceiptBillDto2 dto) { + public ResultBean confirm(WarehouseReceiptBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); dto.setBillState("1"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - StorageReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); + WarehouseReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); wmsReceiptBillDetailDto2.setState(1); } } diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillVo.java similarity index 85% rename from src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillVo.java index 8c2dd9d..1d1fa4d 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbill/StorageReceiptBillVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbill/WarehouseReceiptBillVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storagereceiptbill; +package com.yxt.warehouse.biz.warehousereceiptbill; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailVo; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; * @date: 2024/4/3 **/ @Data -public class StorageReceiptBillVo { +public class WarehouseReceiptBillVo { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("来源单sid（asn单sid）") @@ -47,5 +47,5 @@ public class StorageReceiptBillVo { @ApiModelProperty("创建组织sid") private String createOrgSid; - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetail.java similarity index 93% rename from src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetail.java index 6fdfa99..27290e6 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetail.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbilldetail; +package com.yxt.warehouse.biz.warehousereceiptbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; * @date: 2024/4/3 **/ @Data -public class StorageReceiptBillDetail extends BaseEntity { +public class WarehouseReceiptBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("商品基础信息Sid") diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailDto2.java similarity index 95% rename from src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailDto2.java index 8ceed3d..0ac3601 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailDto2.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailDto2.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbilldetail; +package com.yxt.warehouse.biz.warehousereceiptbilldetail; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class StorageReceiptBillDetailDto2 { +public class WarehouseReceiptBillDetailDto2 { @ApiModelProperty("商品Skusid") private String goodsSkuSid; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.java new file mode 100644 index 0000000..3a56b56 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.java @@ -0,0 +1,21 @@ +package com.yxt.warehouse.biz.warehousereceiptbilldetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Mapper +public interface WarehouseReceiptBillDetailMapper extends BaseMapper { + int deleteByBillSid(String sid); + + List getDetailsInit(String sid); + + List selectByBillSid(@Param("sid") String sid, @Param("sidList") List sidList); +} diff --git a/target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.xml similarity index 77% rename from target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.xml index 79d48f0..3431666 100644 --- a/target/classes/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.xml @@ -1,13 +1,13 @@ - + delete from wms_receipt_bill_detail where billSid = #{sid} - select wrbd.goodsSkuSid, wrbd.goodsSkuTitle, wrbd.goodsSkuCode, @@ -29,7 +29,7 @@ where billSid = #{sid} - select * from wms_receipt_bill_detail where billSid = #{sid} diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailService.java similarity index 52% rename from src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailService.java index d907454..c741d8f 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailService.java @@ -1,9 +1,9 @@ -package com.yxt.storage.biz.storagereceiptbilldetail; +package com.yxt.warehouse.biz.warehousereceiptbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,22 +17,22 @@ import java.util.stream.Collectors; * @date: 2024/4/3 **/ @Service -public class StorageReceiptBillDetailService extends MybatisBaseService { +public class WarehouseReceiptBillDetailService extends MybatisBaseService { @Autowired - private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; + private WarehouseReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; - public void saveOrUpdateDetailsList2(String sid, List list, List pcList) { + public void saveOrUpdateDetailsList2(String sid, List list, List pcList) { baseMapper.deleteByBillSid(sid); list.forEach(v -> { - StorageReceiptBillDetail wmsReceiptBillDetail = new StorageReceiptBillDetail(); + WarehouseReceiptBillDetail wmsReceiptBillDetail = new WarehouseReceiptBillDetail(); BeanUtil.copyProperties(v, wmsReceiptBillDetail, "sid"); wmsReceiptBillDetail.setBillSid(sid); baseMapper.insert(wmsReceiptBillDetail); wmsReceiptBillDetailBatchService.deleteByDetails(sid); pcList.removeAll(Collections.singleton(null)); if (!pcList.isEmpty()) { - List pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList()); + List pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList()); pcList2.removeAll(Collections.singleton(null)); if (!pcList2.isEmpty()) { wmsReceiptBillDetailBatchService.saveBatchs2(sid, wmsReceiptBillDetail.getSid(), pcList2); @@ -43,11 +43,11 @@ public class StorageReceiptBillDetailService extends MybatisBaseService getDetailsInit(String sid) { + public List getDetailsInit(String sid) { return baseMapper.getDetailsInit(sid); } - public List selectByBillSid(String sid, List sidList) { + public List selectByBillSid(String sid, List sidList) { return baseMapper.selectByBillSid(sid, sidList); } } diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java similarity index 94% rename from src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java index b22aaf2..88a268d 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetail/StorageReceiptBillDetailVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbilldetail; +package com.yxt.warehouse.biz.warehousereceiptbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/12 **/ @Data -public class StorageReceiptBillDetailVo { +public class WarehouseReceiptBillDetailVo { @ApiModelProperty("商品Skusid") private String goodsSkuSid; diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatch.java similarity index 85% rename from src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatch.java index 28a40e1..d17ceda 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatch.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatch.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbilldetailbatch; +package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import java.util.Date; * @date: 2024/4/10 **/ @Data -public class StorageReceiptBillDetailBatch extends BaseEntity { +public class WarehouseReceiptBillDetailBatch extends BaseEntity { @ApiModelProperty("收货单sid") private String billSid; @ApiModelProperty("收货明细sid") diff --git a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchDto2.java similarity index 90% rename from src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchDto2.java index d8d4aa3..c0080fa 100644 --- a/src/main/java/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchDto2.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchDto2.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storagereceiptbilldetailbatch; +package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class StorageReceiptBillDetailBatchDto2 { +public class WarehouseReceiptBillDetailBatchDto2 { @ApiModelProperty("批次号（收货日期+有效日期，如240320-241009）") private String batchNumber; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.java new file mode 100644 index 0000000..d70bc0e --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.java @@ -0,0 +1,21 @@ +package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Mapper +public interface WarehouseReceiptBillDetailBatchMapper extends BaseMapper { + int deleteByDetails(String sid); + + List getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid); + + WarehouseReceiptBillDetailBatch selectByDetails(String sid); +} diff --git a/target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.xml similarity index 69% rename from target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.xml index 73e1056..cc227c0 100644 --- a/target/classes/com/yxt/storage/biz/storagereceiptbilldetailbatch/StorageReceiptBillDetailBatchMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.xml @@ -1,6 +1,6 @@ - + delete from wms_receipt_bill_detail_batch @@ -8,7 +8,7 @@ + + - select wsb.sid, wsb.billNo, wsb.createBySid, diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillQuery.java similarity index 82% rename from src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillQuery.java index 9169646..3ef1b81 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillQuery.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbill; +package com.yxt.warehouse.biz.warehouseshelfbill; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class StorageShelfBillQuery implements Query { +public class WarehouseShelfBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java similarity index 59% rename from src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java index 563f297..37d0ff3 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbill; +package com.yxt.warehouse.biz.warehouseshelfbill; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -10,20 +10,20 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.storage.biz.storageinventory.StorageInventorySaveDto; -import com.yxt.storage.biz.storageinventory.StorageInventoryService; -import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordDto; -import com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordService; -import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBill; -import com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillService; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail; -import com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailService; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch; -import com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchService; -import com.yxt.storage.biz.storageshelfbilldetail.*; -import com.yxt.storage.feign.goods.basegoodssku.BaseGoodsSkuDetailsVo; -import com.yxt.storage.feign.goods.basegoodssku.BaseGoodsSkuFeign; -import com.yxt.storage.utils.Rule; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventorySaveDto; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryService; +import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordDto; +import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordService; +import com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBill; +import com.yxt.warehouse.biz.warehousereceiptbill.WarehouseReceiptBillService; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetail; +import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailService; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatch; +import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService; +import com.yxt.warehouse.biz.warehouseshelfbilldetail.*; +import com.yxt.warehouse.feign.goods.basegoodssku.BaseGoodsSkuDetailsVo; +import com.yxt.warehouse.feign.goods.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.warehouse.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,29 +40,29 @@ import java.util.List; * @date: 2024/4/11 **/ @Service -public class StorageShelfBillService extends MybatisBaseService { +public class WarehouseShelfBillService extends MybatisBaseService { @Autowired - private StorageShelfBillDetailService wmsShelfBillDetailService; + private WarehouseShelfBillDetailService wmsShelfBillDetailService; @Autowired - private StorageShelfBillDetailMapper wmsShelfBillDetailMapper; + private WarehouseShelfBillDetailMapper wmsShelfBillDetailMapper; @Autowired - private StorageInventoryService wmsInventoryService; + private WarehouseInventoryService wmsInventoryService; @Resource private BaseGoodsSkuFeign baseGoodsSkuFeign; @Autowired - private StorageInventoryRecordService wmsInventoryRecordService; + private WarehouseInventoryRecordService wmsInventoryRecordService; @Autowired - private StorageReceiptBillService wmsReceiptBillService; + private WarehouseReceiptBillService wmsReceiptBillService; @Autowired - private StorageReceiptBillDetailService wmsReceiptBillDetailService; + private WarehouseReceiptBillDetailService wmsReceiptBillDetailService; @Autowired - private StorageReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; + private WarehouseReceiptBillDetailBatchService wmsReceiptBillDetailBatchService; - public PagerVo listPage(PagerQuery pq) { - StorageShelfBillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPage(PagerQuery pq) { + WarehouseShelfBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wsb.billNo", query.getBillNo()); @@ -75,19 +75,19 @@ public class StorageShelfBillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveOrUpdateShelf(StorageShelfBillDto dto) { + public ResultBean saveOrUpdateShelf(WarehouseShelfBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) { - StorageShelfBill wmsShelfBill = new StorageShelfBill(); + WarehouseShelfBill wmsShelfBill = new WarehouseShelfBill(); BeanUtil.copyProperties(dto, wmsShelfBill, "sid"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); sid = wmsShelfBill.getSid(); if (!list.isEmpty()) { @@ -95,12 +95,12 @@ public class StorageShelfBillService extends MybatisBaseService list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); sid = wmsShelfBill.getSid(); if (!list.isEmpty()) { @@ -116,13 +116,13 @@ public class StorageShelfBillService extends MybatisBaseService detailList = wmsShelfBillDetailService.selectByBillSid(sid); + WarehouseShelfBill wmsShelfBill = fetchBySid(sid); + List detailList = wmsShelfBillDetailService.selectByBillSid(sid); detailList.removeAll(Collections.singleton(null)); if (!detailList.isEmpty()) { for (int i = 0; i < detailList.size(); i++) { - StorageShelfBillDetailVos s = detailList.get(i); - StorageInventorySaveDto dto = new StorageInventorySaveDto(); + WarehouseShelfBillDetailVos s = detailList.get(i); + WarehouseInventorySaveDto dto = new WarehouseInventorySaveDto(); dto.setCreateBySid(wmsShelfBill.getCreateBySid()); dto.setBatchNumber(s.getBatchNumber()); dto.setGoodsID(getGoodsId(s.getGoodsSkuSid())); @@ -143,10 +143,10 @@ public class StorageShelfBillService extends MybatisBaseService details(String sid) { - ResultBean rb = ResultBean.fireFail(); - ShelfDetailsVo shelfDetailsVo = baseMapper.details(sid); - if (shelfDetailsVo == null) { + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseShelfDetailsVo warehouseShelfDetailsVo = baseMapper.details(sid); + if (warehouseShelfDetailsVo == null) { return rb.setMsg("该单据不存在"); } - List list = wmsShelfBillDetailService.details(sid); + List list = wmsShelfBillDetailService.details(sid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - shelfDetailsVo.setList(list); + warehouseShelfDetailsVo.setList(list); } - return rb.success().setData(shelfDetailsVo); + return rb.success().setData(warehouseShelfDetailsVo); } - public ResultBean getInit(String sid, String orgPath, String userSid) { - ResultBean rb = ResultBean.fireFail(); - ShelfInitVo shelfInitVo = new ShelfInitVo(); + public ResultBean getInit(String sid, String orgPath, String userSid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseShelfInitVo warehouseShelfInitVo = new WarehouseShelfInitVo(); //查询所有已上架的商品 List stringList = wmsShelfBillDetailService.selectReceiptSidList(); stringList.removeAll(Collections.singleton(null)); //获取收货单据 - StorageReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid); - shelfInitVo.setCreateTime(DateUtil.today());//单据日期 - shelfInitVo.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号 - shelfInitVo.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid - shelfInitVo.setBillState(0); - List list = new ArrayList<>(); + WarehouseReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid); + warehouseShelfInitVo.setCreateTime(DateUtil.today());//单据日期 + warehouseShelfInitVo.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号 + warehouseShelfInitVo.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid + warehouseShelfInitVo.setBillState(0); + List list = new ArrayList<>(); //获取收货单据的明细 - List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); + List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); wmsReceiptBillDetailsList.removeAll(Collections.singleton(null)); if (!wmsReceiptBillDetailsList.isEmpty()) { for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) { - StorageReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); - StorageReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); - ShelfInitListVo shelfInitListVo = new ShelfInitListVo(); - BeanUtil.copyProperties(v, shelfInitListVo, "sid"); - shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber()); - shelfInitListVo.setWarehouseSid(v.getWarehouseSid()); - shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid()); - shelfInitListVo.setWarehouseRackCode(""); - list.add(shelfInitListVo); + WarehouseReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); + WarehouseReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); + WarehouseShelfInitListVo warehouseShelfInitListVo = new WarehouseShelfInitListVo(); + BeanUtil.copyProperties(v, warehouseShelfInitListVo, "sid"); + warehouseShelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber()); + warehouseShelfInitListVo.setWarehouseSid(v.getWarehouseSid()); + warehouseShelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid()); + warehouseShelfInitListVo.setWarehouseRackCode(""); + list.add(warehouseShelfInitListVo); } } - shelfInitVo.setList(list); + warehouseShelfInitVo.setList(list); - return rb.success().setData(shelfInitVo); + return rb.success().setData(warehouseShelfInitVo); } - public ResultBean confirm(StorageShelfBillDto dto) { + public ResultBean confirm(WarehouseShelfBillDto dto) { ResultBean rb = ResultBean.fireFail(); dto.setBillState(1); ResultBean resultBean = saveOrUpdateShelf(dto); diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillVo.java similarity index 86% rename from src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillVo.java index 8399ce5..5182965 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbill/StorageShelfBillVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbill; +package com.yxt.warehouse.biz.warehouseshelfbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class StorageShelfBillVo { +public class WarehouseShelfBillVo { private String sid; @ApiModelProperty("单据编号") diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfDetailsVo.java similarity index 75% rename from src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfDetailsVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfDetailsVo.java index 6ff47bb..1766260 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfDetailsVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storageshelfbill; +package com.yxt.warehouse.biz.warehouseshelfbill; -import com.yxt.storage.biz.storageshelfbilldetail.ShelfDetailsListVo; +import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfDetailsListVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/17 **/ @Data -public class ShelfDetailsVo { +public class WarehouseShelfDetailsVo { private String sid; @ApiModelProperty("单据编号") @@ -33,5 +33,5 @@ public class ShelfDetailsVo { private String remarks; - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfInitVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfInitVo.java similarity index 76% rename from src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfInitVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfInitVo.java index d93199e..82beecd 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbill/ShelfInitVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfInitVo.java @@ -1,6 +1,6 @@ -package com.yxt.storage.biz.storageshelfbill; +package com.yxt.warehouse.biz.warehouseshelfbill; -import com.yxt.storage.biz.storageshelfbilldetail.ShelfInitListVo; +import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfInitListVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +13,7 @@ import java.util.List; * @date: 2024/4/23 **/ @Data -public class ShelfInitVo { +public class WarehouseShelfInitVo { private String sid; @ApiModelProperty("单据编号") @@ -33,5 +33,5 @@ public class ShelfInitVo { private String remarks; - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetail.java similarity index 87% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetail.java index 49834d7..5fef713 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetail.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetail.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @date: 2024/4/10 **/ @Data -public class StorageShelfBillDetail extends BaseEntity { +public class WarehouseShelfBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("收货单明细sid") diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailDto.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailDto.java index 3ee5528..09ca0d3 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailDto.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/15 **/ @Data -public class StorageShelfBillDetailDto { +public class WarehouseShelfBillDetailDto { @ApiModelProperty("收货单明细sid") private String receiptDetailSid; diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.java similarity index 50% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.java index 2f6f16b..2ae46b9 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -11,12 +11,12 @@ import java.util.List; * @date: 2024/4/17 **/ @Mapper -public interface StorageShelfBillDetailMapper extends BaseMapper { +public interface WarehouseShelfBillDetailMapper extends BaseMapper { int deleteByMainSid(String sid); - List details(String sid); + List details(String sid); - List selectByBillSid(String sid); + List selectByBillSid(String sid); List selectReceiptSidList(); } diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.xml similarity index 80% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.xml index f7878a5..b3958df 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.xml @@ -1,13 +1,13 @@ - + delete from wms_shelf_bill_detail where billSid = #{sid} - select wsd.batchNumber, wsd.inventorySid, wsd.warehouseSid, @@ -18,7 +18,7 @@ where billSid = #{sid} - select wrbd.goodSpuSid, wrbd.goodsSpuName, wrbd.goodsSkuSid, diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailService.java similarity index 58% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailService.java index e507eb8..6228e28 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailService.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; @@ -12,22 +12,22 @@ import java.util.List; * @date: 2024/4/17 **/ @Service -public class StorageShelfBillDetailService extends MybatisBaseService { - public void saveShelfDetails(String sid, List list) { +public class WarehouseShelfBillDetailService extends MybatisBaseService { + public void saveShelfDetails(String sid, List list) { baseMapper.deleteByMainSid(sid); list.forEach(v -> { - StorageShelfBillDetail wmsShelfBillDetail = new StorageShelfBillDetail(); + WarehouseShelfBillDetail wmsShelfBillDetail = new WarehouseShelfBillDetail(); BeanUtil.copyProperties(v, wmsShelfBillDetail, "sid"); wmsShelfBillDetail.setBillSid(sid); baseMapper.insert(wmsShelfBillDetail); }); } - public List details(String sid) { + public List details(String sid) { return baseMapper.details(sid); } - public List selectByBillSid(String sid) { + public List selectByBillSid(String sid) { return baseMapper.selectByBillSid(sid); } diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailVos.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailVos.java index 614e11e..5816e82 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailVos.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailVos.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/19 **/ @Data -public class StorageShelfBillDetailVos { +public class WarehouseShelfBillDetailVos { private String detailsSid; diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfDetailsListVo.java similarity index 91% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfDetailsListVo.java index ddd9c92..bda3539 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfDetailsListVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfDetailsListVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2024/4/18 **/ @Data -public class ShelfDetailsListVo implements Vo { +public class WarehouseShelfDetailsListVo implements Vo { @ApiModelProperty("批次号") private String batchNumber; diff --git a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfInitListVo.java similarity index 92% rename from src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfInitListVo.java index a87ad59..b887676 100644 --- a/src/main/java/com/yxt/storage/biz/storageshelfbilldetail/ShelfInitListVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfInitListVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.biz.storageshelfbilldetail; +package com.yxt.warehouse.biz.warehouseshelfbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/4/23 **/ @Data -public class ShelfInitListVo { +public class WarehouseShelfInitListVo { @ApiModelProperty("批次号") private String batchNumber; diff --git a/src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java b/src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java similarity index 96% rename from src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java rename to src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java index e28acae..02f879b 100644 --- a/src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.storage.feign.goods.basegoodssku; +package com.yxt.warehouse.feign.goods.basegoodssku; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeign.java b/src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeign.java similarity index 93% rename from src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeign.java rename to src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeign.java index 4d52f0a..295f522 100644 --- a/src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeign.java +++ b/src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeign.java @@ -1,4 +1,4 @@ -package com.yxt.storage.feign.goods.basegoodssku; +package com.yxt.warehouse.feign.goods.basegoodssku; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java b/src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java similarity index 85% rename from src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java rename to src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java index 8fd4fae..d0a3475 100644 --- a/src/main/java/com/yxt/storage/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java +++ b/src/main/java/com/yxt/warehouse/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java @@ -1,4 +1,4 @@ -package com.yxt.storage.feign.goods.basegoodssku; +package com.yxt.warehouse.feign.goods.basegoodssku; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * @date: 2024/3/20 **/ @Component -public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{ +public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign { @Override public ResultBean getDetails(String sid) { return null; diff --git a/src/main/java/com/yxt/storage/utils/Rule.java b/src/main/java/com/yxt/warehouse/utils/Rule.java similarity index 89% rename from src/main/java/com/yxt/storage/utils/Rule.java rename to src/main/java/com/yxt/warehouse/utils/Rule.java index b1e9e5f..0506657 100644 --- a/src/main/java/com/yxt/storage/utils/Rule.java +++ b/src/main/java/com/yxt/warehouse/utils/Rule.java @@ -1,4 +1,4 @@ -package com.yxt.storage.utils; +package com.yxt.warehouse.utils; /** * @description: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 24fc81c..9002cdf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: ss-storage + name: ss-warehouse profiles: active: dev messages: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml deleted file mode 100644 index 1ff4c2a..0000000 --- a/target/classes/application-dev.yml +++ /dev/null @@ -1,30 +0,0 @@ -spring: - datasource: - hikari: - max-lifetime: 500000 - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.104.100.138:3306/yxt_wms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true - username: root - password: yxt_mysql_138 - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 - redis: - database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 - jedis: - pool: - max-active: -1 #连接池最大连接数（使用负值表示没有限制） - max-idle: 8 #连接池中的最大空闲连接 - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 - port: 6379 - timeout: 0 # 连接超时时间（毫秒） - -image: - upload: - path: D:/works/projects/yxt/yxtgit/lipinka/yxt-yythmall-biz/target/classes/static/upload/ - url: - prefix: http://192.168.2.111:7211/upload/ \ No newline at end of file diff --git a/target/classes/application-test.yml b/target/classes/application-test.yml deleted file mode 100644 index e69de29..0000000 diff --git a/target/classes/application.yml b/target/classes/application.yml deleted file mode 100644 index 24fc81c..0000000 --- a/target/classes/application.yml +++ /dev/null @@ -1,43 +0,0 @@ -spring: - application: - name: ss-storage - profiles: - active: dev - messages: - # 国际化资源文件路径 - basename: i18n/messages - servlet: - #上传文件 - multipart: - max-file-size: 50MB - max-request-size: 100MB - devtools: - restart: - # 热部署开关 - enabled: true - -server: - port: 7301 - max-http-header-size: 102400 - undertow: - max-http-post-size: -1 - -#mybatis -mybatis-plus: - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapper-locations: classpath*:**Mapper.xml - global-config: - refresh: true - db-config: - #定义生成ID的类型 - id-type: Auto - db-type: mysql - configuration: - map-underscore-to-camel-case: false - cache-enabled: true - call-setters-on-nulls: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - - - - diff --git a/target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml b/target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml deleted file mode 100644 index 07f352c..0000000 --- a/target/classes/com/yxt/storage/biz/storageansbill/StorageAnsBillMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml b/target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml deleted file mode 100644 index c55663b..0000000 --- a/target/classes/com/yxt/storage/biz/storageinventory/StorageInventoryMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml b/target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml deleted file mode 100644 index cdf61a6..0000000 --- a/target/classes/com/yxt/storage/biz/storageoutbill/StorageOutBillMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml b/target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml deleted file mode 100644 index f6b9ba2..0000000 --- a/target/classes/com/yxt/storage/biz/storageshelfbill/StorageShelfBillMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml b/target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml deleted file mode 100644 index f7878a5..0000000 --- a/target/classes/com/yxt/storage/biz/storageshelfbilldetail/StorageShelfBillDetailMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - delete - from wms_shelf_bill_detail - where billSid = #{sid} - - - - - - - - \ No newline at end of file diff --git a/target/classes/logback-spring.xml b/target/classes/logback-spring.xml deleted file mode 100644 index d01e9e9..0000000 --- a/target/classes/logback-spring.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - - - - - - - - - ${log.base}.log - - ${log.base}.%d{yyyyMMdd}.%i.log.zip - - - - 1MB - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - -%msg%n - - - - - - - - - - - \ No newline at end of file