自动化立体仓库 - WMS系统
野心家
2025-01-03 fcdfbff0b969b8a5934cbaf1e8a46218dd903dd7
优化自动出库
4个文件已修改
25 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locDetl/locDetl.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/locDetlQuery.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
@@ -48,7 +48,7 @@
    /**
     * 自动出满托
     */
    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    private void execute(){
        Config config = configService.selectConfigByCode("AutomaticOutboundShipment");
        if(config.getStatus()==0){
@@ -58,7 +58,16 @@
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200));
        if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
            //找到入库最早的
            LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time"));
            List<LocDetl> locDetlss = locDetlService.selectList(new EntityWrapper<LocDetl>().orderBy("appe_time"));
            LocMast locMastIoTime=new LocMast();
            for (LocDetl locDetl : locDetlss) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                if(!Cools.isEmpty(locMast)&&locMast.getLocSts().equals("F")){
                    locMastIoTime=locMast;
                    break;
                }
            }
//            LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time"));
            //最早入库的可能不是最靠近出库口的,所以需要再去找这层最靠近出库口的货
            LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("lev1",locMastIoTime.getLev1()).orderBy("bay1",false));
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -77,7 +77,7 @@
                            return FAIL.setMsg("空板入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                    }
                    basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
                    basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",100));
                    break;
                // 全板入库
                case 1:
@@ -148,7 +148,7 @@
                            return FAIL.setMsg("全板入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                    }
                    basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
                    basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",200));
                    break;
                // 拣料入库
                case 53:
@@ -300,7 +300,7 @@
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setIoTime(now);
//                    locMast.setIoTime(now);
                    locMast.setModiTime(now);
                    if (!locMastService.updateById(locMast)) {
//                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -314,7 +314,7 @@
            if(!Cools.isEmpty(basDevp)){
                basDevp.setLoading("N");
                basDevp.setModiTime(now);
                basDevpService.update(basDevp,new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
                basDevpService.update(basDevp,new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceStaNo()));
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(5L);
src/main/webapp/static/js/locDetl/locDetl.js
@@ -40,7 +40,7 @@
    // cols.push.apply(cols, detlCols);
    cols.push({field: 'modiUser$', align: 'center',title: '修改人员',hide: true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间'}
        ,{field: 'appeTime$', align: 'center',title: '创建时间'}
    )
    return cols;
}
src/main/webapp/views/pakStore/locDetlQuery.html
@@ -117,7 +117,7 @@
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'})
            ,{field: 'appeTime$', align: 'center',title: '创建时间'})
        return cols;
    }