Merge remote-tracking branch 'origin/busUser' into busUser

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java

@@ -35,8 +35,6 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Transactional
 @Service
@@ -197,6 +195,7 @@ public class StockOrderServiceImpl implements StockOrderService {
                 stockOrderEntity.setOrderIdFk(null);
                 stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECK);
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+                stockOrderEntity.setOrderIdFk("");
                 orderEntity.setErpFk("");
                 stockOrderDao.updateById(stockOrderEntity);
                 orderDao.updateOrder(orderEntity);