#

luxiaotao1123

2020-06-23 035bd551cd55080e71687e79c8f5ea59ff542c7a

#

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

@@ -31,6 +31,10 @@
     */
    List<Integer> getAvailableEmptyOutSite();

    /**
     * 目标站点状态检测
     * @param devpNo
     */
    BasDevp checkSiteStatus(Integer devpNo);

}

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

@@ -44,13 +44,13 @@
            throw new CoolException("站点不存在");
        }
        if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
            throw new CoolException("入库站点不是自动状态");
            throw new CoolException("站点不是自动状态");
        }
        if(station.getLoading()==null || !station.getLoading().equals("Y")) {
            throw new CoolException("入库站点无物");
            throw new CoolException("站点无物");
        }
        if(station.getWrkNo()!=null && station.getWrkNo()>0) {
            throw new CoolException("入库站点已有工作号");
            throw new CoolException("站点已有工作号");
        }
        if(wrkMastService.getWorkingMast(devpNo)>0){
            throw new CoolException("同一站点不能同时生成两笔入库工作档");

 src/main/webapp/static/js/wrkDetl/wrkDetl.js

@@ -200,7 +200,7 @@
                    title: '详情',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    shadeClose: true,
                    content: 'wrkDetl_detail.html',
                    success: function(layero, index){
                        setFormVal(layer.getChildFrame('#detail', index), data, true);