open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

7/18

Browse Source
This commit is contained in:
wangpengfei
2024-07-18 08:43:42 +08:00
parent 127e4c1ac5
commit 9fd617fea7
33 changed files with 157 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java
View File

@@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousearea.*;
import com.yxt.warehouse.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +32,9 @@ public class WarehouseAreaRest {
return wmsWarehouseAreaService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@GetMapping("/listAll")
public ResultBean<WarehouseAreaVo> listAll() {
return wmsWarehouseAreaService.getAllType();
@PostMapping("/listAll")
public ResultBean<WarehouseAreaVo> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseAreaService.getAllType( query);
}
@ApiOperation("保存修改")

7
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java
View File

@@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseareatype.*;
import com.yxt.warehouse.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +32,9 @@ public class WarehouseAreaTypeRest {
return wmsWarehouseAreaTypeService.listPage(pq);
}
@ApiOperation("查询所有的")
@GetMapping("/listAll/{useOrgSid}")
public ResultBean<List<WarehouseAreaType>> listAll(@PathVariable("useOrgSid") String useOrgSid) {
return wmsWarehouseAreaTypeService.listAll(useOrgSid);
@PostMapping("/listAll")
public ResultBean<List<WarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseAreaTypeService.listAll(query);
}
@ApiOperation("保存修改")

7
src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
View File

@@ -8,6 +8,7 @@ import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType;
import com.yxt.warehouse.biz.warehouseinfo.*;
import com.yxt.warehouse.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +34,9 @@ public class WarehouseInfoRest {
return wmsWarehouseService.listPage(pq);
}
@ApiOperation("查询所有的仓库")
@GetMapping("/listAll/{useOrgSid}")
public ResultBean<List<WarehouseInfo>> listAll(@PathVariable("useOrgSid") String useOrgSid) {
return wmsWarehouseService.listAll(useOrgSid);
@PostMapping("/listAll")
public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseService.listAll(query);
}
@ApiOperation("保存修改")

7
src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java
View File

@@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouserack.*;
import com.yxt.warehouse.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +30,9 @@ public class WarehouseRackRest {
return wmsWarehouseRackService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@GetMapping("/getAllType")
public ResultBean<WarehouseRackVo> getAllType() {
return wmsWarehouseRackService.getAllType();
@PostMapping("/getAllType")
public ResultBean<WarehouseRackVo> getAllType(@RequestBody OrgPathQuery query) {
return wmsWarehouseRackService.getAllType(query);
}
@ApiOperation("保存修改")

7
src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java
View File

@@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseregion.*;
import com.yxt.warehouse.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +27,9 @@ public class WarehouseRegionRest {
return warehouseRegionService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@GetMapping("/listAll")
public ResultBean<WarehouseRegion> listAll() {
return warehouseRegionService.listAll();
@PostMapping("/listAll")
public ResultBean<WarehouseRegion> listAll(@RequestBody OrgPathQuery query) {
return warehouseRegionService.listAll(query);
}
@ApiOperation("保存修改")

9
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java
View File

@@ -9,12 +9,7 @@ import lombok.Data;
*/
@Data
public class WarehouseArea 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
@@ -22,4 +17,6 @@ public class WarehouseArea extends BaseEntity {
private String unit;//计量单位
private String areaTypeSid;//货区类型
private String useOrgSid;
private String createOrgSid;//创建组织sid
}

3
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java
View File

@@ -25,4 +25,7 @@ public class WarehouseAreaDto implements Dto {
private String unit;//计量单位
private String areaTypeSid;//货区类型
private String useOrgSid;
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

1
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java
View File

@@ -21,4 +21,5 @@ public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
List<WarehouseAreaAllVo> selectAll(String ckSid);
List<WarehouseAreaVo> listAll(@Param("orgPath")String orgPath);
}

9
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
View File

@@ -15,6 +15,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaVo">
select
*
from warehouse_area a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
s.orgSidPath like #{orgPath} and a.isDelete !='1'
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaVo">
select
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName

21
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
View File

@@ -10,7 +10,9 @@ 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.warehouseareatype.WarehouseAreaTypeVo;
import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -56,27 +58,26 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.like("areaName", query.getName());
qw.like("a.areaName", query.getName());
}
if (StringUtils.isNotBlank(query.getCode())) {
qw.like("areaCode", query.getCode());
qw.like("a.areaCode", query.getCode());
}
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.eq("sid", query.getWarehouseSid());
qw.eq("b.sid", query.getWarehouseSid());
}
if (StringUtils.isNotBlank(query.getAreaTypeSid())) {
qw.eq("sid", query.getAreaTypeSid());
qw.eq("c.sid", query.getAreaTypeSid());
}
qw.ne("isDelete", "1");
qw.ne("a.isDelete", "1");
IPage<WarehouseArea> page = PagerUtil.queryToPage(pq);
IPage<WarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<WarehouseAreaVo> getAllType() {
public ResultBean<WarehouseAreaVo> getAllType(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WarehouseArea>().eq("isEnable",1)
.ne("isDelete","1"));
List<WarehouseAreaVo> pagging = baseMapper.listAll(query.getOrgPath());
return rb.success().setData(pagging);
}
@@ -94,6 +95,9 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
wmsWarehouseArea.setCreateOrgSid(dto.getOrgPath());
wmsWarehouseArea.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");
@@ -102,6 +106,7 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
public ResultBean<WarehouseAreaVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseAreaVo vo = baseMapper.initialization(sid);
vo.setOrgPath(vo.getUseOrgSid());
return rb.success().setData(vo);
}

3
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaVo.java
View File

@@ -32,4 +32,7 @@ public class WarehouseAreaVo implements Vo {
private String warehouseName;//仓库名称
private String areaTypeName;//货区类型名称
private String useOrgSid;
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

2
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeDto.java
View File

@@ -21,5 +21,7 @@ public class WarehouseAreaTypeDto implements Dto {
private String warehouseAreaTypeName;//库位类型名称
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

1
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.java
View File

@@ -18,4 +18,5 @@ public interface WarehouseAreaTypeMapper extends BaseMapper<WarehouseAreaType> {
IPage<WarehouseAreaTypeVo> listPage(IPage<WarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAreaType> qw);
WarehouseAreaTypeVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
List<WarehouseAreaTypeVo> listAll(@Param("orgPath")String orgPath);
}

9
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
View File

@@ -13,6 +13,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo">
select
*
from warehouse_area_type a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
s.orgSidPath like #{orgPath} and a.isDelete !='1'
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo">
select
a.*

10
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
View File

@@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
@@ -64,10 +65,9 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
PagerVo<WarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(pagging);
}
public ResultBean<List<WarehouseAreaType>> listAll(String useOrgSid) {
public ResultBean<List<WarehouseAreaType>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WarehouseAreaType>().eq("isEnable",1)
.ne("isDelete","1").eq("useOrgSid",useOrgSid));
List<WarehouseAreaTypeVo> pagging = baseMapper.listAll(query.getOrgPath());
return rb.success().setData(pagging);
}
@@ -85,6 +85,9 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
wmsWarehouseArea.setCreateOrgSid(dto.getOrgPath());
wmsWarehouseArea.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");
@@ -93,6 +96,7 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
public ResultBean<WarehouseAreaTypeVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseAreaTypeVo vo = baseMapper.initialization(sid);
vo.setOrgPath(vo.getUseOrgSid());
return rb.success().setData(vo);
}

2
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeVo.java
View File

@@ -26,4 +26,6 @@ public class WarehouseAreaTypeVo implements Vo {
private String warehouseAreaTypeName;//库位类型名称
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

1
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
View File

@@ -44,4 +44,5 @@ public class WarehouseInfoDto implements Dto {
// private List<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
private WarehouseExtendDto wmsWarehouseExtendDto;
private String userSid;
private String orgPath;
}

1
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
View File

@@ -22,4 +22,5 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")
List<WarehouseAreaAllVo> selectAll();
List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
}

9
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
View File

@@ -13,6 +13,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
select
*
from warehouse_info a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
s.orgSidPath like #{orgPath} and a.isDelete !='1'
</where>
</select>
<update id="updateBySidIsDelete">
UPDATE warehouse_info
SET isDelete=1

12
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -15,6 +15,8 @@ import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
@@ -80,10 +82,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<List<WarehouseInfo>> listAll(String useOrgSid) {
public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WarehouseInfo>().eq("isEnable",1)
.eq("useOrgSid",useOrgSid).eq("isDelete","0"));
List<WarehouseInfoVo> pagging = baseMapper.listAll(query.getOrgPath());
return rb.success().setData(pagging);
}
@@ -108,7 +109,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
sid = wmsWarehouse.getSid();
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setCreateTime(new DateTime());
wmsWarehouse.setCreateOrgSid(dto.getUserSid());
wmsWarehouse.setCreateBySid(dto.getUserSid());
wmsWarehouse.setCreateOrgSid(dto.getOrgPath());
wmsWarehouse.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(wmsWarehouse);
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
@@ -137,6 +140,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
list1.add(vo1);
}
vo.setWmsWarehouseExtendVos(list1);
vo.setOrgPath(vo.getUseOrgSid());
return rb.success().setData(vo);
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java
View File

