From 391671a521d01d8abeae9028d77801c94c72fcbd Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 13 Jul 2022 14:49:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/SpsSyncUploadController.java        | 13 +++++--------
 .../controller/inout/OrderController.java     |  2 +-
 .../admin/thread/IoTransInoutService.java     | 19 ++++++++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
index 0fc85a7..e79211f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
@@ -195,15 +195,12 @@ public class SpsSyncUploadController {
         //耗材字典导入
         if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
             if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
-                try {
-                    List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
-                    UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
-                    for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
-                        mapper.insertUdiInfo(udiInfoEntity);
-                    }
-                    batchSession.commit();
-                } catch (Exception e) {
+                List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
+                UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
+                for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
+                    mapper.insertUdiInfo(udiInfoEntity);
                 }
+                batchSession.commit();
             }
         }
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
index c45fb1a..454bce8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
@@ -658,7 +658,7 @@ public class OrderController {
         OrderEntity orderEntity = orderService.findById(orderFilterRequest.getId());
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
         orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
-        orderEntity.setErpFk(" "); //将业务单据号置空
+        orderEntity.setErpFk(""); //将业务单据号置空
         List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId());
         codesTempService.insertCodesTemp(warehouseEntityList);
         codesService.deleteByOrderId(orderEntity.getId());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
index e719005..62a943f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
@@ -910,15 +910,20 @@ public class IoTransInoutService {
             }
         } else if (orderEntity.getContrastStatus() == ConstantStatus.ORDER_CHECK_SUCCESS) {
             String[] erpIds = orderEntity.getErpFk().split(",");
-            if (erpIds != null && erpIds.length > 0) {
-                for (int i = 0; i < erpIds.length; i++) {
-                    StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
-                    stockOrderFilterRequest.setBillNo(erpIds[i]);
-                    StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
-                    stockOrderEntity.setStatus(new CheckOrderUtils().getStockOrderStatus(orderEntity, bussinessTypeEntity));
-                    stockOrderService.updateById(stockOrderEntity);
+            if (erpIds == null || erpIds.length == 0) {
+                if (StrUtil.isNotEmpty(orderEntity.getErpFk())) {
+                    erpIds = new String[1];
+                    erpIds[0] = orderEntity.getErpFk();
                 }
             }
+            for (int i = 0; i < erpIds.length; i++) {
+                StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+                stockOrderFilterRequest.setBillNo(erpIds[i]);
+                StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
+                stockOrderEntity.setStatus(new CheckOrderUtils().getStockOrderStatus(orderEntity, bussinessTypeEntity));
+                stockOrderEntity.setOrderIdFk(orderEntity.getId());
+                stockOrderService.updateById(stockOrderEntity);
+            }
 
         }
     }