From 118130204fd44d44f7bb773a412af0eebdafd810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Mon, 13 Sep 2021 08:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8ncQty=E4=B8=BAnull=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/service/impl/AbnormalBillServiceImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index b562d8ea..0f11dc26 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -51,6 +51,7 @@ import com.foreverwin.modular.core.util.FrontPage;
 import com.sap.me.nonconformance.*;
 import com.sap.me.production.SplitSerializeServiceInterface;
 import com.sap.me.production.SplitSfcRequest;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -619,7 +620,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             //放置图片,新建状态
             this.fileUpload(abnormalBill);
         }else{
-            uploadPicturesMapper.deleteById("UploadPicturesBO:"+abnormalBill.getSite()+","+abnormalBill.getAbnormalNo()+","+"N");
+            String status = "N".equals(abnormalBill.getStatus()) ? "N" : "G";
+            uploadPicturesMapper.deleteById("UploadPicturesBO:"+abnormalBill.getSite()+","+abnormalBill.getAbnormalNo()+","+status);
             //UploadPicturesBO:"+abnormalBill.getSite()+","+abnormalBill.getAbnormalNo()+","+status
         }
         // this.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose);
@@ -808,7 +810,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             }
             //判断不良品数量是否大于SFC的数量
             Sfc sfc = sfcMapper.selectById(HandleEnum.SFC.getHandle(site, abnormalBill.getSfc()));
-            if(Integer.parseInt(abnormalBill.getNcQty()) > sfc.getQty()){
+            if(Strings.isNotBlank(abnormalBill.getNcQty()) && Integer.parseInt(abnormalBill.getNcQty()) > sfc.getQty()){
                 throw BusinessException.build("质量异常提报的不良品数量不能大于SFC的数量，SFC的数量为:"+sfc.getQty());
             }