feat: 汇总单号

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -213,12 +213,24 @@ public class IoCollectOrderController extends BaseController {
         if (collectOrder == null) {
             return ResultVOUtils.error(500, "未找到单据");
         }
-        List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
+        //如果是 处理单据页面来的  有汇总单号 要走汇总单号
-        PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
+        if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())){
-        PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo());
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+            List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
-        pageSimpleResponse.setList(list);
+            PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
-        return ResultVOUtils.success(pageSimpleResponse);
+            PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+            pageSimpleResponse.setList(list);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }else {
+            List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
+            PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
+            PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+            pageSimpleResponse.setList(list);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }
+
     }
 
     @Resource

src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java

@@ -288,6 +288,9 @@ public class IoCollectOrder implements Serializable {
     @ApiModelProperty(value = "关联预验收入库单号")
     private String preInBillNo;
 
+    @TableField(value = "summaryNo")
+    @ApiModelProperty(value = "汇总单号")
+    private String summaryNo;
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java

@@ -283,4 +283,8 @@ public class IoCollectOrderBackup implements Serializable {
     @ApiModelProperty(value = "上传医保时间")
     private Date uploadYbTime;
     private static final long serialVersionUID = 1L;
+
+    @TableField(value = "summaryNo")
+    @ApiModelProperty(value = "汇总单号")
+    private String summaryNo;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java

@@ -337,4 +337,8 @@ public class IoCollectOrderOrigin implements Serializable {
     @TableField(value = "preInBillNo")
     @ApiModelProperty(value = "关联预验收入库单号")
     private String preInBillNo;
+
+    @TableField(value = "summaryNo")
+    @ApiModelProperty(value = "汇总单号")
+    private String summaryNo;
 }

src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java

@@ -1,6 +1,8 @@
 package com.glxp.api.req.collect;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -129,4 +131,10 @@ public class CollectOrderBizRequest extends ListPageRequest {
      *  如果不为null 就是单据审核页面不需要槽位
      */
     private Integer isOrderCheck;
+
+    private Boolean summaryNoFlag;
+
+    @TableField(value = "summaryNo")
+    @ApiModelProperty(value = "汇总单号")
+    private String summaryNo;
 }

src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java

@@ -200,6 +200,11 @@ public class IoCollectOrderResponse {
      */
     private Integer codingStatus;
 
+
+    @TableField(value = "summaryNo")
+    @ApiModelProperty(value = "汇总单号")
+    private String summaryNo;
+
     @TableField(value = "uploadYbTime")
     @ApiModelProperty(value = "上传医保时间")
     private Date uploadYbTime;

src/main/java/com/glxp/api/service/collect/DownloadFactory.java

@@ -204,6 +204,7 @@ public class DownloadFactory {
                     ioCollectOrder.setSplitStatus(0);
                     ioCollectOrder.setTagStatus(0);
                     ioCollectOrder.setBackupOrderRemark1(thrOrder.getBackupOrderRemark1());
+                    ioCollectOrder.setSummaryNo(thrOrder.getSummaryNo());
 
                     List<IoCollectOrderBiz> bizList = new ArrayList<>();
                     for (IoCollectOrderBiz entity : thrOrder.getBizList()) {

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml

@@ -17,6 +17,7 @@
                sys_workplace_queue.name queueName
 
         FROM io_collect_order_biz icob
+                left join io_collect_order ico on ico.billNo = icob.orderIdFk
                  left join basic_udirel bu on icob.relId = bu.id
                  left join basic_products bp on bu.uuid = bp.uuid
                  left join sys_workplace_queue on sys_workplace_queue.relId = bu.id
@@ -24,27 +25,40 @@
                  left join sys_workplace_freight swf on swf.code = sys_workplace_queue.freightCode
                  left join sys_workplace_region swr on swr.regionCode = swf.freightRow
         <where>
-            <if test="thrCode != '' and thrCode != null">
+            <!-- 当汇总单号存在时，仅用汇总单号查询 -->
-                AND icob.thrCode LIKE concat('%', #{thrCode}, '%')
+            <choose>
-            </if>
+                <when test="summaryNo != null and summaryNo != ''">
-            <if test="orderIdFk != null and orderIdFk != ''">
+                    AND ico.summaryNo = #{summaryNo}
-                AND icob.orderIdFk = #{orderIdFk}
+                </when>
-            </if>
+                <otherwise>
-            <if test="relId != null">
+                    <!-- 无汇总单号时，组合查询条件 -->
-                AND icob.relId = #{relId}
+                    <trim prefixOverrides="AND">
-            </if>
+                        <if test="thrCode != null and thrCode != ''">
-            <if test="cpmctymc != null and cpmctymc != ''">
+                            AND icob.thrCode LIKE CONCAT('%', #{thrCode}, '%')
-                AND icob.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+                        </if>
-            </if>
+                        <if test="orderIdFk != null and orderIdFk != ''">
-            <if test="unionCode != '' and unionCode != null">
+                            AND icob.orderIdFk = #{orderIdFk}
-                and (
+                        </if>
-                        bp.nameCode LIKE concat( #{unionCode}, '%')
+                        <if test="relId != null">
-                        or bp.ybbm LIKE concat( #{unionCode}, '%')
+                            AND icob.relId = #{relId}
-                        or bp.sptm LIKE concat(#{unionCode}, '%'))
+                        </if>
-            </if>
+                        <if test="cpmctymc != null and cpmctymc != ''">
-            <if test="ggxh != '' and ggxh != null">
+                            AND icob.cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%')
-                AND ggxh LIKE concat( #{ggxh}, '%')
+                        </if>
-            </if>
+                        <!-- 联合编码查询 -->
+                        <if test="unionCode != null and unionCode != ''">
+                            AND (
+                            bp.nameCode LIKE CONCAT(#{unionCode}, '%')
+                            OR bp.ybbm LIKE CONCAT(#{unionCode}, '%')
+                            OR bp.sptm LIKE CONCAT(#{unionCode}, '%')
+                            )
+                        </if>
+                        <if test="ggxh != null and ggxh != ''">
+                            AND ggxh LIKE CONCAT(#{ggxh}, '%')
+                        </if>
+                    </trim>
+                </otherwise>
+            </choose>
         </where>
         group by icob.id
         ORDER BY icob.getConfirm, icob.id desc

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -32,6 +32,7 @@
                ico.uploadError,
                sol.ledNum,
                ico.errorMsg,
+               ico.summaryNo,
                row_number() over ( order by case
                                                 when ico.orderTime is null then ico.createTime
                                                 else ico.orderTime end desc ) as orderSequence