From 3dc94df2aa0707b79eae7f1622318891f5a1922e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 3 Oct 2022 08:52:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=A1=A5=E5=8D=95=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/udi/admin/entity/inout/OrderEntity.java     | 4 +++-
 .../java/com/glxp/udi/admin/service/inout/OrderService.java   | 4 ++--
 .../com/glxp/udi/admin/service/inout/WarehouseService.java    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java
index 16cf988..4b84530 100644
--- a/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java
+++ b/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java
@@ -45,8 +45,10 @@ public class OrderEntity {
 
     /**
      * 上传到自助平台状态
+     *
+     * 上传状态（0：未上传，1：已上传）
      */
-    private String uploadStatus;        //上传状态（0：未上传，1：已上传）
+    private String uploadStatus;
 
     private Long customerId;
 
diff --git a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java
index 19ff2fa..8b5f223 100644
--- a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java
+++ b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java
@@ -232,7 +232,6 @@ public class OrderService {
 
         //更新数据
         try {
-            supplementOrder.setOrderId(null);
             insertOrder(supplementOrder);
             //更新配货单表对应的单据补单号
             orderEntity.setSupplementNo(supplementOrderNo);
@@ -252,7 +251,8 @@ public class OrderService {
     public List<OrderEntity> getSupplementOrderBillNoList() {
         //查询补单单号为空，且单据状态为已完成的单据
         QueryWrapper<OrderEntity> wrapper = new QueryWrapper<>();
-        wrapper.isNull("supplementNo").eq("status", ConstantStatus.ORDER_STATUS_SUCCESS);
+        wrapper.isNull("supplementNo").eq("status", ConstantStatus.ORDER_STATUS_SUCCESS)
+                .ne("receiveStatus", ConstantStatus.RECEIVE_UN);
         return orderDao.selectList(wrapper);
     }
 
diff --git a/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java b/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java
index adc5ae4..395c979 100644
--- a/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java
+++ b/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java
@@ -93,7 +93,7 @@ public class WarehouseService {
     }
 
     public List<WarehouseEntity> findByOrderId(String orderId) {
-        if (StrUtil.isNotBlank(orderId)) {
+        if (StrUtil.isBlank(orderId)) {
             return Collections.emptyList();
         }
         return codesDao.selectByOrderId(orderId);