From e077eb262c343ffca6b3f131b8286c4a4d5cf603 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 14 Sep 2024 20:03:37 +0800
Subject: [PATCH] =?UTF-8?q?9/14=20=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=98=AF=E5=9C=A8=E5=A4=84=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     |  14 +-
 .../collect/IoCollectOrderService.java        |  19 ++
 .../collect/IoCollectOrderOriginMapper.xml    | 295 +++---------------
 3 files changed, 69 insertions(+), 259 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 8a9e149f6..106122083 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -430,7 +430,7 @@ public class IoCollectOrderController extends BaseController {
     /**
      * 单据上传
      *
-     * @param collectOrderRequest
+     * @param
      * @return
      */
 //    @PostMapping("/udiwms/basic/collect/order/upload")
@@ -441,4 +441,16 @@ public class IoCollectOrderController extends BaseController {
 //        return ResultVOUtils.success();
 //    }
 
+
+    @PostMapping("/udiwms/basic/collect/decideOrder")
+    public  BaseResponse decideOrder(@RequestBody CollectOrderRequest request){
+        Boolean isExis = collectOrderService.decideOrder(request);
+        if (!isExis){
+            return ResultVOUtils.error("当前工位正在处理单据，无法打开当前单据");
+        }
+        return ResultVOUtils.success();
+    }
+
+
+
 }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index ee08985ce..1a22aabbe 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -805,4 +805,23 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     }
 
 
+    public Boolean decideOrder(CollectOrderRequest request) {
+        List<IoCollectOrder> ioCollectOrders = collectOrderMapper.selectList(new LambdaQueryWrapper<IoCollectOrder>()
+                .eq(IoCollectOrder::getWorkPlaceCode, request.getWorkPlaceCode())
+                .eq(IoCollectOrder::getTagStatus, request.getTagStatus()));
+
+        if (ioCollectOrders.size() >0){
+            return false;
+        }
+        //如果有判断是否是当前单据
+        if (ioCollectOrders.size() == 1){
+            IoCollectOrder ioCollectOrder = ioCollectOrders.get(0);
+            if (ioCollectOrder.getBillNo().equals(request.getBillNo())){
+                return true;
+            }
+            return false;
+        }
+        return true;
+
+    }
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
index 11225843c..09d7a112e 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
@@ -1,7 +1,8 @@
 <?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.collect.IoCollectOrderOriginMapper">
-    <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
+
+ <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
             resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
         SELECT ico.billNo,
                ico.busType,
@@ -22,8 +23,8 @@
                ico.splitMsg,
                ico.fromCorpName,
                ico.tagMsg,
-               sys_workplace_document.busName                               busTypeName,
-               thr_bustype_origin.name                                      actionName,
+               sys_workplace_document.busName                       busTypeName,
+               thr_bustype_origin.name                      actionName,
                sw.workplaceName,
                ico.id,
                ico.orderTime,
@@ -93,297 +94,75 @@
                     )
             </if>
             <if test="fromType != '' and fromType != null">
-                AND fromType
-                    LIKE
-                    concat
-                        (
-                            '%'
-                        ,
-                            #{fromType}
-                        ,
-                            '%'
-                        )
+                AND fromType LIKE concat('%', #{fromType}, '%')
+            </if>
+            <if test="collectCode != null and collectCode != ''">
+                AND collectCode = #{collectCode}
             </if>
             <if test="busType != null and busType != ''">
-                AND busType
-                    =
-                    #{busType}
+                AND busType = #{busType}
             </if>
             <if test="tagStatus != null">
-                AND tagStatus
-                    =
-                    #{tagStatus}
+                AND tagStatus = #{tagStatus}
             </if>
             <if test="workPlaceCode != null">
-                AND ico
-                        .
-                        workPlaceCode
-                    =
-                    #{workPlaceCode}
+                AND ico.workPlaceCode = #{workPlaceCode}
             </if>
             <if test="chargeUser != null">
-                AND sw
-                        .
-                        chargeUser
-                    =
-                    #{chargeUser}
+                AND sw.chargeUser = #{chargeUser}
             </if>
             <if test="unionKey != null">
                 AND (
-                            ico
-                                .
-                                billNo
-                            like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                fromCorp
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                fromType
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                fromCorpName
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                backupOrderRemark1
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                backupOrderRemark2
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                backupOrderRemark3
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                backupOrderRemark4
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                backupOrderRemark5
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                backupOrderRemark6
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{unionKey}
-                                ,
-                                    '%'
-                                )
-                    )
+                        ico.billNo like concat('%', #{unionKey}, '%')
+                        or ico.fromCorp like concat('%', #{unionKey}, '%')
+                        or ico.fromType like concat('%', #{unionKey}, '%')
+                        or ico.fromCorpName like concat('%', #{unionKey}, '%')
+                        or ico.backupOrderRemark1 like concat('%', #{unionKey}, '%')
+                        or ico.backupOrderRemark2 like concat('%', #{unionKey}, '%')
+                        or ico.backupOrderRemark3 like concat('%', #{unionKey}, '%')
+                        or ico.backupOrderRemark4 like concat('%', #{unionKey}, '%')
+                        or ico.backupOrderRemark5 like concat('%', #{unionKey}, '%')
+                        or ico.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
             </if>
             <if test="tagStatusList != null and tagStatusList.size() > 0">
-                and
-                    tagStatus
-                    in
+                and tagStatus in
                 <foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="workPlaceCodes != null and workPlaceCodes.size() > 0">
-                and
-                    ico
-                        .
-                        workPlaceCode
-                    in
+                and ico.workPlaceCode in
                 <foreach collection="workPlaceCodes" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="invAlert != null">
-                and ico
-                        .
-                        invAlert
-                    =
-                    #{invAlert}
+                and ico.invAlert =#{invAlert}
             </if>
             <if test="invAlerts != null and invAlerts.size() > 0">
-                and
-                    ico
-                        .
-                        invAlert
-                    in
+                and ico.invAlert in
                 <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="uploadStatus != null">
-                and ico
-                        .
-                        uploadStatus
-                    =
-                    #{uploadStatus}
+                and ico.uploadStatus = #{uploadStatus}
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND date_format
-                    (
-                        ico
-                            .
-                            billTime
-                    ,
-                        '%Y-%m-%d'
-                    )
-                    between
-                    date_format
-                        (
-                            #{startTime}
-                        ,
-                            '%Y-%m-%d'
-                        )
-                    and
-                    date_format
-                        (
-                            #{endTime}
-                        ,
-                            '%Y-%m-%d'
-                        )
+                AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="keywords != null and keywords != ''">
-                and (
-                            ico
-                                .
-                                billNo
-                            like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{keywords}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                fromCorp
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{keywords}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                fromCorpName
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{keywords}
-                                ,
-                                    '%'
-                                )
-                        or
-                            ico
-                                .
-                                fromType
-                                like
-                            concat
-                                (
-                                    '%'
-                                ,
-                                    #{keywords}
-                                ,
-                                    '%'
-                                )
-                    )
+                and (ico.billNo like concat('%', #{keywords}, '%')
+                    or ico.fromCorp like concat('%', #{keywords}, '%')
+                    or ico.fromCorpName like concat('%', #{keywords}, '%')
+                    or ico.fromType like concat('%', #{keywords}, '%'))
             </if>
         </where>
-        GROUP BY ico.billNo
+        GROUP BY
+        ico.billNo
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
     </select>
+
+
+
 </mapper>