From ba0cfd96c94997acce2ab63faee7bf9821501f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 24 Jul 2023 15:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/controller/inout/IoOrderController.java | 1 +
 .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java   | 2 +-
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml        | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 76b90d940..1211fe9ff 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -880,6 +880,7 @@ public class IoOrderController extends BaseController {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        //只用于单据维护   加了状态判断了
         List<IoOrderEntity> list = orderService.filterOrderTrace(billNo);
         List<IoOrderResponse> responses = orderService.findResponse(list);
         return ResultVOUtils.success(responses);
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 005ceaeb2..8b4c0bb26 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -754,7 +754,7 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public List<IoOrderEntity> filterOrderTrace(String billNo) {
-        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));
+        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo).in("status",5,7,10).in("dealStatus",2,3,4));
 
         if (null == order) {
             return Collections.emptyList();
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index ef7a19759..c1a5cc3d6 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -67,11 +67,11 @@
                 AND relKey = #{relKey}
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+                AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
                         date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
-                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
+                AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
                         date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="actions != null and actions.size() != 0">