6/4
This commit is contained in:
@@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
**/
|
||||
@SpringBootApplication(scanBasePackages = {
|
||||
"com.yxt.common.base.config",
|
||||
"com.yxt.storage"
|
||||
"com.yxt.warehouse"
|
||||
})
|
||||
// 启用自带定时任务
|
||||
@EnableScheduling
|
||||
|
||||
@@ -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<PagerVo<WarehouseRegionVo>> listPage(@RequestBody PagerQuery<WarehouseRegionQuery> pq) {
|
||||
return warehouseRegionService.listPage(pq);
|
||||
}
|
||||
@ApiOperation("查询所有的库区")
|
||||
@GetMapping("/listAll")
|
||||
public ResultBean<WarehouseRegion> listAll() {
|
||||
return warehouseRegionService.listAll();
|
||||
}
|
||||
|
||||
@ApiOperation("保存修改")
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseRegionDto dto) {
|
||||
return warehouseRegionService.saveOrUpdate(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/initialization/{sid}")
|
||||
public ResultBean<WarehouseRegionVo> 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();
|
||||
}
|
||||
}
|
||||
@@ -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<PagerVo<WmsWarehouseAreaVo>> listPage(@RequestBody PagerQuery<WmsWarehouseAreaQuery> pq) {
|
||||
return wmsWarehouseAreaService.listPage(pq);
|
||||
}
|
||||
@ApiOperation("查询所有的库区")
|
||||
@GetMapping("/listAll")
|
||||
public ResultBean<WmsWarehouseAreaVo> listAll() {
|
||||
return wmsWarehouseAreaService.getAllType();
|
||||
}
|
||||
|
||||
@ApiOperation("保存修改")
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseAreaDto dto) {
|
||||
return wmsWarehouseAreaService.saveOrUpdate(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/initialization/{sid}")
|
||||
public ResultBean<WmsWarehouseAreaVo> 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<List<WmsWarehouseAreaAllVo>> selectAll(@RequestParam("ckSid") String ckSid){
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WmsWarehouseAreaAllVo> vo = wmsWarehouseAreaService.selectAll(ckSid);
|
||||
return rb.success().setData(vo);
|
||||
}
|
||||
}
|
||||
@@ -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<PagerVo<WmsWarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WmsWarehouseAreaTypeQuery> pq) {
|
||||
return wmsWarehouseAreaTypeService.listPage(pq);
|
||||
}
|
||||
@ApiOperation("查询所有的")
|
||||
@GetMapping("/listAll")
|
||||
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
|
||||
return wmsWarehouseAreaTypeService.listAll();
|
||||
}
|
||||
|
||||
@ApiOperation("保存修改")
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseAreaTypeDto dto) {
|
||||
return wmsWarehouseAreaTypeService.saveOrUpdate(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/initialization/{sid}")
|
||||
public ResultBean<WmsWarehouseAreaTypeVo> 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);
|
||||
}
|
||||
}
|
||||
@@ -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<String> saveOrUpdate(@RequestBody WmsWarehouseExtendDto dto) {
|
||||
return wmsWarehouseExtendService.saveOrUpdate(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/initialization/{sid}")
|
||||
public ResultBean<WmsWarehouseExtendVo> initialization(@PathVariable("sid") String sid) {
|
||||
return wmsWarehouseExtendService.initialization(sid);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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<PagerVo<WmsWarehouseInfoVo>> listPage(@RequestBody PagerQuery<WmsWarehouseInfoQuery> pq) {
|
||||
return wmsWarehouseService.listPage(pq);
|
||||
}
|
||||
@ApiOperation("查询所有的仓库")
|
||||
@GetMapping("/listAll")
|
||||
public ResultBean<WmsWarehouseInfoVo> listAll() {
|
||||
return wmsWarehouseService.listAll();
|
||||
}
|
||||
|
||||
@ApiOperation("保存修改")
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseInfoDto dto) {
|
||||
return wmsWarehouseService.saveOrUpdate(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/initialization/{sid}")
|
||||
public ResultBean<WmsWarehouseInfoVo> 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<List<WmsWarehouseInfoAllVo>> selectAll(){
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WmsWarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
|
||||
return rb.success().setData(wmsWarehouseAreaAllVos);
|
||||
}
|
||||
}
|
||||
@@ -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<PagerVo<WmsWarehouseRackVo>> listPage(@RequestBody PagerQuery<WmsWarehouseRackQuery> pq) {
|
||||
return wmsWarehouseRackService.listPage(pq);
|
||||
}
|
||||
@ApiOperation("查询所有的库区")
|
||||
@GetMapping("/getAllType")
|
||||
public ResultBean<WmsWarehouseRackVo> getAllType() {
|
||||
return wmsWarehouseRackService.getAllType();
|
||||
}
|
||||
|
||||
@ApiOperation("保存修改")
|
||||
@PostMapping("/saveOrUpdate")
|
||||
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) {
|
||||
return wmsWarehouseRackService.saveOrUpdate(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("初始化")
|
||||
@GetMapping("/initialization/{sid}")
|
||||
public ResultBean<WmsWarehouseRackVo> 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);
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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(仓库) <br/>
|
||||
* File: WmsWarehouseInfoVo.java <br/>
|
||||
* Class: com.yxt.wms.api.wmswarehouseinfo.WmsWarehouseInfoVo <br/>
|
||||
* Description: 仓库 视图数据对象. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-04-09 14:35:56 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情")
|
||||
public class WarehouseRegionAllVo implements Vo {
|
||||
|
||||
private String sid;
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String warehouseName;
|
||||
}
|
||||
@@ -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<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
|
||||
private WmsWarehouseExtendDto wmsWarehouseExtendDto;
|
||||
}
|
||||
@@ -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<WarehouseRegion> {
|
||||
IPage<WarehouseRegionVo> listPage(IPage<WarehouseRegion> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseRegion> qw);
|
||||
|
||||
int updateBySidIsDelete(List<String> list);
|
||||
@Select("select * from wms_warehouse_info")
|
||||
List<WmsWarehouseAreaAllVo> selectAll();
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.warehouse.biz.warehouseregion.WarehouseRegionMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseregion.WarehouseRegionVo">
|
||||
select
|
||||
*
|
||||
from wms_warehouse_info
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
<update id="updateBySidIsDelete">
|
||||
UPDATE wms_warehouse_info
|
||||
SET isDelete=1
|
||||
where sid in
|
||||
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<WarehouseRegionMapper, WarehouseRegion> {
|
||||
|
||||
@Autowired
|
||||
WmsWarehouseExtendService wmsWarehouseExtendService;
|
||||
|
||||
public ResultBean<PagerVo<WarehouseRegionVo>> listPage(PagerQuery<WarehouseRegionQuery> pq) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
WarehouseRegionQuery query = pq.getParams();
|
||||
QueryWrapper<WarehouseRegion> 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<WarehouseRegion> page = PagerUtil.queryToPage(pq);
|
||||
IPage<WarehouseRegionVo> pagging = baseMapper.listPage(page, qw);
|
||||
PagerVo<WarehouseRegionVo> p = PagerUtil.pageToVo(pagging, null);
|
||||
List<WarehouseRegionVo> records = pagging.getRecords();
|
||||
return rb.success().setData(p);
|
||||
}
|
||||
public ResultBean<WarehouseRegion> listAll() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WarehouseRegion> pagging = baseMapper.selectList(new QueryWrapper<WarehouseRegion>().eq("isEnable",1).ne("isDelete","1"));
|
||||
return rb.success().setData(pagging);
|
||||
}
|
||||
|
||||
public ResultBean<String> 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<WarehouseRegionVo> 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<WmsWarehouseExtend> list=wmsWarehouseExtendService.list(new QueryWrapper<WmsWarehouseExtend>().eq("warehouseSid",vo.getSid()));
|
||||
List<WmsWarehouseExtendVo> 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<WmsWarehouseAreaAllVo> selectAll() {
|
||||
return baseMapper.selectAll();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<WmsWarehouseExtendVo> wmsWarehouseExtendVos;
|
||||
}
|
||||
@@ -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;//货区类型
|
||||
}
|
||||
@@ -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(仓库) <br/>
|
||||
* File: WmsWarehouseAreaVo.java <br/>
|
||||
* Class: com.yxt.wms.api.wmswarehousearea.WmsWarehouseAreaVo <br/>
|
||||
* Description: 库区 视图数据对象. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-04-09 14:35:56 <br/>
|
||||
*
|
||||
* @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;
|
||||
}
|
||||
@@ -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;//货区类型
|
||||
|
||||
}
|
||||
@@ -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<WmsWarehouseArea> {
|
||||
IPage<WmsWarehouseAreaVo> listPage(IPage<WmsWarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseArea> qw);
|
||||
WmsWarehouseAreaVo initialization (@Param("sid") String sid);
|
||||
int updateBySidIsDelete(List<String> list);
|
||||
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
|
||||
List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaVo">
|
||||
select
|
||||
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
|
||||
from wms_warehouse_area a
|
||||
left join wms_warehouse_info b on b.sid=a.warehouseSid
|
||||
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
<select id="initialization" resultType="com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaVo">
|
||||
select
|
||||
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
|
||||
from wms_warehouse_area a
|
||||
left join wms_warehouse_info b on b.sid=a.warehouseSid
|
||||
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
|
||||
|
||||
where a.sid =#{sid}
|
||||
</select>
|
||||
<update id="updateBySidIsDelete">
|
||||
UPDATE wms_warehouse_area
|
||||
SET isDelete=1
|
||||
where sid in
|
||||
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -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;//库区类型
|
||||
}
|
||||
@@ -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<WmsWarehouseAreaMapper, WmsWarehouseArea> {
|
||||
|
||||
|
||||
public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
WmsWarehouseAreaQuery query = pq.getParams();
|
||||
QueryWrapper<WmsWarehouseArea> 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<WmsWarehouseArea> page = PagerUtil.queryToPage(pq);
|
||||
IPage<WmsWarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
|
||||
PagerVo<WmsWarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
|
||||
List<WmsWarehouseAreaVo> records = pagging.getRecords();
|
||||
return rb.success().setData(p);
|
||||
}
|
||||
public ResultBean<WmsWarehouseAreaVo> getAllType() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1)
|
||||
.ne("isDelete","1"));
|
||||
return rb.success().setData(pagging);
|
||||
}
|
||||
|
||||
public ResultBean<String> 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<WmsWarehouseAreaVo> 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<WmsWarehouseAreaAllVo> selectAll(String ckSid) {
|
||||
return baseMapper.selectAll(ckSid);
|
||||
}
|
||||
}
|
||||
@@ -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;//货区类型名称
|
||||
}
|
||||
@@ -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
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
}
|
||||
@@ -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<WmsWarehouseAreaType> {
|
||||
IPage<WmsWarehouseAreaTypeVo> listPage(IPage<WmsWarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseAreaType> qw);
|
||||
WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid);
|
||||
int updateBySidIsDelete(List<String> list);
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo">
|
||||
select
|
||||
a.*
|
||||
from wms_warehouse_area_type a
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
<select id="initialization" resultType="com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo">
|
||||
select
|
||||
a.*
|
||||
from wms_warehouse_area_type a
|
||||
where a.sid =#{sid}
|
||||
</select>
|
||||
<update id="updateBySidIsDelete">
|
||||
UPDATE wms_warehouse_area_type
|
||||
SET isDelete=1
|
||||
where sid in
|
||||
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<WmsWarehouseAreaTypeMapper, WmsWarehouseAreaType> {
|
||||
|
||||
|
||||
public ResultBean<PagerVo<WmsWarehouseAreaTypeVo>> listPage(PagerQuery<WmsWarehouseAreaTypeQuery> pq) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
WmsWarehouseAreaTypeQuery query = pq.getParams();
|
||||
QueryWrapper<WmsWarehouseAreaType> qw = new QueryWrapper<>();
|
||||
if(StringUtils.isNotBlank(query.getName())){
|
||||
qw.like("warehouseAreaTypeName",query.getName());
|
||||
}
|
||||
qw.ne("isDelete","1");
|
||||
IPage<WmsWarehouseAreaType> page = PagerUtil.queryToPage(pq);
|
||||
IPage<WmsWarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
|
||||
PagerVo<WmsWarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
|
||||
List<WmsWarehouseAreaTypeVo> records = pagging.getRecords();
|
||||
return rb.success().setData(p);
|
||||
}
|
||||
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
|
||||
.ne("isDelete","1"));
|
||||
return rb.success().setData(pagging);
|
||||
}
|
||||
|
||||
public ResultBean<String> 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<WmsWarehouseAreaTypeVo> 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("成功");
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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<WmsWarehouseExtend> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo">
|
||||
select
|
||||
*
|
||||
from wms_warehouse_extend
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<WmsWarehouseExtendMapper, WmsWarehouseExtend> {
|
||||
|
||||
|
||||
public ResultBean<String> 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<WmsWarehouseExtendVo> 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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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(仓库) <br/>
|
||||
* File: WmsWarehouseInfoVo.java <br/>
|
||||
* Class: com.yxt.wms.api.wmswarehouseinfo.WmsWarehouseInfoVo <br/>
|
||||
* Description: 仓库 视图数据对象. <br/>
|
||||
* Copyright: Copyright (c) 2011 <br/>
|
||||
* Company: https://gitee.com/liuzp315 <br/>
|
||||
* Makedate: 2024-04-09 14:35:56 <br/>
|
||||
*
|
||||
* @author liupopo
|
||||
* @version 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情")
|
||||
public class WmsWarehouseInfoAllVo implements Vo {
|
||||
|
||||
private String sid;
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String warehouseName;
|
||||
}
|
||||
@@ -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<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
|
||||
private WmsWarehouseExtendDto wmsWarehouseExtendDto;
|
||||
}
|
||||
@@ -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<WmsWarehouseInfo> {
|
||||
IPage<WmsWarehouseInfoVo> listPage(IPage<WmsWarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseInfo> qw);
|
||||
|
||||
int updateBySidIsDelete(List<String> list);
|
||||
@Select("select * from wms_warehouse_info")
|
||||
List<WmsWarehouseAreaAllVo> selectAll();
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.warehouse.biz.wmswarehouseinfo.WmsWarehouseInfoMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehouseinfo.WmsWarehouseInfoVo">
|
||||
select
|
||||
*
|
||||
from wms_warehouse_info
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
<update id="updateBySidIsDelete">
|
||||
UPDATE wms_warehouse_info
|
||||
SET isDelete=1
|
||||
where sid in
|
||||
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<WmsWarehouseInfoMapper, WmsWarehouseInfo> {
|
||||
|
||||
@Autowired
|
||||
WmsWarehouseExtendService wmsWarehouseExtendService;
|
||||
|
||||
public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(PagerQuery<WmsWarehouseInfoQuery> pq) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
WmsWarehouseInfoQuery query = pq.getParams();
|
||||
QueryWrapper<WmsWarehouseInfo> 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<WmsWarehouseInfo> page = PagerUtil.queryToPage(pq);
|
||||
IPage<WmsWarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
|
||||
PagerVo<WmsWarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
|
||||
List<WmsWarehouseInfoVo> records = pagging.getRecords();
|
||||
return rb.success().setData(p);
|
||||
}
|
||||
public ResultBean<WmsWarehouseInfoVo> listAll() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WmsWarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseInfo>().eq("isEnable",1));
|
||||
return rb.success().setData(pagging);
|
||||
}
|
||||
|
||||
public ResultBean<String> 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<WmsWarehouseInfoVo> 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<WmsWarehouseExtend> list=wmsWarehouseExtendService.list(new QueryWrapper<WmsWarehouseExtend>().eq("warehouseSid",vo.getSid()));
|
||||
List<WmsWarehouseExtendVo> 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<WmsWarehouseAreaAllVo> selectAll() {
|
||||
return baseMapper.selectAll();
|
||||
}
|
||||
}
|
||||
@@ -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<WmsWarehouseExtendVo> wmsWarehouseExtendVos;
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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<WmsWarehouseRack> {
|
||||
IPage<WmsWarehouseRackVo> listPage(IPage<WmsWarehouseRack> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseRack> qw);
|
||||
WmsWarehouseRackVo initialization (@Param("sid") String sid);
|
||||
int updateBySidIsDelete(List<String> list);
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackVo">
|
||||
select
|
||||
a.*,b.areaName as locationName ,c.warehouseName as warehouseName
|
||||
from wms_warehouse_rack a
|
||||
left join wms_warehouse_area b on b.sid =a.locationSid
|
||||
left join wms_warehouse_info c on c.sid = a.warehouseSid
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
<select id="initialization" resultType="com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackVo">
|
||||
select
|
||||
a.*,b.areaName as locationName ,c.warehouseName as warehouseName
|
||||
from wms_warehouse_rack a
|
||||
left join wms_warehouse_area b on b.sid =a.locationSid
|
||||
left join wms_warehouse_info c on c.sid = a.warehouseSid
|
||||
where a.sid =#{sid}
|
||||
</select>
|
||||
<update id="updateBySidIsDelete">
|
||||
UPDATE wms_warehouse_rack
|
||||
SET isDelete=1
|
||||
where sid in
|
||||
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -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;//库区类型
|
||||
}
|
||||
@@ -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<WmsWarehouseRackMapper, WmsWarehouseRack> {
|
||||
|
||||
|
||||
public ResultBean<PagerVo<WmsWarehouseRackVo>> listPage(PagerQuery<WmsWarehouseRackQuery> pq) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
WmsWarehouseRackQuery query = pq.getParams();
|
||||
QueryWrapper<WmsWarehouseRack> 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<WmsWarehouseRack> page = PagerUtil.queryToPage(pq);
|
||||
IPage<WmsWarehouseRackVo> pagging = baseMapper.listPage(page, qw);
|
||||
PagerVo<WmsWarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
|
||||
List<WmsWarehouseRackVo> records = pagging.getRecords();
|
||||
return rb.success().setData(p);
|
||||
}
|
||||
public ResultBean<WmsWarehouseRackVo> getAllType() {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable",1)
|
||||
.ne("isDelete","1"));
|
||||
return rb.success().setData(pagging);
|
||||
}
|
||||
|
||||
public ResultBean<String> 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<WmsWarehouseRackVo> 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("成功");
|
||||
}
|
||||
}
|
||||
@@ -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;//库位名称
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user