diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 1f213f8b3..29b192074 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -71,7 +71,6 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.util.StopWatch;
 import weaver.conn.RecordSet;
-import weaver.conn.RecordSetDataSource;
 import weaver.formmode.setup.ModeRightInfo;
 import weaver.general.BaseBean;
 import weaver.general.TimeUtil;
@@ -1583,34 +1582,55 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
     private List<MzgCpddData> getERPCpddDataByDate(Date firstDayDateOfMonth, Date lastDayDateOfMonth) {
         // 获取erp中产品订单表数据
         BaseBean baseBean = new BaseBean();
-        String dataSource = baseBean.getPropValue("mzgSalaryReport", "erp_datasource_name");
-        RecordSetDataSource erpRs = new RecordSetDataSource(dataSource);
-        String sql = "select a.JOURNALID,d.ProdPoolId 部门,case when d.ProdPoolId ='包二课' then IWS_MakeUpTypeId else d.ProdPoolId end  制作组别,b.ProdId 生产工单号, " +
-                " b.IWS_ItemId 物料编号,d.IWS_Spec 产品型号,d.Name 物料名称,d.IWS_DrawingId 图纸编号, b.QtyGood 入库数量,d.QtySched 数量, b.TransDate 日期 " +
-                "from ProdJournalTable a,ProdJournalProd b,INVENTDIM c,prodtable d  " +
-                "where a.JOURNALID=b.JOURNALID and a.DATAAREAID ='mg' and b.DATAAREAID ='mg' and c.DATAAREAID ='all'  " +
-                "and a.JournalNameId in ('Finish') and c.INVENTLOCATIONID not like '%xb' " +
-                "and b.INVENTDIMID =c.INVENTDIMID   and a.POSTED =1 and b.QtyGood<>0 " +
-                "and d.DATAAREAID ='mg' and d.prodid=b.prodid and d.ProdPoolId NOT in ('开发课','模具课','下料课','外协') " +
-                "and b.TransDate >=? and b.TransDate <= ? order by b.TransDate desc";
-        erpRs.executeQueryWithDatasource(sql, dataSource, new Object[]{SalaryDateUtil.getFormatLocalDateTime(firstDayDateOfMonth), SalaryDateUtil.getFormatLocalDateTime(lastDayDateOfMonth)});
+        RecordSet rs = new RecordSet();
+        String sql = "select JOURNALID,bm,zzzb,scdgh,wlbh,cpxh,wlmc,tzbh,rksl,sl,rq from uf_cpddbtb where rq >= ? and rq <= ? ORDER BY rq desc";
+        rs.executeQuery(sql, new Object[]{SalaryDateUtil.getFormatLocalDateTime(firstDayDateOfMonth), SalaryDateUtil.getFormatLocalDateTime(lastDayDateOfMonth)});
         List<MzgCpddData> mzgCpddDataList = new ArrayList<>();
-        while (erpRs.next()) {
+        while (rs.next()) {
             mzgCpddDataList.add(MzgCpddData.builder()
-                    .journalid(erpRs.getString("JOURNALID"))
-                    .bm(erpRs.getString("部门"))
-                    .zzzb(erpRs.getString("制作组别"))
-                    .scgdh(erpRs.getString("生产工单号"))
-                    .wlbh(erpRs.getString("物料编号"))
-                    .cpxh(erpRs.getString("产品型号"))
-                    .wlmc(erpRs.getString("物料名称"))
-                    .tzbh(erpRs.getString("图纸编号"))
-                    .rksl(erpRs.getString("入库数量"))
-                    .sl(erpRs.getString("数量"))
-                    .rq(SalaryDateUtil.stringToDate(erpRs.getString("日期")))
+                    .journalid(rs.getString("JOURNALID"))
+                    .bm(rs.getString("bm"))
+                    .zzzb(rs.getString("zzzb"))
+                    .scgdh(rs.getString("scdgh"))
+                    .wlbh(rs.getString("wlbh"))
+                    .cpxh(rs.getString("cpxh"))
+                    .wlmc(rs.getString("wlmc"))
+                    .tzbh(rs.getString("tzbh"))
+                    .rksl(rs.getString("rksl"))
+                    .sl(rs.getString("sl"))
+                    .rq(SalaryDateUtil.stringToDate(rs.getString("rq")))
                     .build());
         }
         return mzgCpddDataList;
+
+        // String dataSource = baseBean.getPropValue("mzgSalaryReport", "erp_datasource_name");
+        // RecordSetDataSource erpRs = new RecordSetDataSource(dataSource);
+        // String sql = "select a.JOURNALID,d.ProdPoolId 部门,case when d.ProdPoolId ='包二课' then IWS_MakeUpTypeId else d.ProdPoolId end  制作组别,b.ProdId 生产工单号, " +
+        //         " b.IWS_ItemId 物料编号,d.IWS_Spec 产品型号,d.Name 物料名称,d.IWS_DrawingId 图纸编号, b.QtyGood 入库数量,d.QtySched 数量, b.TransDate 日期 " +
+        //         "from ProdJournalTable a,ProdJournalProd b,INVENTDIM c,prodtable d  " +
+        //         "where a.JOURNALID=b.JOURNALID and a.DATAAREAID ='mg' and b.DATAAREAID ='mg' and c.DATAAREAID ='all'  " +
+        //         "and a.JournalNameId in ('Finish') and c.INVENTLOCATIONID not like '%xb' " +
+        //         "and b.INVENTDIMID =c.INVENTDIMID   and a.POSTED =1 and b.QtyGood<>0 " +
+        //         "and d.DATAAREAID ='mg' and d.prodid=b.prodid and d.ProdPoolId NOT in ('开发课','模具课','下料课','外协') " +
+        //         "and b.TransDate >=? and b.TransDate <= ? order by b.TransDate desc";
+        // erpRs.executeQueryWithDatasource(sql, dataSource, new Object[]{SalaryDateUtil.getFormatLocalDateTime(firstDayDateOfMonth), SalaryDateUtil.getFormatLocalDateTime(lastDayDateOfMonth)});
+        // List<MzgCpddData> mzgCpddDataList = new ArrayList<>();
+        // while (erpRs.next()) {
+        //     mzgCpddDataList.add(MzgCpddData.builder()
+        //             .journalid(erpRs.getString("JOURNALID"))
+        //             .bm(erpRs.getString("部门"))
+        //             .zzzb(erpRs.getString("制作组别"))
+        //             .scgdh(erpRs.getString("生产工单号"))
+        //             .wlbh(erpRs.getString("物料编号"))
+        //             .cpxh(erpRs.getString("产品型号"))
+        //             .wlmc(erpRs.getString("物料名称"))
+        //             .tzbh(erpRs.getString("图纸编号"))
+        //             .rksl(erpRs.getString("入库数量"))
+        //             .sl(erpRs.getString("数量"))
+        //             .rq(SalaryDateUtil.stringToDate(erpRs.getString("日期")))
+        //             .build());
+        // }
+        // return mzgCpddDataList;
     }