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

7/19

Browse Source
This commit is contained in:
wangpengfei
2024-07-19 09:21:10 +08:00
parent 9fd617fea7
commit 62dafd52de
10 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@
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'
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaVo">

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

@@ -84,6 +84,9 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
public ResultBean<String> saveOrUpdate(WarehouseAreaDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if(StringUtils.isBlank(dto.getVolume())){
dto.setVolume("0");
}
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
@@ -96,8 +99,7 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
wmsWarehouseArea.setCreateOrgSid(dto.getOrgPath());
wmsWarehouseArea.setUseOrgSid(dto.getOrgPath());
wmsWarehouseArea.setCreateOrgSid(dto.getUseOrgSid());
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");
@@ -106,7 +108,6 @@ 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);
}

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

@@ -19,7 +19,7 @@
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'
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo">

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

@@ -86,8 +86,7 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
wmsWarehouseArea.setCreateOrgSid(dto.getOrgPath());
wmsWarehouseArea.setUseOrgSid(dto.getOrgPath());
wmsWarehouseArea.setCreateOrgSid(dto.getUseOrgSid());
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");
@@ -96,7 +95,6 @@ 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/warehouseinfo/WarehouseInfoMapper.xml
View File

@@ -19,7 +19,7 @@
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'
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
</where>
</select>
<update id="updateBySidIsDelete">

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

@@ -91,6 +91,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if(StringUtils.isBlank(dto.getTelephone())){
}
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WarehouseInfo wmsWarehouse = fetchBySid(dto.getSid());
@@ -110,8 +113,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setCreateTime(new DateTime());
wmsWarehouse.setCreateBySid(dto.getUserSid());
wmsWarehouse.setCreateOrgSid(dto.getOrgPath());
wmsWarehouse.setUseOrgSid(dto.getOrgPath());
wmsWarehouse.setCreateOrgSid(dto.getUseOrgSid());
baseMapper.insert(wmsWarehouse);
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
@@ -140,7 +142,6 @@ 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/warehouserack/WarehouseRackMapper.xml
View File

@@ -21,7 +21,7 @@
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'
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">

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

@@ -95,8 +95,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
wmsWarehouseRack.setCreateBySid(dto.getUserSid());
wmsWarehouseRack.setCreateOrgSid(dto.getOrgPath());
wmsWarehouseRack.setUseOrgSid(dto.getOrgPath());
wmsWarehouseRack.setCreateOrgSid(dto.getUseOrgSid());
baseMapper.insert(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
@@ -105,7 +104,6 @@ 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);
}

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

@@ -18,7 +18,7 @@
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'
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
</where>
</select>
<update id="updateBySidIsDelete">

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

@@ -85,8 +85,7 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setCreateTime(new DateTime());
wmsWarehouse.setCreateBySid(dto.getUserSid());
wmsWarehouse.setCreateOrgSid(dto.getOrgPath());
wmsWarehouse.setUseOrgSid(dto.getOrgPath());
wmsWarehouse.setCreateOrgSid(dto.getUseOrgSid());
baseMapper.insert(wmsWarehouse);
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
@@ -115,7 +114,6 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
list1.add(vo1);
}
vo.setWmsWarehouseExtendVos(list1);
vo.setOrgPath(vo.getUseOrgSid());
return rb.success().setData(vo);
}