zjj
2024-06-19 2028b51aeda2b6b23fda4183875b145d5e83822f
Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
1个文件已修改
10 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2588,9 +2588,17 @@
                        //判断工作结束位置状态
                        BasDevp devNo = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", wrkMastSta.getStaEnd()));
                        if (!Cools.isEmpty(devNo)){
                            if (devNo.getAutoing().equals("Y") || !devNo.getWrkNo().equals(0) || !devNo.getLoading().equals("N") || !devNo.getInEnable().equals("Y")){
                            if (devNo.getAutoing().equals("Y") && !devNo.getWrkNo().equals(0) && !devNo.getLoading().equals("N")){
                                continue;
                            }
                            if (!devNo.getAutoing().equals("Y") || !devNo.getWrkNo().equals(0) || !devNo.getLoading().equals("N")){
                                continue;
                            }
                            if (devNo.getDevNo()==113){
                                if (!devNo.getOutEnable().equals("Y")){
                                    continue;
                                }
                            }
                        }
                        boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发
                        wrkEnable = true;