From 7f7d90a15ee25b00065193cc9dd452207c9abc4a Mon Sep 17 00:00:00 2001
From: zf <27208084@qq.com>
Date: Thu, 16 Feb 2023 09:35:33 +0800
Subject: [PATCH] 自动组盘成功,返回前端结果data设置为null

---
 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index 03596a2..334c2be 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -135,9 +135,9 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             }
         }
         if (over) {
-            return Result.OK("出库单已经配盘");
+            return Result.OK("出库单已经配盘", null);
         }
-        return Result.OK("自动组盘成功");
+        return Result.OK("自动组盘成功", null);
     }
 
     @Override
@@ -210,7 +210,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
                 throw new ServiceException(result.getMessage());
             }
         }
-        return Result.OK("自动组盘成功");
+        return Result.OK("自动组盘成功", null);
     }
 
     @Override
--
libgit2 0.22.2