UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓库Dao修改

Browse Source
master
anthonywj 2 years ago
parent 113a178779
commit a643f5388f
7 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -214,6 +214,16 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setCorpOrderId(thrOrderEntity.getBillNo());
orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setFromThrBillNo(thrOrderEntity.getBillNo());
//获取当前部门
if (StrUtil.isNotEmpty(thrOrderEntity.getInvCode())) {
} else {
return ResultVOUtils.error(500, "第三方单据所属仓库不能为空！");
}
thrOrderService.updateThrOrder(thrOrderEntity);
return ResultVOUtils.success();

2
src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java → src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java
Unescape Escape View File

@ -12,7 +12,7 @@ import java.util.Date;
import java.util.List;
@Mapper
public interface InvSubWarehouseDao extends BaseMapperPlus<InvSubWarehouseDao, InvWarehouseEntity, InvWarehouseEntity> {
public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWarehouseEntity, InvWarehouseEntity> {
List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);

44
src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.glxp.api.service.auth.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.InvSubWarehouseDao;
import com.glxp.api.dao.auth.InvWarehouseDao;
import com.glxp.api.dao.thrsys.ThrSystemDao;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity;
@ -25,7 +25,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
@Resource
InvSubWarehouseDao invSubWarehouseDao;
InvWarehouseDao invWarehouseDao;
@Resource
private ThrSystemDao thrSystemDao;
@ -33,7 +33,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
public InvWarehouseEntity findById(String id) {
FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
filterInvSubWarehouseRequest.setId(id);
List<InvWarehouseEntity> data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
List<InvWarehouseEntity> data = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
if (CollUtil.isNotEmpty(data)) {
return data.get(0);
}
@ -49,7 +49,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
List<InvWarehouseEntity> data = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
return data;
}
@ -62,20 +62,20 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invSubWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest);
List<InvWarehouseEntity> data = invWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest);
return data;
}
@Override
public InvWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest);
return invWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest);
}
@Override
public List<InvWarehouseEntity> findByParentId(String code) {
FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
filterInvSubWarehouseRequest.setParentId(code);
List<InvWarehouseEntity> invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
return invSubWarehouseEntities;
}
@ -85,7 +85,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
return null;
FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
filterInvSubWarehouseRequest.setCode(code);
List<InvWarehouseEntity> invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
return invSubWarehouseEntities.get(0);
}
@ -94,27 +94,27 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
@Override
public boolean insertInvSubWarehouse(InvWarehouseEntity invWarehouseEntity) {
return invSubWarehouseDao.insertInvSubWarehouse(invWarehouseEntity);
return invWarehouseDao.insertInvSubWarehouse(invWarehouseEntity);
}
@Override
public boolean updateInvSubWarehouse(InvWarehouseEntity invWarehouseEntity) {
return invSubWarehouseDao.updateInvSubWarehouse(invWarehouseEntity);
return invWarehouseDao.updateInvSubWarehouse(invWarehouseEntity);
}
@Override
public boolean deleteById(String id) {
return invSubWarehouseDao.deleteById(id);
return invWarehouseDao.deleteById(id);
}
@Override
public boolean deleteByParentCode(String code) {
return invSubWarehouseDao.deleteByParentCode(code);
return invWarehouseDao.deleteByParentCode(code);
}
@Override
public boolean checkDuplicateName(String parentId, String name) {
int count = invSubWarehouseDao.countByParentIdAndName(parentId, name);
int count = invWarehouseDao.countByParentIdAndName(parentId, name);
if (count > 0) {
return true;
}
@ -126,7 +126,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
if (StrUtil.isBlank(subInvCode)) {
return "";
}
return invSubWarehouseDao.selectNameByCode(subInvCode);
return invWarehouseDao.selectNameByCode(subInvCode);
}
@Override
@ -138,7 +138,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
return null;
FilterInvSubWarehouseRequest tempReqeust = new FilterInvSubWarehouseRequest();
tempReqeust.setCode(id);
InvWarehouseEntity invWarehouseEntity = invSubWarehouseDao.selectJoinThirdSys(tempReqeust);
InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectJoinThirdSys(tempReqeust);
List<InvWarehouseThirdSysResponse> invWarehouseThirdSysResponses = new ArrayList<>();
for (ThrSystemEntity sys : data) {
InvWarehouseThirdSysResponse invWarehouseThirdSysResponse = new InvWarehouseThirdSysResponse();
@ -170,13 +170,13 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
@Override
public boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId) {
return invSubWarehouseDao.updateThridId(id, thridWarehouseId, sysId);
return invWarehouseDao.updateThridId(id, thridWarehouseId, sysId);
}
@Override
public boolean unbindThrWarehouse(String id, String sysId) {
return invSubWarehouseDao.updateThridId(id, null, sysId);
return invWarehouseDao.updateThridId(id, null, sysId);
}
@ -189,27 +189,27 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
}
List<InvSubWarehouseResponse> data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
List<InvSubWarehouseResponse> data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
return data;
}
@Override
public InvWarehouseEntity filterGroupInvSubAndcode(String code) {
return invSubWarehouseDao.filterGroupInvSubAndcode(code);
return invWarehouseDao.filterGroupInvSubAndcode(code);
}
@Override
public List<InvWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) {
return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest);
return invWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest);
}
@Override
public List<InvSubWarehouseResponse> filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) {
return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest);
return invWarehouseDao.filterSubInvList(filterInvWarehouseRequest);
}
@Override
public List<InvWarehouseEntity> findInvListByUser(Long userId) {
return invSubWarehouseDao.selectInvListByUser(userId);
return invWarehouseDao.selectInvListByUser(userId);
}
}

