1.修复单据相关的问题

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<IoOrderDetailCodeEntity> orderEntityList = ioOrderDetailCodeService.checkOrderList(orderId);
-        PageSimpleResponse<IoOrderDetailCodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+
+        List<IoOrderDetailCodeResponse> list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList);
+        PageSimpleResponse<IoOrderDetailCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(100l);
-        pageSimpleResponse.setList(orderEntityList);
+        pageSimpleResponse.setList(list);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 

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);
 }

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;
 }

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;
+
 }

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<IoOrderDetailCodeEntity> checkOrderList(String orderId);
 
     boolean isExit(String orderId);
+
+    /**
+     * 扫码明细实体类数据转换VO类
+     *
+     * @param orderEntityList
+     * @return
+     */
+    List<IoOrderDetailCodeResponse> getDetailCodeResponse(List<IoOrderDetailCodeEntity> orderEntityList);
 }

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<IoOrderDetailCodeEntity> findByOrderId(String orderId) {
@@ -86,4 +88,20 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     public boolean isExit(String orderId) {
         return ioOrderDetailCodeDao.exists(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
     }
+
+    @Override
+    public List<IoOrderDetailCodeResponse> getDetailCodeResponse(List<IoOrderDetailCodeEntity> orderEntityList) {
+        if (CollUtil.isEmpty(orderEntityList)) {
+            return Collections.emptyList();
+        }
+        List<IoOrderDetailCodeResponse> 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;
+    }
 }

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -308,4 +308,8 @@
     <select id="selectByErpId" resultType="com.glxp.api.entity.basic.BasicCorpEntity">
         select * from basic_corp where erpId = #{erpId}
     </select>
+
+    <select id="selectNameByErpId" resultType="java.lang.String">
+        select name from basic_corp where erpId = #{supId}
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoCodeDao.xml

@@ -64,44 +64,45 @@
                  left join basic_corp bc on bc.erpId = ic.supId
         <where>
             <if test="code != null and code != ''">
-                AND code = #{code}
+                AND ic.code = #{code}
             </if>
             <if test="orderId != null and orderId != ''">
-                AND orderId like concat('%', #{orderId}, '%')
+                AND ic.orderId like concat('%', #{orderId}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND nameCode like concat('%', #{nameCode}, '%')
+                AND ic.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="supId != null and supId != ''">
-                AND supId like concat('%', #{supId}, '%')
+                AND ic.supId like concat('%', #{supId}, '%')
             </if>
             <if test="relId != null and relId != ''">
-                AND relId like concat('%', #{relId}, '%')
+                AND ic.relId like concat('%', #{relId}, '%')
             </if>
             <if test="deptCode != null and deptCode != ''">
-                AND deptCode = #{deptCode}
+                AND ic.deptCode = #{deptCode}
             </if>
             <if test="invCode != null and invCode != ''">
-                AND invCode = #{invCode}
+                AND ic.invCode = #{invCode}
             </if>
             <if test="warehouseCode != null and warehouseCode != ''">
-                AND warehouseCode = #{warehouseCode}
+                AND ic.warehouseCode = #{warehouseCode}
             </if>
             <if test="packageLevel != null and packageLevel != ''">
-                AND packageLevel = #{packageLevel}
+                AND ic.packageLevel = #{packageLevel}
             </if>
             <if test="batchNo != null and batchNo != ''">
-                AND batchNo = #{batchNo}
+                AND ic.batchNo = #{batchNo}
             </if>
             <if test="corpOrderId != null and corpOrderId != ''">
-                AND corpOrderId = #{corpOrderId}
+                AND ic.corpOrderId = #{corpOrderId}
             </if>
             <if test="actions != null and actions.size() != 0">
-                AND action in
+                AND ic.action in
                 <foreach collection="actions" item="item" open="(" close=")" index="index" separator=",">
                     #{item}
                 </foreach>
             </if>
         </where>
+        group by ic.id
     </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -1,19 +1,25 @@
 <?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.inout.IoOrderDetailBizDao">
-
-<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
-    select * from io_order_detail_biz
-    <where>
-        <if test="orderIdFk != null and orderIdFk != ''">
-            AND orderIdFk = #{orderIdFk}
-        </if>
-        <if test="relId != null">
-            AND bindRlFk = #{relId}
-        </if>
-        <if test="batchNo != null and batchNo != ''">
-            AND batchNo = #{batchNo}
-        </if>
-    </where>
+    <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
+        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
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relId != null">
+                AND bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="productName != null and productName != ''">
+                AND bp.cpmctymc like concat('%', #{productName}, '%')
+            </if>
+        </where>
+        group by io_order_detail_biz.id
     </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml

@@ -1,9 +1,11 @@
 <?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.inout.IoOrderDetailCodeDao">
-
-<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
-        select * from io_order_detail_code
+    <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
+        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
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -20,6 +22,11 @@
             <if test="uuidFk != null and uuidFk != ''">
                 AND uuidFk = #{uuidFk}
             </if>
+            <if test="productName != null and productName != ''">
+                AND bp.cpmctymc like concat('%', #{productName}, '%')
+            </if>
         </where>
+        group by io_order_detail_code.id
     </select>
+
 </mapper>