#

luxiaotao1123

2022-11-09 81e09b127a9169756fde3fb8fc9ce2a73e670fdd

#

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

@@ -1250,8 +1250,6 @@
                    }
                }

            } else {
                // todo
            }
            // 不是最外层库位，需要使用穿梭车搬运后，再堆垛机移库
        } else {
@@ -1392,13 +1390,13 @@
                            }
                        }
                        LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                        if(sourceLoc.getLocSts().equals("F")){
//                        if(sourceLoc.getLocSts().equals("F")){
                            sourceLoc.setLocSts("R"); // R.出库预约
                            sourceLoc.setModiTime(new Date());
                            if (!locMastService.updateById(sourceLoc)) {
                                throw new CoolException("更新移库回库目标库位状态失败");
                            }
                        }
//                        }
                        break;
                    }
                }
@@ -2424,6 +2422,12 @@
//                        }
                        if (locMastService.isOutMost(wrkMast.getLocNo())) {
                            wrkMast.setWrkSts(17L);
//                            LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
//                            locMast.setLocSts("F");
//                            locMast.setModiTime(new Date());
//                            if (!locMastService.updateById(locMast)) {
//                                log.error("");
//                            }
                        }
                        wrkMast.setModiTime(now);
                        // 修改成功后复位堆垛机