From 81e3e66953ad1b4151c5a0c6a36b7efb43ce420b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 15 Jul 2022 16:05:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=B9=B3=E8=A1=A1=E8=A1=A5?=
 =?UTF-8?q?=E5=8D=95=E5=9C=A8=E6=9C=AA=E5=AE=8C=E6=88=90=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=B0=B1?=
 =?UTF-8?q?=E8=A1=A5=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=EF=BC=8C=E7=B2=BE?=
 =?UTF-8?q?=E7=AE=80=E9=9D=9E=E5=BF=85=E8=A6=81=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=A4=9A=E6=AC=A1=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/inout/impl/OrderServiceImpl.java   |  5 +----
 .../mybatis/mapper/business/StockOrderDao.xml  | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
index 17425836..9152647b 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
@@ -334,10 +334,7 @@ public class OrderServiceImpl implements OrderService {
         stockOrderEntityList.forEach(stockOrderEntity -> {
             StockOrderResponse response = new StockOrderResponse();
             BeanUtil.copyProperties(stockOrderEntity, response);
-            String supplementOrderType = bussinessTypeDao.selectEnableSupplementOrder(stockOrderEntity.getOrderIdFk());
-            if (StrUtil.isBlank(supplementOrderType) || StrUtil.isNotBlank(stockOrderEntity.getSupplementNo())) {
-                response.setEnableSupplementOrder(false);
-            } else {
+            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER)) {
                 response.setEnableSupplementOrder(true);
             }
             result.add(response);
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
index da24b4c1..9490fe2b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
@@ -326,10 +326,20 @@
     </select>
 
     <select id="selectSupplementOrderList" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
-        select *
-        from stock_order
-        where supplementNo is null
-           or supplementNo = ''
+        SELECT
+            billNo, orderIdFk, `status`
+        FROM
+            stock_order
+        WHERE
+            ( supplementNo IS NULL OR supplementNo = '' )
+          AND billType IN (
+            SELECT
+                localAction
+            FROM
+                basic_bussiness_type
+            WHERE
+                supplementOrderType IS NOT NULL
+               OR supplementOrderType != '')
     </select>
 
     <select id="findById" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">