Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

6 天以前 1de6b39bfe3967916dcab8122be0d69fbaba8cca

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java

@@ -500,12 +500,13 @@
                            .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                            .eq(Loc::getAreaId, area)
                    );
                    if (null != orgMoveLoc){
                        if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                            break;
                        }
                    }

                    if (!Cools.isEmpty(locMast2)) {
                        if (null != orgMoveLoc){
                            if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                break;
                            }
                        }
                        loc = locMast2;
                        break;
                    }
@@ -516,7 +517,13 @@
                            .in(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type, LocStsType.LOC_STS_TYPE_F.type)
                            .eq(Loc::getAreaId, area)
                    );

                    if (!Cools.isEmpty(locMast2)) {
                        if (null != orgMoveLoc){
                            if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                break;
                            }
                        }
                        loc = locMast1;
                        break;
                    } else {
@@ -525,12 +532,13 @@
                                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                                .eq(Loc::getAreaId, area)
                        );
                        if (null != orgMoveLoc){
                            if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                break;
                            }
                        }

                        if (!Cools.isEmpty(locMast2)) {
                            if (null != orgMoveLoc){
                                if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                    break;
                                }
                            }
                            loc = locMast2;
                            break;
                        }
@@ -549,12 +557,13 @@
                                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                                .eq(Loc::getAreaId, area)
                        );
                        if (null != orgMoveLoc){
                            if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                break;
                            }
                        }

                        if (!Cools.isEmpty(locMast2)) {
                            if (null != orgMoveLoc){
                                if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                    break;
                                }
                            }
                            loc = locMast2;
                            break;
                        } else {
@@ -563,12 +572,13 @@
                                    .in(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type, LocStsType.LOC_STS_TYPE_D.type)
                                    .eq(Loc::getAreaId, area)
                            );
                            if (null != orgMoveLoc){
                                if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                    break;
                                }
                            }

                            if (!Cools.isEmpty(locMast2)) {
                                if (null != orgMoveLoc){
                                    if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
                                        break;
                                    }
                                }
                                loc = locMast1;
                                break;
                            }