diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
index 1783104f..2490aec9 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
@@ -48,4 +48,6 @@ public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
 
     IPage getAbnormalSFCPage(IPage page, @Param("paramMap")Map<String,String> paramMap,@Param("keyword")String keyword);
     Map<String,String> findReplaceMessageByAbnormal(@Param("abnormalBill")AbnormalBill abnormalBill);
+
+    List<ScrapDto> findScrapDtoList(String site);
 }
\ No newline at end of file
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 357de2a7..68307f33 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
@@ -1553,67 +1553,71 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(StringUtil.isBlank(site)){
             site = CommonMethods.getSite();
         }
+        List<ScrapDto> scrapDtoBySfc = null;
         //根据用户提报上来的sfc和异常单查找主SFC
-        Map<String, String> map = this.jgProductionIsScrap(abnormalNo, site, sfc);
-        String mainSfc = null;
-        String abnormalBo = null;
-        if(map != null){
-             mainSfc = map.get("SFC");
-             abnormalBo = map.get("HANDLE");
-        }
+        if (StringUtils.notBlank(abnormalNo)||StringUtils.notBlank(sfc)){
+            Map<String, String> map = this.jgProductionIsScrap(abnormalNo, site, sfc);
+            String mainSfc = null;
+            String abnormalBo = null;
+            if(map != null){
+                mainSfc = map.get("SFC");
+                abnormalBo = map.get("HANDLE");
+            }
 
-        List<SplitSfc> splitSfcs = null;
-        SplitSfc splitSfc = new SplitSfc();
-        splitSfc.setSite(site);
+            List<SplitSfc> splitSfcs = null;
+            SplitSfc splitSfc = new SplitSfc();
+            splitSfc.setSite(site);
 
-        //判断能否找到该主sfc。
-        if(StringUtil.isBlank(mainSfc)){
-            //判断该用户提报上来的sfc是否为空
-            if(StringUtil.isBlank(sfc)) {
-                throw new BaseException("该异常单下没有报废的产品条码");
-            }
+            //判断能否找到该主sfc。
+            if(StringUtil.isBlank(mainSfc)){
+                //判断该用户提报上来的sfc是否为空
+                if(StringUtil.isBlank(sfc)) {
+                    throw new BaseException("该异常单下没有报废的产品条码");
+                }
 
-            //如果不为空，则判断根据这个sfc能从Z_SPLIT_SFC表中查找到主SFC吗，然后在判断主SFC是否已经报废
-            splitSfc.setSplitSfc(sfc);
-            splitSfcs = splitSfcService.selectList(splitSfc);
-            if(splitSfcs.size()>0){
-                Map<String, String> map1 = this.jgProductionIsScrap(abnormalNo, site, splitSfcs.get(0).getSfc());
-                mainSfc = map1.get("SFC");
-                abnormalBo = map1.get("HANDLE");
-            }else{
-                if(!StringUtil.isBlank(sfc) && !StringUtil.isBlank(abnormalNo)){
-                    throw new BaseException("该异常单下的产品条码不是报废");
+                //如果不为空，则判断根据这个sfc能从Z_SPLIT_SFC表中查找到主SFC吗，然后在判断主SFC是否已经报废
+                splitSfc.setSplitSfc(sfc);
+                splitSfcs = splitSfcService.selectList(splitSfc);
+                if(splitSfcs.size()>0){
+                    Map<String, String> map1 = this.jgProductionIsScrap(abnormalNo, site, splitSfcs.get(0).getSfc());
+                    mainSfc = map1.get("SFC");
+                    abnormalBo = map1.get("HANDLE");
+                }else{
+                    if(!StringUtil.isBlank(sfc) && !StringUtil.isBlank(abnormalNo)){
+                        throw new BaseException("该异常单下的产品条码不是报废");
+                    }
+                    throw new BaseException("该产品条码的异常方案不是报废");
                 }
-                throw new BaseException("该产品条码的异常方案不是报废");
+            }else if(StringUtil.isBlank(sfc)){
+                //根据异常单找到了主sfc，并且sfc参数为空，找到异常单主sfc下拆分的次sfc
+                splitSfc.setSfc(mainSfc);
+                splitSfcs = splitSfcService.selectList(splitSfc);
             }
-        }else if(StringUtil.isBlank(sfc)){
-            //根据异常单找到了主sfc，并且sfc参数为空，找到异常单主sfc下拆分的次sfc
-            splitSfc.setSfc(mainSfc);
-            splitSfcs = splitSfcService.selectList(splitSfc);
-        }
-        List<ScrapDto> scrapDtoBySfc = abnormalBillMapper.findScrapDtoBySfc(site, mainSfc,splitSfcs);
-
-        //如果用户提报上来的sfc不为空，并且不是主sfc，则把主sfc从scrapDtoBySfc去掉
-        if(!StringUtil.isBlank(sfc) && !sfc.equals(mainSfc)){
-            for (int i = 0; i < scrapDtoBySfc.size(); i++) {
-                if(scrapDtoBySfc.get(i).getSfc().equals(mainSfc)){
-                    scrapDtoBySfc.remove(scrapDtoBySfc.get(i));
-                    continue;
+            scrapDtoBySfc = abnormalBillMapper.findScrapDtoBySfc(site, mainSfc,splitSfcs);
+
+            //如果用户提报上来的sfc不为空，并且不是主sfc，则把主sfc从scrapDtoBySfc去掉
+            if(!StringUtil.isBlank(sfc) && !sfc.equals(mainSfc)){
+                for (int i = 0; i < scrapDtoBySfc.size(); i++) {
+                    if(scrapDtoBySfc.get(i).getSfc().equals(mainSfc)){
+                        scrapDtoBySfc.remove(scrapDtoBySfc.get(i));
+                        continue;
+                    }
                 }
             }
-        }
-        if(scrapDtoBySfc.size() <= 0){
-            throw new BaseException("该产品条码的异常方案不是报废");
-        }
-
-        //查找到责任人,放到表里
-        AbnormalBillDispose abnormalBillDispose = new AbnormalBillDispose();
-        abnormalBillDispose.setAbnormalBillBo(abnormalBo);
-        List<AbnormalBillDispose> abnormalBillDisposes = abnormalBillDisposeService.selectList(abnormalBillDispose);
-        if(abnormalBillDisposes.size() > 0){
-            for (int i = 0; i < scrapDtoBySfc.size(); i++) {
-                scrapDtoBySfc.get(i).setDutyUser(abnormalBillDisposes.get(0).getPrincipalUser());
+            if(scrapDtoBySfc.size() <= 0){
+                throw new BaseException("该产品条码的异常方案不是报废");
+            }
+            //查找到责任人,放到表里
+            AbnormalBillDispose abnormalBillDispose = new AbnormalBillDispose();
+            abnormalBillDispose.setAbnormalBillBo(abnormalBo);
+            List<AbnormalBillDispose> abnormalBillDisposes = abnormalBillDisposeService.selectList(abnormalBillDispose);
+            if(abnormalBillDisposes.size() > 0){
+                for (int i = 0; i < scrapDtoBySfc.size(); i++) {
+                    scrapDtoBySfc.get(i).setDutyUser(abnormalBillDisposes.get(0).getPrincipalUser());
+                }
             }
+        }else {
+            scrapDtoBySfc = abnormalBillMapper.findScrapDtoList(site);
         }
         return scrapDtoBySfc;
     }
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 0ca0be65..585a36e4 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -76,6 +76,7 @@
         <result column="BOM" property="bom"/>
         <result column="REASON" property="reason"/>
         <result column="TYPE" property="type"/>
+        <result column="DUTY_USER" property="dutyUser"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -1234,6 +1235,50 @@
         </where>
     </select>
 
+    <select id="findScrapDtoList" resultMap="scrapDto">
+        SELECT   NVL(ZSSF.SPLIT_SfC,S.SFC ) SFC,ZABD.PRINCIPAL_USER DUTY_USER,
+        S2.STATUS STATUS,
+        CASE WHEN ZAB.OPERATION IS NOT NULL AND ZAB.STEP_ID IS NOT NULL THEN ZAB.OPERATION || '/' || ZAB.STEP_ID
+        ELSE SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID
+        END OPERATION,
+        CASE WHEN ZAB.RESRCE IS NOT NULL THEN ZAB.RESRCE
+        ELSE ZSD2.RESRCE
+        END RESRCE,
+        CASE WHEN ZAB.SHOP_ORDER IS NOT NULL THEN ZAB.SHOP_ORDER
+        ELSE SO.SHOP_ORDER
+        END SHOP_ORDER,
+        CASE WHEN I.ITEM != 'NULL'  THEN I.ITEM || '/' || I.REVISION END ITEM,
+        CASE WHEN R.ROUTER != 'NULL'  THEN R.ROUTER || '/' || R.REVISION END ROUTER ,
+        CASE WHEN B.BOM != 'NULL'  THEN B.BOM || '/' || B.REVISION END BOM,
+        CASE WHEN ZSS.HANDLE != 'NULL' THEN ZSS.REASON
+        ELSE ZABV.PB_DESCRIPTION
+        END REASON,
+        ZSS.TYPE TYPE
+        FROM SFC S
+        JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
+        JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO  = SR.HANDLE AND ST.IN_USE = 'true'
+        JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE  AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
+        INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO
+        JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
+        INNER JOIN SHOP_ORDER SO ON SO.HANDLE = S.SHOP_ORDER_BO AND SO.SITE = S.SITE
+        INNER JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
+        JOIN ROUTER R ON R.HANDLE  = ST.ROUTER_BO
+        LEFT JOIN Z_SFC_SCRAP ZSS ON ZSS.SFC = S.SFC AND ZSS.SITE = S.SITE
+        JOIN BOM B ON B.HANDLE = SO.PLANNED_BOM_BO
+        JOIN (
+        	SELECT ZABV.*
+        FROM Z_ABNORMAL_BILL_VIEW ZABV
+        JOIN  (SELECT MAX(HANDLE) handle
+        FROM Z_ABNORMAL_BILL_VIEW ZABV2
+        GROUP BY sfc ) ma ON  ZABV.HANDLE = ma.HANDLE
+        ) ZABV
+        ON ZABV.SFC = S.SFC AND ZABV.SITE= S.SITE
+         JOIN Z_ABNORMAL_BILL ZAB ON ZAB.HANDLE = ZABV.HANDLE
+        JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO= ZAB.HANDLE
+        LEFT JOIN Z_SPLIT_SFC ZSSF ON s.site=ZSSF.site and ZSSF.sfc=s.SFC
+        LEFT JOIN SFC SPSFC ON SPSFC.site=ZSSF.site and ZSSF.sfc=SPSFC.SFC AND spsfc.STATUS_BO!='StatusBO:'||#{site}||',407'
+		WHERE   s.STATUS_BO!='StatusBO:'||#{site}||',407'
+    </select>
     <select id="getQCAbnormalList" resultMap="BaseResultMap">
         SELECT * FROM Z_ABNORMAL_BILL zab
                           JOIN sfc s ON zab.SITE=s.SITE AND zab.SFC=s.SFC
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 721da842..2501e99a 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -600,6 +600,12 @@
         LEFT JOIN USER_GROUP ug ON ug.USER_GROUP =  zabd.RESOLVE_SEND_USER_GROUP AND ug.SITE = zab.SITE
         <where>
             zab.SITE = #{site}
+            <if test="abnormalNo != null and abnormalNo != ''">
+                AND  zab.ABNORMAL_NO = #{abnormalNo}
+            </if>
+            <if test="sfc != null and sfc != ''">
+                AND   zab.sfc = #{sfc}
+            </if>
              <if test="workCenter != null and workCenter != ''">
                 AND  (wc.WORK_CENTER = #{workCenter} OR wct.DESCRIPTION = #{workCenter})
              </if>
@@ -743,15 +749,15 @@
                 WHEN zab.NC_QTY IS NOT NULL THEN ROUND((zsd.DISPATCH_QTY - TO_NUMBER(zab.NC_QTY))*ZSD.PROD_HOURS ,4)
                 ELSE ROUND(zsd.DISPATCH_QTY*ZSD.PROD_HOURS ,4)  END  TOTAL_PROD_HOURS ,
                zsd.EMPLOYEE_DESCRIPTION,
-               CASE WHEN ZUR.TEMPORARY_USER = 'true' THEN '临时'
-               WHEN ZUR.TEMPORARY_USER = 'false' THEN '正式' END EMPLOYEE_ATTR,
-               zsd.ACTUAL_START_DATE,
-               zsd.ACTUAL_COMPLETE_DATE,
-               zsd.REMARK
+        CASE WHEN ZUR.TEMPORARY_USER = 'true' THEN '临时'
+        WHEN ZUR.TEMPORARY_USER = 'false' THEN '正式' END EMPLOYEE_ATTR,
+        zsd.ACTUAL_START_DATE,
+        zsd.ACTUAL_COMPLETE_DATE,
+        zsd.REMARK
         FROM Z_SFC_DISPATCH zsd
-                LEFT JOIN Z_USER_RESOURCE ZUR ON  zsd.RESRCE = ZUR.RESRCE
-                AND zsd.EMPLOYEE_DESCRIPTION like CONCAT(ZUR.USER_DESCRIPTION, '%')
-                INNER JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
+        LEFT JOIN Z_USER_RESOURCE ZUR ON  zsd.RESRCE = ZUR.RESRCE
+        AND zsd.EMPLOYEE_DESCRIPTION like CONCAT(ZUR.USER_DESCRIPTION, '%')
+        INNER JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
                  LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
                  LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
                  INNER JOIN ITEM i ON i.HANDLE = so.ITEM_BO
diff --git a/common/pom.xml b/common/pom.xml
index 1b0d3575..cab7f265 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -83,6 +83,7 @@
             <artifactId>meapi</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.apache.axis</groupId>
             <artifactId>axis</artifactId>
@@ -109,5 +110,6 @@
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
         </dependency>
+
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java
index 28d12399..3d1aae91 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java
@@ -4,6 +4,7 @@ import com.foreverwin.mesnac.common.ftp.CappFtpClient;
 import com.foreverwin.mesnac.common.service.FileService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.exception.BaseException;
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.R;
 import org.apache.commons.net.ftp.FTPClient;
 import org.slf4j.Logger;
@@ -11,10 +12,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -46,12 +44,13 @@ public class FileController {
      */
     @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/getPdfPath")
-    public R getPdfPath(String sfc)  {
+    public R getPdfPath(@RequestParam("sfc") String sfc, @RequestParam("operation") String operation,@RequestParam("step") String step)  {
         try {
             if(StringUtils.isBlank(sfc)){
-                throw new BaseException("产品条码不能为空!");
+                throw new BaseException("派工单号不能为空!");
             }
-            return R.ok(fileService.getFilePaths(sfc));
+            String site = CommonMethods.getSite();
+            return R.ok(fileService.getFilePaths(site,sfc,operation,step));
         }catch (Exception e){
             return R.failed("获取图纸路径失败:"+e.getMessage());
         }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/FileService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/FileService.java
index 019e0b5a..4ef3cda6 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/FileService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/FileService.java
@@ -7,6 +7,6 @@ import java.util.Map;
  */
 public interface FileService {
 
-    Map<String,String> getFilePaths(String sfc) throws Exception;
+    Map<String,String> getFilePaths(String site,String sfc,String operation,String step) throws Exception;
     Map<String,String> getFilePathsByItemBo(String itemBo) throws Exception;
 }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
index 65ac2283..849757f2 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
@@ -1,11 +1,14 @@
 package com.foreverwin.mesnac.common.service.impl;
 
+import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.ftp.CappFtpClient;
 import com.foreverwin.mesnac.common.service.FileService;
 import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.model.Sfc;
+import com.foreverwin.mesnac.meapi.model.SfcDispatchDrawing;
+import com.foreverwin.mesnac.meapi.service.SfcDispatchDrawingService;
 import com.foreverwin.mesnac.meapi.service.SfcService;
 import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -14,8 +17,10 @@ import org.apache.commons.net.ftp.FTPFile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -23,16 +28,23 @@ public class FileServiceImpl implements FileService {
     @Autowired
     private SfcService sfcService;
     @Autowired
+    private SfcDispatchDrawingService sfcDispatchDrawingService;
+    @Autowired
     private CappFtpClient cappFtpClient;
+
     @Override
-    public Map<String, String> getFilePaths(String sfc) throws IOException {
+    public Map<String, String> getFilePaths(String site,String sfc,String operation,String step) throws IOException {
 
         Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(CommonMethods.getSite(), sfc));
         if (sfcServiceById==null){
             throw new BaseException("未找到产品条码"+sfc);
         }
+        SfcDispatchDrawing sfcDispatchDrawing = sfcDispatchDrawingService.findSfcDispatch(site,sfc,operation,step);
+        if (sfcDispatchDrawing==null||sfcDispatchDrawing.getDrawingsRevision()==null){
+            throw new BaseException("未找到图纸相应信息");
+        }
         String itemBo = sfcServiceById.getItemBo();
-        String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo)+"/";
+        String path="/"+ StringUtil.trimHandle(itemBo)+"_"+sfcDispatchDrawing.getDrawingsRevision()+"/";
         FTPClient connect = null;
         Map<String,String> pathMap = new HashMap<>();
         try {
@@ -41,12 +53,17 @@ public class FileServiceImpl implements FileService {
             connect.enterLocalPassiveMode();
             FTPFile[] files = connect.listFiles();
             if(files!=null){
-                for (int i = 0; i < files.length; i++) {
-                    if(files[i].isFile()){
-                        String filename=files[i].getName();
-                        pathMap.put(filename,path+filename);
+                for (FTPFile ftpFile:files){
+                    if (ftpFile.getName().equals(path.substring(1,path.length()-1))&&ftpFile.isFile()){
+                        pathMap.put(ftpFile.getName(),path+ftpFile.getName());
                     }
                 }
+//                for (int i = 0; i < files.length; i++) {
+//                    if(files[i].isFile()){
+//                        String filename=files[i].getName();
+//                        pathMap.put(filename,path+filename);
+//                    }
+//                }
             }
             connect.disconnect();
         }catch (Exception e){
@@ -88,8 +105,8 @@ public class FileServiceImpl implements FileService {
                 connect.disconnect();
             }
         }
-
         return pathMap;
     }
 
+
 }
diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index 8a823871..8f8c7227 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -23,7 +23,7 @@
         INNER JOIN OPERATION OP ON OP.SITE = ZT.SITE AND OP.OPERATION = ZT.OPERATION AND OP.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE AND OT.LOCALE = 'zh'
         INNER JOIN RESRCE RS ON RS.SITE = ZT.SITE AND RS.RESRCE = ZT.RESRCE
-        LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZT.CREATE_USER
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZT.MODIFY_USER
         INNER JOIN Z_SFC_DISPATCH zsd ON zsd.HANDLE = ZT.SFC_DISPATCH_BO
         LEFT JOIN Z_ABNORMAL_BILL zab ON zab.OBJECT_BO = ZT.HANDLE
         WHERE ZT.SITE = #{site}
diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml
index 10cf3217..31107874 100644
--- a/console/src/main/resources/application-local.yml
+++ b/console/src/main/resources/application-local.yml
@@ -6,7 +6,7 @@ spring:
       primary: wip #设置默认的数据源或者数据源组,默认值即为master
       datasource:
         wip:
-          url: jdbc:oracle:thin:@113.98.201.217:1521/ORD
+          url: jdbc:oracle:thin:@172.16.251.133:1521/ORQ
           username: wip
           password: wip
           driver-class-name: oracle.jdbc.OracleDriver
diff --git a/console/src/main/resources/application.yml b/console/src/main/resources/application.yml
index c9cd59e3..29ee7c20 100644
--- a/console/src/main/resources/application.yml
+++ b/console/src/main/resources/application.yml
@@ -36,7 +36,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
 #    active: prd
-#     active: qas
+#    active: qas
     active: local
 #    active: dev
   # 文件上传
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java
index 9d8fee61..ece9344b 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java
@@ -5,6 +5,7 @@ import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +37,7 @@ public interface SfcDispatchService extends IService<SfcDispatch> {
      * @param paramMap
      * @return
      */
-    List<SfcDispatchDto> findSfcDispatchList(Map paramMap);
+    List<SfcDispatchDto> findSfcDispatchList(Map paramMap) throws IOException;
 
     /**
      * 派工保存
@@ -108,7 +109,7 @@ public interface SfcDispatchService extends IService<SfcDispatch> {
      * @param paramMap
      * @return
      */
-    Map<String, Object> ganttList(String site, Map paramMap);
+    Map<String, Object> ganttList(String site, Map paramMap) throws IOException;
 
 
 }
\ No newline at end of file
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 f26d04a7..28de0ef8 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
@@ -8,18 +8,16 @@ import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.common.ftp.CappFtpClient;
 import com.foreverwin.mesnac.common.service.ProdReadyTaskService;
 import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
-import com.foreverwin.mesnac.common.util.DateUtil;
-import com.foreverwin.mesnac.common.util.ExcelUtils;
-import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.common.util.*;
 import com.foreverwin.mesnac.dispatch.dto.RouterDTO;
 import com.foreverwin.mesnac.dispatch.dto.SfcDispatchEmployeeDto;
 import com.foreverwin.mesnac.dispatch.dto.WorkCenterWorkTimeDTO;
 import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper;
 import com.foreverwin.mesnac.dispatch.model.CallItem;
 import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
-import com.foreverwin.mesnac.dispatch.model.SfcDispatchEmployee;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.dispatch.service.*;
 import com.foreverwin.mesnac.meapi.dto.WorkCenterLinkDTO;
@@ -30,6 +28,7 @@ import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.net.ftp.FTPClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,7 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
+import java.net.InetAddress;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -87,6 +86,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     private ProductionCalendarService productionCalendarService;
     @Autowired
     private SfcDispatchEmployeeService sfcDispatchEmployeeService;
+    @Autowired
+    private CappFtpClient cappFtpClient;
 
     @Override
     public List<SfcDispatch> findSfcDispatch(String site, String sfc, String operation, String stepId) {
@@ -94,24 +95,11 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     }
 
     @Override
-    public List<SfcDispatchDto> findSfcDispatchList(Map paramMap) {
+    public List<SfcDispatchDto> findSfcDispatchList(Map paramMap) throws IOException {
         List<SfcDispatchDto> list = sfcDispatchMapper.findSfcDispatchList(paramMap);
         if (list == null || list.size() <= 0) {
-//            List<SfcDispatchDto> sfcDispatchDtoList=new ArrayList<>();
-//            for(SfcDispatchDto sfcDispatchDto:list){
-//                Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(CommonMethods.getSite(), sfcDispatchDto.getSfc()));
-//                if (sfcServiceById==null){
-//                    sfcDispatchDto.setDrawingsRevision(null);
-//                }else {
-//                    String itemBo = sfcServiceById.getItemBo();
-//                    String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo)+"/";
-//                    sfcDispatchDto.setDrawingsRevision(path);
-//                }
-//                sfcDispatchDtoList.add(sfcDispatchDto);
-//            }
             return list;
         }
-
         //查询用户对应用户组
         String site = CommonMethods.getSite();
         String user = CommonMethods.getUser();
@@ -136,10 +124,26 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                 }
             }
         }
-
-        //赋值用户组
-        for (SfcDispatchDto sfcDispatch: list) {
-            sfcDispatch.setRole(role);
+        GetDrawingVersionUtil getDrawingVersionUtil=new GetDrawingVersionUtil();
+        //登录Capp的FTP文件服务器
+        FTPClient connect = null;
+        try {
+            connect = cappFtpClient.login();
+            for (SfcDispatchDto sfcDispatch : list) {
+                if (sfcDispatch.getDrawingsRevision()==null||sfcDispatch.getDrawingsRevision()==""){
+                    Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(CommonMethods.getSite(), sfcDispatch.getSfc()));
+                    String itemBo = sfcServiceById.getItemBo();
+                    sfcDispatch.setDrawingsRevision(getDrawingVersionUtil.GetDrawingVerson(itemBo, connect));
+                    sfcDispatch.setRole(role);
+                }
+            }
+        }catch (Exception e){
+            ExceptionUtil.throwException(e);
+        }finally {
+            if (connect!=null&&connect.isConnected()){
+                connect.logout();
+                connect.disconnect();
+            }
         }
         return list;
     }
@@ -216,7 +220,6 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             if (!DispatchStatusEnum.NEW.getCode().equals(status) && !DispatchStatusEnum.RELEASE.getCode().equals(status)) {
                 throw BusinessException.build("工单[" + shopOrder + "]的派工单[" + dispatchNo + "]派工状态不是新建或发布状态，不能变更为暂挂！");
             }
-
             sfcDispatch = new SfcDispatch();
             sfcDispatch.setHandle(sfcDispatchDto.getHandle());
             sfcDispatch.setDispatchStatus(DispatchStatusEnum.PAUSE.getCode());
@@ -250,10 +253,10 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             }
 
             //校验派工单领料状态为无需叫料或未叫料
-            List<CallItem> callItemList = callItemService.getEffectedCallItemByDispatchBo(sfcDispatchBo);
-            if (callItemList != null && callItemList.size() > 0) {
-                throw BusinessException.build("工单[" + shopOrder + "]的派工单[" + dispatchNo + "]已有发料，不能取消！");
-            }
+//            List<CallItem> callItemList = callItemService.getEffectedCallItemByDispatchBo(sfcDispatchBo);
+//            if (callItemList != null && callItemList.size() > 0) {
+//                throw BusinessException.build("工单[" + shopOrder + "]的派工单[" + dispatchNo + "]已有发料，不能取消！");
+//            }
 
 
             sfcDispatch = new SfcDispatch();
@@ -303,7 +306,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     }
 
     @Override
-    public Map<String, Object> ganttList(String site, Map paramMap) {
+    public Map<String, Object> ganttList(String site, Map paramMap) throws IOException {
         Map<String, Object> map = new HashMap<>();
 
         //查询派工数据
@@ -637,6 +640,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             sfcDispatch.setEmployee(employees);
             sfcDispatch.setEmployeeDescription(sfcDispatchDto.getEmployeeDescription());
             sfcDispatch.setRemark(sfcDispatchDto.getRemark());
+            sfcDispatch.setDrawingsRevision(sfcDispatchDto.getDrawingsRevision());
             sfcDispatch.setBlankingSize(sfcDispatchDto.getBlankingSize());
             sfcDispatch.setPlannedStartDate(sfcDispatchDto.getPlannedStartDate());
             sfcDispatch.setPlannedCompDate(sfcDispatchDto.getPlannedCompDate());
@@ -907,6 +911,4 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
         }
         return result;
     }
-
-
 }
\ No newline at end of file
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index 96bd21a0..c1c9da49 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -679,7 +679,7 @@
                          WHEN WIP.DISPATCH_STATUS = 'PAUSE' THEN N'暂停' WHEN WIP.DISPATCH_STATUS = 'RELEASE' THEN N'发布'
                          END  AS STATUS_NAME, 'ADMINISTRATOR' AS ROLE
             FROM (
-                SELECT 	SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, SD.ROUTER_BO, C2.VALUE ITEM_NUMBER, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
+                SELECT 	SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, SD.ROUTER_BO, C2.VALUE ITEM_NUMBER, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,SD.DRAWINGS_REVISION,
                         SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE USER_NAME, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION RESOURCE_DESCRIPTION,
                         CASE WHEN SD.DISPATCH_STATUS = 'COMPLETE' THEN SD.DISPATCH_QTY ELSE 0 END COMPLETED_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
                         SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.DISPATCH_SEQ-1 BEFORE_SEQ, SD.DISPATCH_SEQ+1 AFTER_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
@@ -777,7 +777,7 @@
                 <if test="completeToDate != null">
                     AND SD.PLANNED_COMP_DATE &lt;= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
                 </if>
-                GROUP BY  SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, SD.ROUTER_BO, C2.VALUE, C1.VALUE, IM.HANDLE, IM.ITEM, IT.DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
+                GROUP BY  SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, SD.ROUTER_BO, C2.VALUE, C1.VALUE, IM.HANDLE, IM.ITEM, IT.DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,SD.DRAWINGS_REVISION,
                           SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION,
                           SD.DISPATCH_STATUS, SD.DISPATCH_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
                           SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
index da37e95e..848dd89e 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
@@ -9,7 +9,10 @@ import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import com.sap.me.status.StatusBOHandle;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  *
@@ -89,7 +92,7 @@ public class ShopOrderController {
      * 查出只有异常的工单
      */
     @GetMapping("/findAbnormalShopOrder")
-    public R findAbnormalShopOrder(String type, ShopOrder shopOrder){
+    public R findAbnormalShopOrder(String type,ShopOrder shopOrder){
         return R.ok(shopOrderService.findAbnormalShopOrder(type,shopOrder));
     }
 
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
index 65ef6ee2..6d315b42 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
@@ -136,8 +136,6 @@ public class ShopOrder extends Model<ShopOrder> {
    private Double maximumDeliveryQty;
    @TableField("TOLERANCE_DEFINED_IN")
    private String toleranceDefinedIn;
-   //异常类型，查询异常工单时传参
-   private String type;
 
    public String getType() {
       return type;
@@ -147,6 +145,10 @@ public class ShopOrder extends Model<ShopOrder> {
       this.type = type;
    }
 
+   //异常类型，查询异常工单时传参
+   private String type;
+
+
    public String getHandle() {
       return handle;
    }
@@ -761,7 +763,6 @@ public static final String TOLERANCE_DEFINED_IN = "TOLERANCE_DEFINED_IN";
          ", minimumDeliveryQty = " + minimumDeliveryQty +
          ", maximumDeliveryQty = " + maximumDeliveryQty +
          ", toleranceDefinedIn = " + toleranceDefinedIn +
-         ", type = " + type +
          "}";
    }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcDispatchDrawingService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcDispatchDrawingService.java
new file mode 100644
index 00000000..f1db9b3d
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcDispatchDrawingService.java
@@ -0,0 +1,31 @@
+package com.foreverwin.mesnac.meapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import com.foreverwin.mesnac.meapi.model.SfcDispatchDrawing;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-06-02
+ */
+public interface SfcDispatchDrawingService extends IService<SfcDispatchDrawing> {
+
+
+    /**
+     * 查询派工数据
+     *
+     * @param site
+     * @param sfc
+     * @param operation  非必须
+     * @param stepId  非必须
+     * @return
+     */
+    SfcDispatchDrawing findSfcDispatch(String site, String sfc, String operation, String stepId);
+
+}
\ No newline at end of file
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
index 47c5c856..eaf41cc1 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
@@ -165,10 +165,12 @@ public class PodTemplateServiceImpl implements PodTemplateService {
         if (resultMap == null) {
             throw new BaseException("根据当前资源未找到条码[" + sfc + "]的基本信息！");
         }
+        if(resultMap.get("EMPLOYEE_DESCRIPTION")==null||resultMap.get("EMPLOYEE_DESCRIPTION").equals("")){
+            throw new BaseException("产品条码[" + sfc + "]的操作人员为空！请联系调度人员维护！");
+        }
         //List<Map<String, Object>> substepList = sfcCrossMapper.querySfcStep(site, sfc, operationBySfcBo.getOperation());
         List<Map<String, Object>> substepList = new ArrayList<>();
         resultMap.put("SFC_STEP_LIST", substepList);
-
         //是否需要自检和互检
         String isCreateH = "N";
         String isCreateZ = "N";
@@ -284,7 +286,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
         }
         BigDecimal workHour=BigDecimal.ZERO;
         BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString());
-        if (!operation.equals("WX_6106GX")) {
+        if (!operation.equals("WX_6106GX")&&!operation.equals("HJ_6106JYGX")&&!operation.equals("HJ_6106JRGX")) {
             //是否有自检检验项目
             List<InspectionItemDetail> inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_Z);
             if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) {
diff --git a/production/src/main/resources/mapper/SfcCrossMapper.xml b/production/src/main/resources/mapper/SfcCrossMapper.xml
index 1530d3b5..1a88e754 100644
--- a/production/src/main/resources/mapper/SfcCrossMapper.xml
+++ b/production/src/main/resources/mapper/SfcCrossMapper.xml
@@ -94,7 +94,7 @@
             CASE WHEN ST.STATUS='403' AND SS.QTY_IN_QUEUE > 0 THEN N'402' ELSE ST.STATUS END STATUS,
             OP.OPERATION, OT.DESCRIPTION OPERATION_DESC,OP.OPERATION||'/'||RS.STEP_ID OPERATION_STEP,
             RO_CF2.VALUE TOOL ,SOD.HANDLE SFC_DISPATCH_DETAIL_BO,SOD.WORK_CENTER,SOD.PROD_HOURS,
-            S.SFC,S.QTY SFC_QTY,RS.STEP_ID, SOD.DISPATCH_NO ,
+            S.SFC,S.QTY SFC_QTY,RS.STEP_ID, SOD.DISPATCH_NO ,SOD.EMPLOYEE_DESCRIPTION,
             TO_CHAR( SOD.PLANNED_START_DATE + INTERVAL '8' HOUR,'yyyy-mm-dd hh24:mi:ss')START_DATE,
             TO_CHAR(SOD.PLANNED_COMP_DATE + INTERVAL '8' HOUR ,'yyyy-mm-dd hh24:mi:ss')COMP_DATE,
             TO_CHAR((SOD.PLANNED_COMP_DATE - SOD.PLANNED_START_DATE )*24,'fm9999999990.00')||'H' ADD_DATE,
@@ -117,7 +117,7 @@
         INNER JOIN ITEM I ON I.HANDLE = S.ITEM_BO
         LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE =#{locale}
         INNER JOIN (
-            SELECT SD.HANDLE, SD.SFC,SD.RESRCE,SD.OPERATION,SD.STEP_ID,SD.PLANNED_COMP_DATE, SD.PLANNED_START_DATE,SD.DISPATCH_NO,SD.WORK_CENTER,SD.PROD_HOURS
+            SELECT SD.HANDLE, SD.SFC,SD.RESRCE,SD.OPERATION,SD.STEP_ID,SD.PLANNED_COMP_DATE, SD.PLANNED_START_DATE,SD.DISPATCH_NO,SD.WORK_CENTER,SD.PROD_HOURS,SD.EMPLOYEE_DESCRIPTION
             FROM Z_PROD_READY_TASK RB
             INNER JOIN Z_SFC_DISPATCH SD ON SD.HANDLE = RB.SFC_DISPATCH_BO
             WHERE RB.SITE =#{site} AND RB.STATUS = 'FINISH' AND RB."RESULT"='OK'