From bfe27ab5ef50bf48b227f2b420aa699f6a84391e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 26 Oct 2021 16:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=95=B4=E6=89=B9=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE--=E5=BD=93=E6=9C=80=E5=90=8E=E4=B8=80=E9=81=93?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=9C=A8=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E5=88=A4=E5=AE=9A=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=20=E6=89=BE=E4=B8=8D=E5=88=B0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=9D=A1=E7=A0=81=EF=BC=88=E6=94=B9=E4=B8=BA=E4=BB=8E?=
 =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E6=89=BE=E4=BA=A7=E5=93=81=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalBillServiceImpl.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 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 bd840050..6f8fc050 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
@@ -588,10 +588,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 sfcDto.setAbnormalNo(abnormalBill2.getAbnormalNo());
                 sfcDto.setQty(sfc.getQty());
                 Map map = sfcMapper.findOperationBySfc(site, sfc.getSfc());
-                if(map != null && StringUtils.isBlank((String)map.get("STEP_ID"))){
-                    throw new BaseException("整批返修失败，根据产品条码"+sfc.getSfc()+"找不到STEP_ID");
+                if(map == null || StringUtils.isBlank((String)map.get("STEP_ID"))){
+                    if(StringUtils.notBlank(abnormalBill2.getStepId())){
+                        sfcDto.setStepId(abnormalBill2.getStepId());
+                    }else{
+                        throw new BaseException("整批返修失败，根据产品条码"+sfc.getSfc()+"找不到STEP_ID(工步)");
+                    }
+                }else{
+                    sfcDto.setStepId((String) map.get("STEP_ID"));
                 }
-                sfcDto.setStepId((String) map.get("STEP_ID"));
                 this.batchRepair(sfcDto);
             }
         }
@@ -1361,10 +1366,14 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
         //根据sfc找工单等信息
         SfcDto sfcData = splitSfcMapper.getSfcData(handle);
-        String operation = sfcData.getOperation();
         if (sfcData==null){
-            throw new BaseException("未找到产品条码信息");
+            Sfc sfcServiceById = sfcService.getById(handle);
+            if (!sfcServiceById.getStatusBo().equals(HandleEnum.STATUS.getHandle(site,"405"))){
+                throw new BaseException("未找到产品条码信息");
+            }
+            sfcData= splitSfcMapper.getCompleteSfcData(handle).get(0);
         }
+        String operation = sfcData.getOperation();
         SfcDispatchDto sfcDispatchDto = new SfcDispatchDto();
         sfcDispatchDto.setSite(site);
         sfcDispatchDto.setSfc(sfc);