From a643f5388fc03c6928b7dc31d838efcbc11639e1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 27 Feb 2023 17:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93Dao=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 10 +++++ ...WarehouseDao.java => InvWarehouseDao.java} | 2 +- .../auth/impl/InvWarehouseServiceImpl.java | 44 +++++++++---------- .../basic/impl/EntrustReceServiceImpl.java | 8 ++-- .../inout/impl/IoOrderServiceImpl.java | 11 ++--- .../service/inv/impl/InvPlaceServiceImpl.java | 8 ++-- ...PurPlanService.xml => InvWarehouseDao.xml} | 4 +- 7 files changed, 46 insertions(+), 41 deletions(-) rename src/main/java/com/glxp/api/dao/auth/{InvSubWarehouseDao.java => InvWarehouseDao.java} (96%) rename src/main/resources/mybatis/mapper/auth/{PurPlanService.xml => InvWarehouseDao.xml} (99%) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 7d17de555..3a0b3dfa2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -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(); diff --git a/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java similarity index 96% rename from src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java rename to src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java index dc9708554..5ae15324d 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface InvSubWarehouseDao extends BaseMapperPlus { +public interface InvWarehouseDao extends BaseMapperPlus { List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 875458cdb..6cc18054e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -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 data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List 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 data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List 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 data = invSubWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest); + List data = invWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest); return data; } @Override public InvWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { - return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest); + return invWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest); } @Override public List findByParentId(String code) { FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvSubWarehouseRequest.setParentId(code); - List invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List 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 invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List 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 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 data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); + List data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); return data; } @Override public InvWarehouseEntity filterGroupInvSubAndcode(String code) { - return invSubWarehouseDao.filterGroupInvSubAndcode(code); + return invWarehouseDao.filterGroupInvSubAndcode(code); } @Override public List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) { - return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); + return invWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); } @Override public List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { - return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest); + return invWarehouseDao.filterSubInvList(filterInvWarehouseRequest); } @Override public List findInvListByUser(Long userId) { - return invSubWarehouseDao.selectInvListByUser(userId); + return invWarehouseDao.selectInvListByUser(userId); } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index cd0ea3278..ca84ddc17 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -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); }); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 84b8cbb04..42aa49f3c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -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); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 377158750..5c39687cf 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -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 list = invProductDetailDao.selectList(new QueryWrapper() .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); diff --git a/src/main/resources/mybatis/mapper/auth/PurPlanService.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/auth/PurPlanService.xml rename to src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index a1df15fee..02e6ff26c 100644 --- a/src/main/resources/mybatis/mapper/auth/PurPlanService.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -1,7 +1,7 @@ - + select parentId from auth_warehouse where code = #{invCode} - \ No newline at end of file +