From d1209f45db08aabd99285cc9e4ea5f374cb7375a Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 2 Dec 2022 15:48:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=92=A4=E5=9B=9E=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=9C=AA=E7=BD=AE=E7=A9=BA=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E8=A2=AB=E9=87=8D=E6=96=B0=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/inout/impl/StockOrderServiceImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java
index dc86995..9dc6071 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java
@@ -32,8 +32,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 
 @Transactional
 @Service
@@ -197,6 +199,7 @@ public class StockOrderServiceImpl implements StockOrderService {
                 stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECK);
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
                 orderEntity.setErpFk("");
+                stockOrderEntity.setOrderIdFk("");
                 stockOrderDao.updateById(stockOrderEntity);
                 orderDao.updateOrder(orderEntity);
             } else {