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

7/12

Browse Source
This commit is contained in:
wangpengfei
2024-07-12 17:59:32 +08:00
parent 77cba464e7
commit 127e4c1ac5
9 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
from warehouse_area a
left join warehouse_info b on b.sid=a.warehouseSid
left join warehouse_area_type c on c.sid =a.areaTypeSid
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>

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

@@ -38,13 +38,13 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
int index=query.getIndex();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("a.useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("a.useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.apply("a.useOrgSid like('"+orgSidPath+"%')");
qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {

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

@@ -8,6 +8,7 @@
select
a.*
from warehouse_area_type a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>

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

@@ -38,13 +38,13 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
int index=query.getIndex();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("a.useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("a.useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.apply("a.useOrgSid like('"+orgSidPath+"%')");
qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {

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

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

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

@@ -6,8 +6,9 @@
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
select
*
from warehouse_info
a.*
from warehouse_info a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>

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

@@ -47,15 +47,15 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
int index=query.getIndex();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.apply("useOrgSid like('"+orgSidPath+"')");
qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<WarehouseInfoVo> p = new PagerVo<>();
return rb.success().setData(p);
@@ -65,16 +65,16 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.like("warehouseName", query.getName());
qw.like("a.warehouseName", query.getName());
}
if (StringUtils.isNotBlank(query.getCode())) {
qw.like("warehouseCode", query.getCode());
qw.like("a.warehouseCode", query.getCode());
}
if (StringUtils.isNotBlank(query.getAddress())) {
qw.like("address", query.getAddress());
qw.like("a.address", query.getAddress());
}
qw.ne("isDelete",1);
qw.orderByDesc("sortNo");
qw.ne("a.isDelete",1);
qw.orderByDesc("a.sortNo");
IPage<WarehouseInfo> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -108,6 +108,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
sid = wmsWarehouse.getSid();
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setCreateTime(new DateTime());
wmsWarehouse.setCreateOrgSid(dto.getUserSid());
baseMapper.insert(wmsWarehouse);
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());

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

@@ -10,6 +10,7 @@
from warehouse_rack a
left join warehouse_area b on b.sid =a.locationSid
left join warehouse_info c on c.sid = a.warehouseSid
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>

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

@@ -38,13 +38,13 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
int index=query.getIndex();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("a.useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("a.useOrgSid", orgSidPath);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.apply("a.useOrgSid like('"+orgSidPath+"%')");
qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {