diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java index 3eeec2dd7..45b19a508 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; @@ -38,9 +37,11 @@ public class IoOrderDetailCodeController { @GetMapping("udiwms/inout/order/draft/detailCode") public BaseResponse getDraftsDetailCode(String orderId) { List orderEntityList = ioOrderDetailCodeService.checkOrderList(orderId); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + + List list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(100l); - pageSimpleResponse.setList(orderEntityList); + pageSimpleResponse.setList(list); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 34a7df53c..62c8adfbb 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -53,4 +53,12 @@ public interface BasicCorpDao { * @return */ BasicCorpEntity selectByErpId(@Param("erpId") String erpId); + + /** + * 根据erpId查询往来单位名称 + * + * @param supId + * @return + */ + String selectNameByErpId(@Param("supId") String supId); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java index 2641a53aa..a1652c694 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java @@ -23,4 +23,9 @@ public class FilterOrderDetailBizRequest extends ListPageRequest { * 单据号 */ private String orderIdFk; + + /** + * 产品名称 + */ + private String productName; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java index 735be055b..979802219 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java @@ -34,4 +34,9 @@ public class FilterOrderDetailCodeRequest extends ListPageRequest { */ private String uuidFk; + /** + * 产品名称 + */ + private String productName; + } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 4dd835fec..eb429e159 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -1,7 +1,5 @@ package com.glxp.api.service.inout; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; @@ -39,4 +37,12 @@ public interface IoOrderDetailCodeService { public List checkOrderList(String orderId); boolean isExit(String orderId); + + /** + * 扫码明细实体类数据转换VO类 + * + * @param orderEntityList + * @return + */ + List getDetailCodeResponse(List orderEntityList); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 620434a03..a9ddef8e3 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -1,11 +1,10 @@ package com.glxp.api.service.inout.impl; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -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.basic.BasicCorpDao; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; @@ -17,6 +16,7 @@ import com.glxp.api.service.inout.IoOrderDetailCodeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -29,6 +29,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { IoOrderDetailBizService orderDetailBizService; @Resource IoCheckInoutService checkInoutService; + @Resource + private BasicCorpDao basicCorpDao; @Override public List findByOrderId(String orderId) { @@ -86,4 +88,20 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { public boolean isExit(String orderId) { return ioOrderDetailCodeDao.exists(new QueryWrapper().eq("orderIdFk", orderId)); } + + @Override + public List getDetailCodeResponse(List orderEntityList) { + if (CollUtil.isEmpty(orderEntityList)) { + return Collections.emptyList(); + } + List list = new ArrayList<>(orderEntityList.size()); + for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : orderEntityList) { + IoOrderDetailCodeResponse resp = new IoOrderDetailCodeResponse(); + BeanUtil.copyProperties(ioOrderDetailCodeEntity, resp); + String supName = basicCorpDao.selectNameByErpId(ioOrderDetailCodeEntity.getSupId()); + resp.setSupName(supName); + list.add(resp); + } + return list; + } } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index d7812c10e..4d0f03619 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -308,4 +308,8 @@ + + diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml index d96ac23f2..449119b43 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml @@ -64,44 +64,45 @@ left join basic_corp bc on bc.erpId = ic.supId - AND code = #{code} + AND ic.code = #{code} - AND orderId like concat('%', #{orderId}, '%') + AND ic.orderId like concat('%', #{orderId}, '%') - AND nameCode like concat('%', #{nameCode}, '%') + AND ic.nameCode like concat('%', #{nameCode}, '%') - AND supId like concat('%', #{supId}, '%') + AND ic.supId like concat('%', #{supId}, '%') - AND relId like concat('%', #{relId}, '%') + AND ic.relId like concat('%', #{relId}, '%') - AND deptCode = #{deptCode} + AND ic.deptCode = #{deptCode} - AND invCode = #{invCode} + AND ic.invCode = #{invCode} - AND warehouseCode = #{warehouseCode} + AND ic.warehouseCode = #{warehouseCode} - AND packageLevel = #{packageLevel} + AND ic.packageLevel = #{packageLevel} - AND batchNo = #{batchNo} + AND ic.batchNo = #{batchNo} - AND corpOrderId = #{corpOrderId} + AND ic.corpOrderId = #{corpOrderId} - AND action in + AND ic.action in #{item} + group by ic.id \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 1e1213171..f2b41d843 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -1,19 +1,25 @@ - - + select io_order_detail_biz.* + from io_order_detail_biz + left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk + left join basic_products bp on bu.uuid = bp.uuid + + + AND orderIdFk = #{orderIdFk} + + + AND bindRlFk = #{relId} + + + AND batchNo = #{batchNo} + + + AND bp.cpmctymc like concat('%', #{productName}, '%') + + + group by io_order_detail_biz.id \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml index ebb2c44a4..fac825af7 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml @@ -1,9 +1,11 @@ - - + select io_order_detail_code.* + from io_order_detail_code + left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk + left join basic_products bp on bp.uuid = bu.uuid AND orderIdFk = #{orderIdFk} @@ -20,6 +22,11 @@ AND uuidFk = #{uuidFk} + + AND bp.cpmctymc like concat('%', #{productName}, '%') + + group by io_order_detail_code.id + \ No newline at end of file