Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs

野心家

2023-09-01 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0

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

@@ -525,8 +525,8 @@
//        }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
//            throw new CoolException("移转库位属于不同堆垛机");
        }else if(sourceLoc.getPackStatus()!=3){
            if(sourceLoc.getLocType1()!=loc.getLocType1()){
                throw new CoolException("源库为与目标库位的库位类型不同");
            if(sourceLoc.getLocType1()==loc.getLocType1()){
                throw new CoolException("源库为与目标库位的库位类型相同");
            }
        }
        Date now = new Date();