@@ -43,4 +43,6 @@ public class WarehouseInfoVo implements Vo {
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
private List<WarehouseExtendVo> wmsWarehouseExtendVos;
private String userSid;
private String orgPath;
}

8
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java
View File

@@ -9,14 +9,10 @@ import lombok.Data;
*/
@Data
public class WarehouseRack 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
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
}

4
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java
View File

@@ -22,4 +22,8 @@ public class WarehouseRackDto implements Dto {
private String rackCode;//货架编码
private String warehouseSid;//仓库sid
private String locationSid;//库位sid
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

1
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java
View File

@@ -18,4 +18,5 @@ public interface WarehouseRackMapper extends BaseMapper<WarehouseRack> {
IPage<WarehouseRackVo> listPage(IPage<WarehouseRack> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseRack> qw);
WarehouseRackVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
List<WarehouseRackVo> listAll(@Param("orgPath")String orgPath);
}

9
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
View File

@@ -15,6 +15,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">
select
*
from warehouse_rack a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
s.orgSidPath like #{orgPath} and a.isDelete !='1'
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">
select
a.*,b.areaName as locationName ,c.warehouseName as warehouseName

10
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
View File

@@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
@@ -73,10 +74,9 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
PagerVo<WarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<WarehouseRackVo> getAllType() {
public ResultBean<WarehouseRackVo> getAllType(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WarehouseRack>().eq("isEnable",1)
.ne("isDelete","1"));
List<WarehouseRackVo> pagging = baseMapper.listAll(query.getOrgPath());
return rb.success().setData(pagging);
}
@@ -94,6 +94,9 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
sid = wmsWarehouseRack.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
wmsWarehouseRack.setCreateBySid(dto.getUserSid());
wmsWarehouseRack.setCreateOrgSid(dto.getOrgPath());
wmsWarehouseRack.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
@@ -102,6 +105,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
public ResultBean<WarehouseRackVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseRackVo vo = baseMapper.initialization(sid);
vo.setOrgPath(vo.getUseOrgSid());
return rb.success().setData(vo);
}

