#

18516761980

2023-03-05 86683aaea7bbe731cc67a077a14c1662882f9389

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -215,7 +215,7 @@
        if (Cools.isEmpty()) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok("组托成功");
        return R.ok().add(openService.outlogERP());
    }



 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java

@@ -60,6 +60,8 @@
    public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
    //不分页查询所有信息，用于excel导出
    public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
    //不分页查询所有信息，ERP调用
    public List<ViewWorkInBean> getViewWorkOutERP();


    // ------图表

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -58,6 +58,6 @@
    /**
     * 出库记录获取
     */
    void outlogERP();
    List<ViewWorkInBean> outlogERP();

}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -603,8 +603,14 @@
     */
    @Override
    @Transactional
    public void outlogERP() {

    public List<ViewWorkInBean> outlogERP() {
        List<ViewWorkInBean> viewWorkInERP = reportQueryMapper.getViewWorkOutERP();
        ArrayList<ViewWorkInBean> viewWorkInBeans = new ArrayList<>();
        for (ViewWorkInBean viewWorkInBean:viewWorkInERP){
            viewWorkInBean.sype();
            viewWorkInBeans.add(viewWorkInBean);
        }
        return viewWorkInBeans;
    }

}

 src/main/resources/mapper/ViewWorkInMapper.xml

@@ -152,4 +152,11 @@
    Order by a.io_time desc
</select>

<!-- 不分页查询所有信息，ERP调用 -->
<select id="getViewWorkOutERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
    select top 100 * from asr_wrkout_view
    where 1=1
    Order by io_time desc
</select>

</mapper>