From 6fce86805c3ec35372262ffa27322a40db9cec20 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 4 Jun 2024 16:37:27 +0800 Subject: [PATCH] 6/4 --- .../yxt/warehouse/WarehouseApplication.java | 2 +- .../apiadmin/WarehouseRegionRest.java | 58 +++++++ .../apiadmin/WmsWarehouseAreaRest.java | 75 +++++++++ .../apiadmin/WmsWarehouseAreaTypeRest.java | 68 ++++++++ .../apiadmin/WmsWarehouseExtendRest.java | 38 +++++ .../apiadmin/WmsWarehouseInfoRest.java | 76 +++++++++ .../apiadmin/WmsWarehouseRackRest.java | 68 ++++++++ .../biz/warehouseregion/WarehouseRegion.java | 26 ++++ .../warehouseregion/WarehouseRegionAllVo.java | 54 +++++++ .../warehouseregion/WarehouseRegionDto.java | 37 +++++ .../WarehouseRegionMapper.java | 25 +++ .../warehouseregion/WarehouseRegionMapper.xml | 24 +++ .../warehouseregion/WarehouseRegionQuery.java | 15 ++ .../WarehouseRegionService.java | 146 ++++++++++++++++++ .../warehouseregion/WarehouseRegionVo.java | 42 +++++ .../wmswarehousearea/WmsWarehouseArea.java | 24 +++ .../WmsWarehouseAreaAllVo.java | 56 +++++++ .../wmswarehousearea/WmsWarehouseAreaDto.java | 28 ++++ .../WmsWarehouseAreaMapper.java | 24 +++ .../WmsWarehouseAreaMapper.xml | 34 ++++ .../WmsWarehouseAreaQuery.java | 16 ++ .../WmsWarehouseAreaService.java | 110 +++++++++++++ .../wmswarehousearea/WmsWarehouseAreaVo.java | 34 ++++ .../WmsWarehouseAreaType.java | 17 ++ .../WmsWarehouseAreaTypeDto.java | 25 +++ .../WmsWarehouseAreaTypeMapper.java | 21 +++ .../WmsWarehouseAreaTypeMapper.xml | 29 ++++ .../WmsWarehouseAreaTypeQuery.java | 13 ++ .../WmsWarehouseAreaTypeService.java | 95 ++++++++++++ .../WmsWarehouseAreaTypeVo.java | 29 ++++ .../WmsWarehouseExtend.java | 20 +++ .../WmsWarehouseExtendDto.java | 36 +++++ .../WmsWarehouseExtendMapper.java | 13 ++ .../WmsWarehouseExtendMapper.xml | 15 ++ .../WmsWarehouseExtendQuery.java | 13 ++ .../WmsWarehouseExtendService.java | 58 +++++++ .../WmsWarehouseExtendVo.java | 33 ++++ .../wmswarehouseinfo/WmsWarehouseInfo.java | 30 ++++ .../WmsWarehouseInfoAllVo.java | 54 +++++++ .../wmswarehouseinfo/WmsWarehouseInfoDto.java | 41 +++++ .../WmsWarehouseInfoMapper.java | 25 +++ .../WmsWarehouseInfoMapper.xml | 24 +++ .../WmsWarehouseInfoQuery.java | 15 ++ .../WmsWarehouseInfoService.java | 143 +++++++++++++++++ .../wmswarehouseinfo/WmsWarehouseInfoVo.java | 46 ++++++ .../wmswarehouserack/WmsWarehouseRack.java | 22 +++ .../wmswarehouserack/WmsWarehouseRackDto.java | 25 +++ .../WmsWarehouseRackMapper.java | 21 +++ .../WmsWarehouseRackMapper.xml | 34 ++++ .../WmsWarehouseRackQuery.java | 16 ++ .../WmsWarehouseRackService.java | 105 +++++++++++++ .../wmswarehouserack/WmsWarehouseRackVo.java | 33 ++++ 52 files changed, 2130 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java create mode 100644 src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegion.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionAllVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionQuery.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtend.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java create mode 100644 src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackVo.java diff --git a/src/main/java/com/yxt/warehouse/WarehouseApplication.java b/src/main/java/com/yxt/warehouse/WarehouseApplication.java index 3167b52..212dccf 100644 --- a/src/main/java/com/yxt/warehouse/WarehouseApplication.java +++ b/src/main/java/com/yxt/warehouse/WarehouseApplication.java @@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; **/ @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", - "com.yxt.storage" + "com.yxt.warehouse" }) // 启用自带定时任务 @EnableScheduling diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java new file mode 100644 index 0000000..8ece9df --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java @@ -0,0 +1,58 @@ +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.warehouse.biz.warehouseregion.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/6/4 8:55 + */ +@Api(tags = "仓库区域") +@RestController +@RequestMapping("/apiadmin/base/warehouseregion") +public class WarehouseRegionRest { + @Autowired + WarehouseRegionService warehouseRegionService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return warehouseRegionService.listPage(pq); + } + @ApiOperation("查询所有的库区") + @GetMapping("/listAll") + public ResultBean listAll() { + return warehouseRegionService.listAll(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WarehouseRegionDto dto) { + return warehouseRegionService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return warehouseRegionService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return warehouseRegionService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseRegionService.delAll(sids); + return rb.success(); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java new file mode 100644 index 0000000..af02542 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java @@ -0,0 +1,75 @@ +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.warehouse.biz.wmswarehousearea.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/28 8:53 + */ +@Api(tags = "库区信息") +@RestController +@RequestMapping("/apiadmin/base/wmswarehousearea") +public class WmsWarehouseAreaRest { + + @Autowired + WmsWarehouseAreaService wmsWarehouseAreaService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return wmsWarehouseAreaService.listPage(pq); + } + @ApiOperation("查询所有的库区") + @GetMapping("/listAll") + public ResultBean listAll() { + return wmsWarehouseAreaService.getAllType(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WmsWarehouseAreaDto dto) { + return wmsWarehouseAreaService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return wmsWarehouseAreaService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return wmsWarehouseAreaService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + wmsWarehouseAreaService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return wmsWarehouseAreaService.updateIsEnable(sid,isEnable); + } + + @ApiOperation("根据仓库sid查询所有库位") + @GetMapping("/selectAll") + public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){ + ResultBean rb = ResultBean.fireFail(); + List vo = wmsWarehouseAreaService.selectAll(ckSid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java new file mode 100644 index 0000000..7caba89 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java @@ -0,0 +1,68 @@ +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.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeDto; +import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeQuery; +import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeService; +import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/3/18 14:57 + */ +@Api(tags = "库区类型信息") +@RestController +@RequestMapping("/apiadmin/base/wmswarehouseareatype") +public class WmsWarehouseAreaTypeRest { + + @Autowired + WmsWarehouseAreaTypeService wmsWarehouseAreaTypeService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return wmsWarehouseAreaTypeService.listPage(pq); + } + @ApiOperation("查询所有的") + @GetMapping("/listAll") + public ResultBean listAll() { + return wmsWarehouseAreaTypeService.listAll(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WmsWarehouseAreaTypeDto dto) { + return wmsWarehouseAreaTypeService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return wmsWarehouseAreaTypeService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return wmsWarehouseAreaTypeService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + wmsWarehouseAreaTypeService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return wmsWarehouseAreaTypeService.updateIsEnable(sid,isEnable); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java new file mode 100644 index 0000000..c5f3405 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java @@ -0,0 +1,38 @@ +package com.yxt.warehouse.apiadmin; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/3/18 10:52 + */ +@Api(tags = "库区信息") +@RestController +@RequestMapping("/apiadmin/base/wmswarehouseextend") +public class WmsWarehouseExtendRest { + + @Autowired + WmsWarehouseExtendService wmsWarehouseExtendService; + + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WmsWarehouseExtendDto dto) { + return wmsWarehouseExtendService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return wmsWarehouseExtendService.initialization(sid); + } + + +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java new file mode 100644 index 0000000..c9167c3 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java @@ -0,0 +1,76 @@ +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.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; +import com.yxt.warehouse.biz.wmswarehouseinfo.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/27 16:14 + */ +@Api(tags = "仓库信息") +@RestController +@RequestMapping("/apiadmin/base/wmswarehouseinfo") +public class WmsWarehouseInfoRest { + + @Autowired + WmsWarehouseInfoService wmsWarehouseService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return wmsWarehouseService.listPage(pq); + } + @ApiOperation("查询所有的仓库") + @GetMapping("/listAll") + public ResultBean listAll() { + return wmsWarehouseService.listAll(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WmsWarehouseInfoDto dto) { + return wmsWarehouseService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return wmsWarehouseService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return wmsWarehouseService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + wmsWarehouseService.delAll(sids); + return rb.success(); + } + @ApiOperation("更改可用状态") + @GetMapping("/updateStatus/{sid}/{state}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) { + return wmsWarehouseService.updateIsEnable(sid,state); + } + + @ApiOperation("查询所有仓库") + @GetMapping("/selectAll") + public ResultBean> selectAll(){ + ResultBean rb = ResultBean.fireFail(); + List wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll(); + return rb.success().setData(wmsWarehouseAreaAllVos); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java new file mode 100644 index 0000000..c7cdda4 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java @@ -0,0 +1,68 @@ +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.warehouse.biz.wmswarehouserack.WmsWarehouseRackDto; +import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackQuery; +import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackService; +import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/2/28 8:59 + */ +@Api(tags = "货架信息") +@RestController +@RequestMapping("/apiadmin/base/wmswarehouserack") +public class WmsWarehouseRackRest { + + @Autowired + WmsWarehouseRackService wmsWarehouseRackService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return wmsWarehouseRackService.listPage(pq); + } + @ApiOperation("查询所有的库区") + @GetMapping("/getAllType") + public ResultBean getAllType() { + return wmsWarehouseRackService.getAllType(); + } + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) { + return wmsWarehouseRackService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return wmsWarehouseRackService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return wmsWarehouseRackService.delete(sid); + } + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + wmsWarehouseRackService.delAll(sids); + return rb.success(); + } + + @ApiOperation("更改可用状态") + @GetMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { + return wmsWarehouseRackService.updateIsEnable(sid,isEnable); + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegion.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegion.java new file mode 100644 index 0000000..b211038 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegion.java @@ -0,0 +1,26 @@ +package com.yxt.warehouse.biz.warehouseregion; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WarehouseRegion extends BaseEntity { + + private String regionCode;//区域名称 + private String regionName;//区域编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String usageStatus;//使用状态,0停用 1正常 + private String sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionAllVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionAllVo.java new file mode 100644 index 0000000..d26dfaf --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionAllVo.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.warehouse.biz.warehouseregion; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓库)
+ * File: WmsWarehouseInfoVo.java
+ * Class: com.yxt.wms.api.wmswarehouseinfo.WmsWarehouseInfoVo
+ * Description: 仓库 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情") +public class WarehouseRegionAllVo implements Vo { + + private String sid; + @ApiModelProperty("仓库名称") + private String warehouseName; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java new file mode 100644 index 0000000..7d85156 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java @@ -0,0 +1,37 @@ +package com.yxt.warehouse.biz.warehouseregion; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseRegionDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String regionCode;//区域名称 + private String regionName;//区域编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String usageStatus;//使用状态,0停用 1正常 + private String sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +// private List wmsWarehouseExtendDtos; + private WmsWarehouseExtendDto wmsWarehouseExtendDto; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java new file mode 100644 index 0000000..092323a --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.warehouseregion; + +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.wmswarehousearea.WmsWarehouseAreaAllVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseRegionMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + int updateBySidIsDelete(List list); + @Select("select * from wms_warehouse_info") + List selectAll(); +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml new file mode 100644 index 0000000..57540cd --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + UPDATE wms_warehouse_info + SET isDelete=1 + where sid in + + #{item} + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionQuery.java new file mode 100644 index 0000000..9de7301 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionQuery.java @@ -0,0 +1,15 @@ +package com.yxt.warehouse.biz.warehouseregion; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseRegionQuery implements Query { + private String name; + private String code; + private String address; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java new file mode 100644 index 0000000..3eb4ee0 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java @@ -0,0 +1,146 @@ +package com.yxt.warehouse.biz.warehouseregion; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseArea; +import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; +import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaVo; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtend; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseRegionService extends MybatisBaseService { + + @Autowired + WmsWarehouseExtendService wmsWarehouseExtendService; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseRegionQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("warehouseName",query.getName()); + } + if(StringUtils.isNotBlank(query.getCode())){ + qw.like("warehouseCode",query.getCode()); + } + if(StringUtils.isNotBlank(query.getAddress())){ + qw.like("address",query.getAddress()); + } + qw.ne("isDelete",1); + qw.orderByDesc("sortNo"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + public ResultBean listAll() { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1")); + return rb.success().setData(pagging); + } + + public ResultBean saveOrUpdate(WarehouseRegionDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WarehouseRegion wmsWarehouse = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); + wmsWarehouse.setModifyTime(new Date()); + baseMapper.updateById(wmsWarehouse); +// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) { +// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid()); +// } + if(dto.getWmsWarehouseExtendDto()!=null){ + dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); + wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); + } + } else { + WarehouseRegion wmsWarehouse = new WarehouseRegion(); + sid = wmsWarehouse.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); + wmsWarehouse.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouse); +// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) { +// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid()); +// } + if(dto.getWmsWarehouseExtendDto()!=null){ + dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); + wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); + } + + } + + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseRegionVo vo = new WarehouseRegionVo(); + WarehouseRegion wmsWarehouse = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + BeanUtil.copyProperties(wmsWarehouse, vo); + List list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); + List list1=new ArrayList<>(); + for (WmsWarehouseExtend wmsWarehouseExtend : list) { + WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo(); + BeanUtil.copyProperties(wmsWarehouseExtend, vo1); + list1.add(vo1); + } + vo.setWmsWarehouseExtendVos(list1); + return rb.success().setData(vo); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseRegion wmsWarehouse = fetchBySid(sid); + if (null != wmsWarehouse) { + baseMapper.deleteById(wmsWarehouse.getId()); + } + return rb.success(); + } + + public void delAll(String[] sids) { + int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseRegion wmsWarehouse = fetchBySid(sid); + if (null != wmsWarehouse) { + wmsWarehouse.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouse); + } + return rb.success().setMsg("成功"); + } + + public List selectAll() { + return baseMapper.selectAll(); + } + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java new file mode 100644 index 0000000..92181eb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java @@ -0,0 +1,42 @@ +package com.yxt.warehouse.biz.warehouseregion; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseRegionVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String regionCode;//区域名称 + private String regionName;//区域编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String usageStatus;//使用状态,0停用 1正常 + private String sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private List wmsWarehouseExtendVos; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java new file mode 100644 index 0000000..3073780 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java @@ -0,0 +1,24 @@ +package com.yxt.warehouse.biz.wmswarehousearea; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +public class WmsWarehouseArea extends BaseEntity { +// private String id; +// private String sid= UUID.randomUUID().toString(); +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// private Date createTime; +// private String remarks; +// private String isEnable; + private String areaName;//库位名称 + private String areaCode;//库位编码 + private String warehouseSid;//仓库sid + private String volume;//库位容量 + private String unit;//计量单位 + private String areaTypeSid;//货区类型 +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java new file mode 100644 index 0000000..29eb0bb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.warehouse.biz.wmswarehousearea; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓库)
+ * File: WmsWarehouseAreaVo.java
+ * Class: com.yxt.wms.api.wmswarehousearea.WmsWarehouseAreaVo
+ * Description: 库区 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库区 视图数据详情", description = "库区 视图数据详情") +public class WmsWarehouseAreaAllVo implements Vo { + + private String sid; + @ApiModelProperty("库位名称") + private String areaName; + @ApiModelProperty("库位编码") + private String areaCode; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java new file mode 100644 index 0000000..54232e1 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java @@ -0,0 +1,28 @@ +package com.yxt.warehouse.biz.wmswarehousearea; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WmsWarehouseAreaDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String areaName;//库位名称 + private String areaCode;//库位编码 + private String warehouseSid;//仓库sid + private String volume;//库位容量 + private String unit;//计量单位 + private String areaTypeSid;//货区类型 + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java new file mode 100644 index 0000000..136fbf5 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java @@ -0,0 +1,24 @@ +package com.yxt.warehouse.biz.wmswarehousearea; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WmsWarehouseAreaMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WmsWarehouseAreaVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); + @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}") + List selectAll(String ckSid); +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml new file mode 100644 index 0000000..7782bee --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + UPDATE wms_warehouse_area + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java new file mode 100644 index 0000000..4a3287b --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaQuery.java @@ -0,0 +1,16 @@ +package com.yxt.warehouse.biz.wmswarehousearea; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseAreaQuery implements Query { + private String name;//名字 + private String code;//编码 + private String warehouseSid;//仓库 + private String areaTypeSid;//库区类型 +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java new file mode 100644 index 0000000..5e84cd3 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java @@ -0,0 +1,110 @@ +package com.yxt.warehouse.biz.wmswarehousearea; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WmsWarehouseAreaService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseAreaQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("areaName",query.getName()); + } + if(StringUtils.isNotBlank(query.getCode())){ + qw.like("areaCode",query.getCode()); + } + if(StringUtils.isNotBlank(query.getWarehouseSid())){ + qw.eq("b.sid",query.getWarehouseSid()); + } + if(StringUtils.isNotBlank(query.getAreaTypeSid())){ + qw.eq("c.sid",query.getAreaTypeSid()); + } + qw.ne("a.isDelete","1"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + public ResultBean getAllType() { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); + return rb.success().setData(pagging); + } + + public ResultBean saveOrUpdate(WmsWarehouseAreaDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WmsWarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); + wmsWarehouseArea.setModifyTime(new Date()); + baseMapper.updateById(wmsWarehouseArea); + } else { + WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea(); + sid = wmsWarehouseArea.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); + wmsWarehouseArea.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouseArea); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseAreaVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid); + if (null != wmsWarehouseArea) { + baseMapper.deleteById(wmsWarehouseArea.getId()); + } + return rb.success(); + } + + public void delAll(String[] sids) { + int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid); + if (null != wmsWarehouseArea) { + wmsWarehouseArea.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouseArea); + } + return rb.success().setMsg("成功"); + } + + public List selectAll(String ckSid) { + return baseMapper.selectAll(ckSid); + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java new file mode 100644 index 0000000..3d0945d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java @@ -0,0 +1,34 @@ +package com.yxt.warehouse.biz.wmswarehousearea; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseAreaVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String areaName;//库位名称 + private String areaCode;//库位编码 + private String warehouseSid;//仓库sid + private String volume;//库位容量 + private String unit;//计量单位 + private String areaTypeSid;//货区类型 + private String warehouseName;//仓库名称 + private String areaTypeName;//货区类型名称 +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java new file mode 100644 index 0000000..4a848bd --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java @@ -0,0 +1,17 @@ +package com.yxt.warehouse.biz.wmswarehouseareatype; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +public class WmsWarehouseAreaType extends BaseEntity { + + private String warehouseAreaTypeName;//库位类型名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java new file mode 100644 index 0000000..cca3275 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.wmswarehouseareatype; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WmsWarehouseAreaTypeDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String warehouseAreaTypeName;//库位类型名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java new file mode 100644 index 0000000..071e0cf --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java @@ -0,0 +1,21 @@ +package com.yxt.warehouse.biz.wmswarehouseareatype; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WmsWarehouseAreaTypeMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml new file mode 100644 index 0000000..73bc7f6 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + UPDATE wms_warehouse_area_type + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java new file mode 100644 index 0000000..b5b768b --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.wmswarehouseareatype; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseAreaTypeQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java new file mode 100644 index 0000000..c4aa106 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java @@ -0,0 +1,95 @@ +package com.yxt.warehouse.biz.wmswarehouseareatype; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WmsWarehouseAreaTypeService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseAreaTypeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("warehouseAreaTypeName",query.getName()); + } + qw.ne("isDelete","1"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + public ResultBean listAll() { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); + return rb.success().setData(pagging); + } + + public ResultBean saveOrUpdate(WmsWarehouseAreaTypeDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); + wmsWarehouseArea.setModifyTime(new Date()); + baseMapper.updateById(wmsWarehouseArea); + } else { + WmsWarehouseAreaType wmsWarehouseArea = new WmsWarehouseAreaType(); + sid = wmsWarehouseArea.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid"); + wmsWarehouseArea.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouseArea); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseAreaTypeVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid); + if (null != wmsWarehouseArea) { + baseMapper.deleteById(wmsWarehouseArea.getId()); + } + return rb.success(); + } + public void delAll(String[] sids) { + int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid); + if (null != wmsWarehouseArea) { + wmsWarehouseArea.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouseArea); + } + return rb.success().setMsg("成功"); + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java new file mode 100644 index 0000000..228545e --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java @@ -0,0 +1,29 @@ +package com.yxt.warehouse.biz.wmswarehouseareatype; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseAreaTypeVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String warehouseAreaTypeName;//库位类型名称 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtend.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtend.java new file mode 100644 index 0000000..03a1614 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtend.java @@ -0,0 +1,20 @@ +package com.yxt.warehouse.biz.wmswarehouseextend; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WmsWarehouseExtend extends BaseEntity { + + private String warehouseSid;//仓库sid + private String markupRate1;//加价率1 + private String markupRate2;//加价率2 + private String markupRate3;//加价率3 + private String markupRate4;//加价率4 + private String markupRate5;//加价率5 + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendDto.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendDto.java new file mode 100644 index 0000000..68fb63b --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendDto.java @@ -0,0 +1,36 @@ +package com.yxt.warehouse.biz.wmswarehouseextend; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WmsWarehouseExtendDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String warehouseSid;//仓库sid + private String markupRate1;//加价率1 + private String markupRate2;//加价率2 + private String markupRate3;//加价率3 + private String markupRate4;//加价率4 + private String markupRate5;//加价率5 + + + + + + + + + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.java new file mode 100644 index 0000000..f2438cd --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.wmswarehouseextend; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WmsWarehouseExtendMapper extends BaseMapper { + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml new file mode 100644 index 0000000..aaae295 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java new file mode 100644 index 0000000..b0d4d84 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.wmswarehouseextend; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseExtendQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java new file mode 100644 index 0000000..4b8235d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java @@ -0,0 +1,58 @@ +package com.yxt.warehouse.biz.wmswarehouseextend; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WmsWarehouseExtendService extends MybatisBaseService { + + + public ResultBean saveOrUpdate(WmsWarehouseExtendDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; +// for (WmsWarehouseExtendDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WmsWarehouseExtend wmsWarehouse = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); + wmsWarehouse.setModifyTime(new Date()); + baseMapper.updateById(wmsWarehouse); + } else { + WmsWarehouseExtend wmsWarehouse = new WmsWarehouseExtend(); + sid = wmsWarehouse.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); + wmsWarehouse.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouse); + } +// } + + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseExtendVo vo = new WmsWarehouseExtendVo(); + WmsWarehouseExtend wmsWarehouse = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != wmsWarehouse) { + BeanUtil.copyProperties(wmsWarehouse, vo); +// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) { +// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl()); +// } +// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); + } + return rb.success().setData(vo); + } + +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java new file mode 100644 index 0000000..36cfecd --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java @@ -0,0 +1,33 @@ +package com.yxt.warehouse.biz.wmswarehouseextend; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseExtendVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String warehouseSid;//仓库sid + private String warehouseName;//仓库名称 + private String markupRate1;//加价率1 + private String markupRate2;//加价率2 + private String markupRate3;//加价率3 + private String markupRate4;//加价率4 + private String markupRate5;//加价率5 +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java new file mode 100644 index 0000000..38b4116 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfo.java @@ -0,0 +1,30 @@ +package com.yxt.warehouse.biz.wmswarehouseinfo; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WmsWarehouseInfo extends BaseEntity { + + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private String usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private String sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java new file mode 100644 index 0000000..6041570 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoAllVo.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.warehouse.biz.wmswarehouseinfo; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓库)
+ * File: WmsWarehouseInfoVo.java
+ * Class: com.yxt.wms.api.wmswarehouseinfo.WmsWarehouseInfoVo
+ * Description: 仓库 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情") +public class WmsWarehouseInfoAllVo implements Vo { + + private String sid; + @ApiModelProperty("仓库名称") + private String warehouseName; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java new file mode 100644 index 0000000..4d1361b --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoDto.java @@ -0,0 +1,41 @@ +package com.yxt.warehouse.biz.wmswarehouseinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WmsWarehouseInfoDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private String usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private String sortNo;//创建组织sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +// private List wmsWarehouseExtendDtos; + private WmsWarehouseExtendDto wmsWarehouseExtendDto; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java new file mode 100644 index 0000000..5385011 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.wmswarehouseinfo; + +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.wmswarehousearea.WmsWarehouseAreaAllVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WmsWarehouseInfoMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + int updateBySidIsDelete(List list); + @Select("select * from wms_warehouse_info") + List selectAll(); +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml new file mode 100644 index 0000000..d30e322 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + UPDATE wms_warehouse_info + SET isDelete=1 + where sid in + + #{item} + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java new file mode 100644 index 0000000..4873c37 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoQuery.java @@ -0,0 +1,15 @@ +package com.yxt.warehouse.biz.wmswarehouseinfo; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseInfoQuery implements Query { + private String name; + private String code; + private String address; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java new file mode 100644 index 0000000..0d5fd15 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoService.java @@ -0,0 +1,143 @@ +package com.yxt.warehouse.biz.wmswarehouseinfo; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtend; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WmsWarehouseInfoService extends MybatisBaseService { + + @Autowired + WmsWarehouseExtendService wmsWarehouseExtendService; + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseInfoQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("warehouseName",query.getName()); + } + if(StringUtils.isNotBlank(query.getCode())){ + qw.like("warehouseCode",query.getCode()); + } + if(StringUtils.isNotBlank(query.getAddress())){ + qw.like("address",query.getAddress()); + } + qw.ne("isDelete",1); + qw.orderByDesc("sortNo"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + public ResultBean listAll() { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + return rb.success().setData(pagging); + } + + public ResultBean saveOrUpdate(WmsWarehouseInfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); + wmsWarehouse.setModifyTime(new Date()); + baseMapper.updateById(wmsWarehouse); +// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) { +// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid()); +// } + if(dto.getWmsWarehouseExtendDto()!=null){ + dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); + wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); + } + } else { + WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo(); + sid = wmsWarehouse.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); + wmsWarehouse.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouse); +// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) { +// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid()); +// } + if(dto.getWmsWarehouseExtendDto()!=null){ + dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); + wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); + } + + } + + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseInfoVo vo = new WmsWarehouseInfoVo(); + WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + BeanUtil.copyProperties(wmsWarehouse, vo); + List list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid())); + List list1=new ArrayList<>(); + for (WmsWarehouseExtend wmsWarehouseExtend : list) { + WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo(); + BeanUtil.copyProperties(wmsWarehouseExtend, vo1); + list1.add(vo1); + } + vo.setWmsWarehouseExtendVos(list1); + return rb.success().setData(vo); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); + if (null != wmsWarehouse) { + baseMapper.deleteById(wmsWarehouse.getId()); + } + return rb.success(); + } + + public void delAll(String[] sids) { + int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); + if (null != wmsWarehouse) { + wmsWarehouse.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouse); + } + return rb.success().setMsg("成功"); + } + + public List selectAll() { + return baseMapper.selectAll(); + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java new file mode 100644 index 0000000..7731230 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouseinfo/WmsWarehouseInfoVo.java @@ -0,0 +1,46 @@ +package com.yxt.warehouse.biz.wmswarehouseinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseInfoVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private String usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private String sortNo;//创建组织sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private List wmsWarehouseExtendVos; +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java new file mode 100644 index 0000000..b4dc8de --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRack.java @@ -0,0 +1,22 @@ +package com.yxt.warehouse.biz.wmswarehouserack; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +public class WmsWarehouseRack extends BaseEntity { +// private String id; +// private String sid= UUID.randomUUID().toString(); +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// private Date createTime; +// private String remarks; +// private String isEnable; + private String rackName;//货架名称 + private String rackCode;//货架编码 + private String warehouseSid;//仓库sid + private String locationSid;//库位sid +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java new file mode 100644 index 0000000..70aa32f --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackDto.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.wmswarehouserack; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WmsWarehouseRackDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String rackName;//货架名称 + private String rackCode;//货架编码 + private String warehouseSid;//仓库sid + private String locationSid;//库位sid +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java new file mode 100644 index 0000000..c1a81d1 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.java @@ -0,0 +1,21 @@ +package com.yxt.warehouse.biz.wmswarehouserack; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WmsWarehouseRackMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WmsWarehouseRackVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml new file mode 100644 index 0000000..eab8d6d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + UPDATE wms_warehouse_rack + SET isDelete=1 + where sid in + + #{item} + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java new file mode 100644 index 0000000..7d9566e --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java @@ -0,0 +1,16 @@ +package com.yxt.warehouse.biz.wmswarehouserack; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseRackQuery implements Query { + private String name;//名字 + private String code;//编码 + private String warehouseSid;//仓库 + private String areaTypeSid;//库区类型 +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java new file mode 100644 index 0000000..9401c6a --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackService.java @@ -0,0 +1,105 @@ +package com.yxt.warehouse.biz.wmswarehouserack; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WmsWarehouseRackService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseRackQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("rackName",query.getName()); + } + if(StringUtils.isNotBlank(query.getCode())){ + qw.like("rackCode",query.getCode()); + } + if(StringUtils.isNotBlank(query.getAreaTypeSid())){ + qw.eq("b.sid",query.getAreaTypeSid()); + } + if(StringUtils.isNotBlank(query.getWarehouseSid())){ + qw.eq("c.sid",query.getWarehouseSid()); + } + qw.ne("a.isDelete","1"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + public ResultBean getAllType() { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1")); + return rb.success().setData(pagging); + } + + public ResultBean saveOrUpdate(WmsWarehouseRackDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WmsWarehouseRack wmsWarehouseRack = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + wmsWarehouseRack.setModifyTime(new Date()); + baseMapper.updateById(wmsWarehouseRack); + } else { + WmsWarehouseRack wmsWarehouseRack = new WmsWarehouseRack(); + sid = wmsWarehouseRack.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + wmsWarehouseRack.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseRackVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseRack wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + public void delAll(String[] sids) { + int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + + public ResultBean updateIsEnable(String sid,String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WmsWarehouseRack wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackVo.java b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackVo.java new file mode 100644 index 0000000..8148f74 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackVo.java @@ -0,0 +1,33 @@ +package com.yxt.warehouse.biz.wmswarehouserack; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WmsWarehouseRackVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String rackName;//货架名称 + private String rackCode;//货架编码 + private String warehouseSid;//仓库sid + private String locationSid;//库位sid + private String warehouseName;//仓库名称 + private String locationName;//库位名称 + +}