5
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackVo.java
View File

@@ -29,5 +29,8 @@ public class WarehouseRackVo implements Vo {
private String locationSid;//库位sid
private String warehouseName;//仓库名称
private String locationName;//库位名称
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

2
src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionDto.java
View File

@@ -34,4 +34,6 @@ public class WarehouseRegionDto implements Dto {
private String createOrgSid;//创建组织sid
// private List<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
private WarehouseExtendDto wmsWarehouseExtendDto;
private String userSid;
private String orgPath;
}

1
src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.java
View File

@@ -22,4 +22,5 @@ public interface WarehouseRegionMapper extends BaseMapper<WarehouseRegion> {
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")
List<WarehouseAreaAllVo> selectAll();
List<WarehouseRegionVo> listAll(@Param("orgPath")String orgPath);
}

9
src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml
View File

@@ -12,6 +12,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehouseregion.WarehouseRegionVo">
select
*
from warehouse_region a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
s.orgSidPath like #{orgPath} and a.isDelete !='1'
</where>
</select>
<update id="updateBySidIsDelete">
UPDATE warehouse_region
SET isDelete=1

10
src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java
View File

@@ -14,6 +14,8 @@ import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,9 +57,9 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
List<WarehouseRegionVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WarehouseRegion> listAll() {
public ResultBean<WarehouseRegion> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseRegion> pagging = baseMapper.selectList(new QueryWrapper<WarehouseRegion>().eq("isEnable",1).ne("isDelete","1"));
List<WarehouseRegionVo> pagging = baseMapper.listAll(query.getOrgPath());
return rb.success().setData(pagging);
}
@@ -82,6 +84,9 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
sid = wmsWarehouse.getSid();
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setCreateTime(new DateTime());
wmsWarehouse.setCreateBySid(dto.getUserSid());
wmsWarehouse.setCreateOrgSid(dto.getOrgPath());
wmsWarehouse.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(wmsWarehouse);
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
@@ -110,6 +115,7 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
list1.add(vo1);
}
vo.setWmsWarehouseExtendVos(list1);
vo.setOrgPath(vo.getUseOrgSid());
return rb.success().setData(vo);
}

2
src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionVo.java
View File

@@ -39,4 +39,6 @@ public class WarehouseRegionVo implements Vo {
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
private List<WarehouseExtendVo> wmsWarehouseExtendVos;
private String userSid;
private String orgPath;
}

14
src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java Normal file
View File

@@ -0,0 +1,14 @@
package com.yxt.warehouse.utils;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/17 14:15
*/
@Data
public class OrgPathQuery {
private String orgPath;
private String userOrgSid;
}