diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
index 868ec537..27cc7f88 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
@@ -256,7 +256,7 @@ public class SfcDispatchController {
 //                distinctClassMap.put("ITEM_BO",sfcdto.getItemBo());
 
                 List<String> stringList= routerStepcontentService.pbDescription(distinctClassMap);
-                uploadPicturesDto = routerStepcontentService.findUploadPictureByRouterBo(sfcdto.getRouterBo());
+                uploadPicturesDto = routerStepcontentService.findUploadPictureByRouterBo(sfcdto.getRouterBo(),sfcdto.getStepId());
                 if (stringList!=null&&stringList.size()!=0){
                     for (int i = 0; i < stringList.size(); i++) {
                         pbdes=pbdes+stringList.get(i);
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/DisRouterStepDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/DisRouterStepDto.java
index b4a80997..693ad9e3 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/DisRouterStepDto.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/DisRouterStepDto.java
@@ -6,6 +6,15 @@ public class DisRouterStepDto {
     private String operationDescription;
     private String operationInfo;
     private String repairTime;
+    private String pictureAddress;
+
+    public String getPictureAddress() {
+        return pictureAddress;
+    }
+
+    public void setPictureAddress(String pictureAddress) {
+        this.pictureAddress = pictureAddress;
+    }
 
     public String getRepairTime() {
         return repairTime;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java
index e109dfa3..4da96b1b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java
@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.meapi.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.foreverwin.mesnac.meapi.model.RouterStep;
 
 public class RouterStepDto extends RouterStep {
@@ -8,6 +9,16 @@ public class RouterStepDto extends RouterStep {
    private String operationDesc;
    private String routerStepContent;
    private String repairTime;
+   @TableField(exist = false)
+   private String pictureAddress;
+
+   public String getPictureAddress() {
+      return pictureAddress;
+   }
+
+   public void setPictureAddress(String pictureAddress) {
+      this.pictureAddress = pictureAddress;
+   }
 
    public String getRouterStepContent() {
       return routerStepContent;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java
index a4fca779..a0d01499 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java
@@ -53,5 +53,5 @@ public interface RouterService extends IService<Router> {
      * 放置图片
      * @param disRouter
      */
-    public void fileUpload(DisRouter disRouter,String routerBo);
+    public void fileUpload(DisRouter disRouter,String routerBo,String stepId);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepcontentService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepcontentService.java
index ffdccb5f..b34e54d2 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepcontentService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepcontentService.java
@@ -39,5 +39,5 @@ public interface RouterStepcontentService extends IService<RouterStepcontent> {
     List<String> pbDescription(Map paramMap);
 
 
-     UploadPicturesDto findUploadPictureByRouterBo(String RouterBo);
+     UploadPicturesDto findUploadPictureByRouterBo(String RouterBo, String status);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java
index 0eb5d121..b25e7bc4 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -146,7 +147,10 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
 
         for (int i = 0; i < disRouter.getDisRouterStepDtoList().size(); i++) {
             DisRouterStepDto routerStepDto = routerStepDtoList.get(i);
-            String stepId = "90" + routerStepDto.getStep();
+            String stepId = routerStepDto.getStep();
+            if (stepId.substring(0,2) != "90"){
+                stepId = "90" + stepId;
+            }
             if (StringUtil.isBlank(entryRouterStep)) {
                 entryRouterStep = stepId;
             }
@@ -203,9 +207,8 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
             customFields = new CustomFields();
             customFields.setHandle(routerOperationBO);
             customFields.setAttribute("OUT_SOURCE");
-            customFields.setValue("N");
+            customFields.setValue(stepId);
             customFieldsList.add(customFields);
-            //
 
 
             RouterStepcontent routerStepcontent=new RouterStepcontent();
@@ -219,8 +222,12 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
             }catch (Exception e){
                 throw BusinessException.build(e.getMessage().trim());
             }
-
-
+            //图片路径
+            try {
+                this.fileUpload(disRouter,routerBo,stepId);
+            }catch (Exception e){
+                throw BusinessException.build("图片保存失败");
+            }
         }
 
         String lastStepId = "9999";
@@ -257,12 +264,6 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
         //工艺路线创建
         routerConfigurationService.createRouter(routerConfiguration);
 
-        //图片路径
-        try {
-            this.fileUpload(disRouter,routerBo);
-        }catch (Exception e){
-            throw BusinessException.build("图片保存失败");
-        }
 
         //自定义数据保存
         if (customFieldsList != null && customFieldsList.size() > 0) {
@@ -281,29 +282,33 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
     }
 
     @Override
-    public void fileUpload(DisRouter disRouter,String routerBo) {
+    public void fileUpload(DisRouter disRouter,String routerBo,String stepId) {
         String user = CommonMethods.getUser();
         LocalDateTime now = LocalDateTime.now();
         String site = CommonMethods.getSite();
-        String status = "N";
+        String status = stepId;
         List<String> name = Arrays.asList(disRouter.getFileName().split(","));
+        name = name.stream().filter(item -> item.split("/")[0].equals(stepId)).collect(Collectors.toList());
         if(name.size() != 0){
             UploadPicturesDto uploadPictures = new UploadPicturesDto();
             uploadPictures.setHandle("UploadPicturesBO:"+site+","+disRouter.getRouter()+"_"+disRouter.getAbnormalNo()+","+status);
             uploadPictures.setSite(site);
-            uploadPictures.setPicturePath(disRouter.getFilePath());
+            //文件路径 = 物料编号异常单号 + 步骤
+            String filePath = disRouter.getFilePath() + "/" + status;
+            uploadPictures.setPicturePath(filePath);
             StringBuilder pictureAddress = new StringBuilder();
             for (int i = 0; i <= name.size() -1; i++) {
                 if(i != name.size() -1){
-                    pictureAddress.append(disRouter.getFilePath()).append("/").append(name.get(i)).append(",");
+                    pictureAddress.append(filePath).append("/").append(name.get(i).split("/")[1]).append(",");
                 }else{
-                    pictureAddress.append(disRouter.getFilePath()).append("/").append(name.get(i));
+                    pictureAddress.append(filePath).append("/").append(name.get(i).split("/")[1]);
                 }
             }
             uploadPictures.setStatus(status);
             uploadPictures.setPictureAddress(pictureAddress.toString());
             uploadPictures.setObjectBo(routerBo);
-            uploadPictures.setNum(disRouter.getFileNum());
+            Integer num = name.size();
+            uploadPictures.setNum(num.toString());
             uploadPictures.setType("Repair");
             uploadPictures.setCreatedUser(user);
             uploadPictures.setCreatedDateTime(now);
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepcontentServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepcontentServiceImpl.java
index 99f9996e..f67d1821 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepcontentServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepcontentServiceImpl.java
@@ -62,12 +62,12 @@ public class RouterStepcontentServiceImpl extends ServiceImpl<RouterStepcontentM
     }
 
     @Override
-    public UploadPicturesDto findUploadPictureByRouterBo(String routerBo) {
+    public UploadPicturesDto findUploadPictureByRouterBo(String routerBo,String status) {
         String site = CommonMethods.getSite();
         UploadPicturesDto uploadPictures = new UploadPicturesDto();
         uploadPictures.setSite(site);
         uploadPictures.setObjectBo(routerBo);
-        uploadPictures.setStatus("N");
+        uploadPictures.setStatus(status);
         List<UploadPicturesDto> uploadPictures1=new ArrayList<>();
         try {
              uploadPictures1 = routerStepcontentMapper.findUploadPictureByRouterBo(uploadPictures);
diff --git a/meapi/src/main/resources/mapper/RouterStepMapper.xml b/meapi/src/main/resources/mapper/RouterStepMapper.xml
index ed7570a1..4eac97bc 100644
--- a/meapi/src/main/resources/mapper/RouterStepMapper.xml
+++ b/meapi/src/main/resources/mapper/RouterStepMapper.xml
@@ -485,6 +485,7 @@
     <select id="findRouterOperationByRouterBo" resultType="com.foreverwin.mesnac.meapi.dto.RouterStepDto">
         SELECT
             STEP.STEP_ID ,
+            ZUP.PICTURE_ADDRESS PICTURE_ADDRESS,
             STEP."SEQUENCE",
             STEP.REPORTING_CENTER_BO,
             STEP.ERP_OPERATION ,
@@ -497,6 +498,8 @@
         JOIN ROUTER_STEP STEP ON R.HANDLE = STEP.ROUTER_BO
         LEFT JOIN Z_ROUTER_STEPCONTENT ZRS ON STEP.HANDLE=ZRS.ROUTER_STEP_BO
         JOIN ROUTER_OPERATION RO ON STEP.HANDLE = RO.ROUTER_STEP_BO
+        LEFT JOIN Z_UPLOAD_PICTURES ZUP ON R.HANDLE = ZUP.OBJECT_BO
+            AND ZUP.STATUS=STEP.STEP_ID
         JOIN OPERATION OP ON 'OperationBO:' || #{site} || ',' || OP.OPERATION  || ',#' = RO.OPERATION_BO AND OP.CURRENT_REVISION = 'true'
         JOIN OPERATION_T OPT ON OP.HANDLE = OPT.OPERATION_BO AND OPT.LOCALE = #{locale}
         WHERE R.HANDLE = #{routerBo}
diff --git a/meapi/src/main/resources/mapper/RouterStepcontentMapper.xml b/meapi/src/main/resources/mapper/RouterStepcontentMapper.xml
index 32513c65..bf4c7511 100644
--- a/meapi/src/main/resources/mapper/RouterStepcontentMapper.xml
+++ b/meapi/src/main/resources/mapper/RouterStepcontentMapper.xml
@@ -230,7 +230,9 @@
         <if test="objectBo!=null and objectBo != ''">
             AND OBJECT_BO=#{objectBo}
         </if>
-         AND STATUS='N'
+        <if test="status!=null and status != ''">
+            AND STATUS=#{status}
+        </if>
     </select>