From f0623d8cdf175fc47d814206f777bd0e6bf48049 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Mon, 6 Sep 2021 16:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E6=95=B0=E6=8D=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=96=B0=E5=A2=9E=E6=AD=A3=E5=B8=B8=E6=95=B4=E6=89=B9?=
 =?UTF-8?q?=E8=BF=94=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SfcDispatchServiceImpl.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
index 19c5acd4..761ea313 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
@@ -663,7 +663,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             return;
         }
 
-        //生成新拆分的批次派工数量
+        //拆分出来的SFC生产当前工艺路线的后续步骤派工数据
         if ("N".equals(category) || "R".equals(category)) {
             int stepIdInt = Integer.parseInt(stepId);
             List<SfcDispatch> sfcDispatchList = sfcDispatchMapper.findSplitSfcDispatch(site, sfc, stepIdInt);
@@ -708,10 +708,13 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             if (newSfcDispatchList != null && newSfcDispatchList.size() > 0) {
                 this.saveBatch(newSfcDispatchList);
             }
+
+            //修改派工数量
+            sfcDispatchMapper.updateSfcDispatchQty(site, sfc, Integer.parseInt(stepSequence), new Float(sfcModel.getQty()));
         }
 
-        //返工工艺路线保存派工数据
-        if ("R".equals(category)) {
+        //拆出来的SFC生产返修工艺路线的派工数据
+        if ("R".equals(category) || "A".equals(category)) {
             Router routerModel = routerService.getById(routerBo);
             if (routerModel == null) {
                 throw new BaseException("工艺路线[" + StringUtils.trimHandle(routerBo) + "]不存在");
@@ -726,9 +729,6 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
 
             shopOrderReleaseService.sfcDispatch(site, user, shopOrderModel, sfcModel, routerList);
         }
-
-        //修改派工数量
-        sfcDispatchMapper.updateSfcDispatchQty(site, sfc, Integer.parseInt(stepSequence), new Float(sfcModel.getQty()));
     }
 
     @Override