From 7cc5747c086b707c20ef88e14522106f64866ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=9E=9D=E5=88=9A?= <snow_peng@semi-tech.com>
Date: Fri, 10 Jan 2025 09:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B7=A5=E5=8D=95=E5=86=B2?=
 =?UTF-8?q?=E9=94=80=E6=97=B6=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopOrderStatisticTransController.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/int-core/src/main/java/com/foreverwin/iep/integration/controller/ShopOrderStatisticTransController.java b/int-core/src/main/java/com/foreverwin/iep/integration/controller/ShopOrderStatisticTransController.java
index 7edccda..fc4cdda 100644
--- a/int-core/src/main/java/com/foreverwin/iep/integration/controller/ShopOrderStatisticTransController.java
+++ b/int-core/src/main/java/com/foreverwin/iep/integration/controller/ShopOrderStatisticTransController.java
@@ -160,9 +160,12 @@ public class ShopOrderStatisticTransController {
         InvokeResponse invokeResponse = new InvokeResponse();
         List<ZShoporderStatisticsTransaction> newList = new ArrayList<>();
         for (ZShoporderStatisticsTransaction statisticsTransaction : shoporderStatisticsTransactionList) {
+            if(StringUtils.isEmpty(statisticsTransaction.getSid())){
+                throw BusinessException.build("此笔数据还未报工无需取消报工");
+            }
             // 重新校验一遍是否已经报过工，防止重复报工
             ZShoporderStatisticsTransaction targetObj = zShoporderStatisticsTransactionMapper.selectById(statisticsTransaction.getSid());
-            if (!"S".equals(targetObj.getSyncStatus())) {
+            if (targetObj==null || !"S".equals(targetObj.getSyncStatus())) {
                 throw BusinessException.build("工单" + targetObj.getShopOrder() + "还未报工无需取消报工");
             } else {
                 newList.add(targetObj);