|
|
|
@ -19,6 +19,7 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.wms.feign.portal.sysuser.SysUserFeign; |
|
|
|
import com.yxt.wms.utils.OrgPathQuery; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
@ -44,6 +45,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
|
|
|
|
public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(PagerQuery<WmsWarehouseInfoQuery> pq) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WmsWarehouseInfoQuery query = pq.getParams(); |
|
|
|
@ -84,26 +86,40 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
PagerVo<WmsWarehouseInfoVo> p = new PagerVo<>(); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getName())){ |
|
|
|
qw.like("w.warehouseName",query.getName()); |
|
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
|
qw.like("w.warehouseName", query.getName()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getCode())){ |
|
|
|
qw.like("w.warehouseCode",query.getCode()); |
|
|
|
if (StringUtils.isNotBlank(query.getCode())) { |
|
|
|
qw.like("w.warehouseCode", query.getCode()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getAddress())){ |
|
|
|
qw.like("w.address",query.getAddress()); |
|
|
|
if (StringUtils.isNotBlank(query.getAddress())) { |
|
|
|
qw.like("w.address", query.getAddress()); |
|
|
|
} |
|
|
|
qw.ne("w.isDelete",1); |
|
|
|
qw.ne("w.isDelete", 1); |
|
|
|
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() { |
|
|
|
|
|
|
|
public ResultBean<List<WmsWarehouseInfo>> listAll(OrgPathQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
List<WmsWarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseInfo>().eq("isEnable",1)); |
|
|
|
return rb.success().setData(pagging); |
|
|
|
String useOrgSid = ""; |
|
|
|
String orgPath = query.getOrgPath(); |
|
|
|
if (StringUtils.isNotBlank(orgPath)) { |
|
|
|
List<String> split = Arrays.asList(orgPath.split("/")); |
|
|
|
if (split.size() > 1) { |
|
|
|
//获取本级sid获取本级部门信息
|
|
|
|
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); |
|
|
|
useOrgSid = sysOrganization1.getSid(); |
|
|
|
} else { |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); |
|
|
|
useOrgSid = sysOrganization.getSid(); |
|
|
|
} |
|
|
|
} |
|
|
|
List<WmsWarehouseInfo> list = baseMapper.listAll(useOrgSid); |
|
|
|
return rb.success().setData(list); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> saveOrUpdate(WmsWarehouseInfoDto dto) { |
|
|
|
@ -115,7 +131,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid()); |
|
|
|
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid"); |
|
|
|
wmsWarehouse.setModifyTime(new Date()); |
|
|
|
WmsWarehouseInfo warehouseInfo = baseMapper.checkCodeForUpdate(dto.getWarehouseCode(),wmsWarehouse.getUseOrgSid(),sid); |
|
|
|
WmsWarehouseInfo warehouseInfo = baseMapper.checkCodeForUpdate(dto.getWarehouseCode(), wmsWarehouse.getUseOrgSid(), sid); |
|
|
|
if (warehouseInfo != null) { |
|
|
|
return rb.setMsg("仓库编码重复"); |
|
|
|
} |
|
|
|
@ -159,7 +175,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
wmsWarehouse.setCreateOrgSid(createOrgSid); |
|
|
|
} |
|
|
|
} |
|
|
|
WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(),deptSid); |
|
|
|
WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(), deptSid); |
|
|
|
if (warehouseInfo != null) { |
|
|
|
return rb.setMsg("仓库编码重复"); |
|
|
|
} |
|
|
|
@ -183,10 +199,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
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<>(); |
|
|
|
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(); |
|
|
|
WmsWarehouseExtendVo vo1 = new WmsWarehouseExtendVo(); |
|
|
|
BeanUtil.copyProperties(wmsWarehouseExtend, vo1); |
|
|
|
list1.add(vo1); |
|
|
|
} |
|
|
|
@ -195,7 +211,6 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public ResultBean delete(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); |
|
|
|
@ -208,15 +223,12 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo |
|
|
|
public void delAll(String[] sids) { |
|
|
|
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); |
|
|
|
} |
|
|
|
public ResultBean updateIsEnable(String sid,String isEnable) { |
|
|
|
|
|
|
|
public ResultBean updateIsEnable(String sid, String isEnable) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid); |
|
|
|
if (null != wmsWarehouse) { |
|
|
|
if (isEnable.equals("1")) { |
|
|
|
wmsWarehouse.setUsageStatus(isEnable); |
|
|
|
} else if (isEnable.equals("2")) { |
|
|
|
wmsWarehouse.setUsageStatus("0"); |
|
|
|
} |
|
|
|
wmsWarehouse.setUsageStatus(isEnable); |
|
|
|
baseMapper.updateById(wmsWarehouse); |
|
|
|
} |
|
|
|
return rb.success().setMsg("成功"); |
|
|
|
|
