diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 91b7bbfc1..e7ed5bfb8 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -144,4 +144,6 @@ public class FilterOrderRequest extends ListPageRequest { private List orderIds; + private String corpName; + } 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 1d421037b..ec8ce5614 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 @@ -16,10 +16,12 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.DeptDao; 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.dao.thrsys.ThrSystemBusApiDao; import com.glxp.api.dao.thrsys.ThrSystemDao; 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.entity.system.SyncDataBustypeEntity; @@ -32,6 +34,7 @@ import com.glxp.api.req.inout.OrderEditRequest; import com.glxp.api.req.thrsys.UdiwmsOrderRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.OrderNoResult; +import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; @@ -91,6 +94,8 @@ public class IoOrderServiceImpl implements IoOrderService { private ThrSystemDao thrSystemDao; @Resource private HttpOkClient httpOkClient; + @Resource + BasicCorpDao basicCorpDao; @Override public List selectAll() { @@ -540,9 +545,9 @@ public class IoOrderServiceImpl implements IoOrderService { //查询单据类型名称 String busTypeName = basicBussinessTypeDao.selectNameByAction(order.getAction()); response.setBillTypeName(busTypeName); - //查询往来单位名称 TODO 有bug -// BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); -// response.setFromName(corpEntity.getName()); + //查询往来单位名称 + BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); + response.setFromName(corpEntity.getName()); //查询部门名称 String deptName = deptDao.selectNameByCode(order.getDeptCode()); response.setDeptName(deptName); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index a4d380665..a89c8a70b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -18,6 +18,9 @@ AND id = #{id} + + AND ( SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode ) like concat('%', #{corpName}, '%') + AND action = #{action}