feat: 箱码幅面详情拆分列表修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrBoxCodeFormatSplitMapper.java

@@ -2,6 +2,7 @@ package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.QrBoxCodeFormatSplit;
 import com.abi.qms.platform.dao.vo.result.QrRepertoryColumnVO;
+import com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,4 +39,12 @@ public interface QrBoxCodeFormatSplitMapper extends BaseMapper<QrBoxCodeFormatSp
      * @param qrRepertoryId
      */
     List<QrBoxCodeFormatSplit> querySplit(@Param("id")Long id,@Param("qrRepertoryId") Long qrRepertoryId);
+
+    /**
+     * 根据箱码幅面ID查询拆分数量详情
+     *
+     * @param boxCodeFormatId
+     * @return
+     */
+    List<QrRepertorySelectDetailVO> listSplitDetail(@Param("boxCodeFormatId") Long boxCodeFormatId);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/QrBoxCodeFormatDetailRes.java

@@ -1,5 +1,6 @@
 package com.abi.qms.platform.dto.res;
 
+import com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @author: fangxinjian
@@ -60,4 +62,7 @@ public class QrBoxCodeFormatDetailRes implements Serializable {
     @ApiModelProperty(value = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "拆分详情列表")
+    private List<QrRepertorySelectDetailVO> splitDetailList;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxCodeFormatImpl.java

@@ -7,6 +7,7 @@ import com.abi.qms.platform.dao.enums.StateEnum;
 import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatMapper;
 import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatSplitMapper;
 import com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO;
+import com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO;
 import com.abi.qms.platform.dto.req.DeleteBoxCodeFormatreq;
 import com.abi.qms.platform.dto.req.DisableBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.EnableBoxCodeFormatReq;
@@ -28,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -139,9 +139,12 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
         //查询箱码幅面详情
         QrBoxCodeFormatVO qrBoxCodeFormatVO = qrBoxCodeFormatMapper.selectBoxCodeFormatDetailById(req.getId());
         AssertUtil.isNull(qrBoxCodeFormatVO, "箱码幅面详情不存在");
+        //查询箱码幅面下的拆分详情列表
+        List<QrRepertorySelectDetailVO> voList = qrBoxCodeFormatSplitMapper.listSplitDetail(req.getId());
 
         //转化出参
         QrBoxCodeFormatDetailRes res = PojoConverterUtils.copy(qrBoxCodeFormatVO, QrBoxCodeFormatDetailRes.class);
+        res.setSplitDetailList(voList);
 
         return res;
     }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxCodeFormatSplitMapper.xml

@@ -40,4 +40,21 @@
         </where>
     </select>
 
+    <select id="listSplitDetail" resultType="com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO">
+        select qr.id as repertoryId,
+        qrc.id as repertoryColumnId,
+        qrc.sort_number,
+        qrc.alias,
+        qbs.split_num
+        from qr_box_code_format_split qbs
+        inner join qr_repertory qr on qr.id=qbs.qr_repertory_id
+        inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
+        <where>
+            <if test="boxCodeFormatId != null and boxCodeFormatId != ''">
+                qbs.box_code_format_id = #{boxCodeFormatId}
+            </if>
+            and qbs.is_delete=0
+        </where>
+    </select>
+
 </mapper>