8
src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java
Unescape Escape View File

@ -2,7 +2,7 @@ package com.glxp.api.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.InvSubWarehouseDao;
import com.glxp.api.dao.auth.InvWarehouseDao;
import com.glxp.api.dao.basic.EntrustReceDao;
import com.glxp.api.entity.basic.DlEntrustReceEntity;
import com.glxp.api.entity.basic.EntrustReceEntity;
@ -21,7 +21,7 @@ public class EntrustReceServiceImpl implements EntrustReceService {
@Resource
EntrustReceDao entrustReceDao;
@Resource
private InvSubWarehouseDao invSubWarehouseDao;
private InvWarehouseDao invWarehouseDao;
@Override
public EntrustReceEntity findById(Integer id) {
@ -78,10 +78,10 @@ public class EntrustReceServiceImpl implements EntrustReceService {
if (CollUtil.isNotEmpty(entrustReceResponses)) {
//查询当前分库名称和委托验收分库名称
entrustReceResponses.forEach(entrustReceResponse -> {
String invWarehouseName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getInvWarehouseCode());//查询当前分库名称
String invWarehouseName = invWarehouseDao.selectNameByCode(entrustReceResponse.getInvWarehouseCode());//查询当前分库名称
entrustReceResponse.setInvWarehouseName(invWarehouseName);
String entrustSubInvName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getEntrustSubInv());
String entrustSubInvName = invWarehouseDao.selectNameByCode(entrustReceResponse.getEntrustSubInv());
entrustReceResponse.setEntrustSubInvName(entrustSubInvName);
});
}

11
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -11,18 +11,15 @@ import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.dao.auth.DeptDao;
import com.glxp.api.dao.auth.InvSubWarehouseDao;
import com.glxp.api.dao.auth.InvWarehouseDao;
import com.glxp.api.dao.basic.BasicBussinessTypeDao;
import com.glxp.api.dao.basic.BasicCorpDao;
import com.glxp.api.dao.inout.IoOrderDao;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inv.*;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.inout.OrderEditRequest;
import com.glxp.api.req.inv.FilterInvProductDetailRequest;
import com.glxp.api.req.inv.FilterInvProductRequest;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.res.inout.OrderNoResult;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
@ -33,12 +30,10 @@ import com.glxp.api.util.udi.UdiCalCountUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@Service
@ -53,7 +48,7 @@ public class IoOrderServiceImpl implements IoOrderService {
@Resource
private DeptDao deptDao;
@Resource
private InvSubWarehouseDao invSubWarehouseDao;
private InvWarehouseDao invWarehouseDao;
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@Resource
@ -525,7 +520,7 @@ public class IoOrderServiceImpl implements IoOrderService {
String deptName = deptDao.selectNameByCode(order.getDeptCode());
response.setDeptName(deptName);
//查询仓库名称
String invName = invSubWarehouseDao.selectNameByCode(order.getInvCode());
String invName = invWarehouseDao.selectNameByCode(order.getInvCode());
response.setInvName(invName);
responseList.add(response);
}

8
src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.auth.InvSpaceDao;
import com.glxp.api.dao.auth.InvSubWarehouseDao;
import com.glxp.api.dao.auth.InvWarehouseDao;
import com.glxp.api.dao.inv.InvProductDetailDao;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.req.inv.FilterInvPlaceRequest;
@ -32,7 +32,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
@Resource
private InvProductDetailDao invProductDetailDao;
@Resource
private InvSubWarehouseDao invSubWarehouseDao;
private InvWarehouseDao invWarehouseDao;
@Resource
private InvSpaceDao invSpaceDao;
@ -50,7 +50,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
@Override
public void bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
//查询仓库的部门ID
String deptCode = invSubWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
List<InvProductDetailEntity> list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
.select("id")
.eq("deptCode", deptCode)
@ -69,7 +69,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
@Override
public BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest) {
//查询仓库的部门ID
String deptCode = invSubWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
bindInvSpaceRequest.setDeptCode(deptCode);
//查询此库存详情的信息
InvProductDetailEntity invProductDetailEntity = invProductDetailDao.selectByInvAndCode(bindInvSpaceRequest);

4
src/main/resources/mybatis/mapper/auth/PurPlanService.xml → src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?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.glxp.api.dao.auth.InvSubWarehouseDao">
<mapper namespace="com.glxp.api.dao.auth.InvWarehouseDao">
<select id="filterInvSubWarehouse" parameterType="com.glxp.api.req.auth.FilterInvSubWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select *
@ -345,4 +345,4 @@
<select id="selectParentIdByCode" resultType="java.lang.String">
select parentId from auth_warehouse where code = #{invCode}
</select>
</mapper>
</mapper>
Write Preview
Loading…
Cancel
Save