Revert "#"

LSH

2022-08-17 3f4805441861005e8f05d2a4d6894b8ea0d6cf54

Revert "#"

This reverts commit 1e4fc6b112f7350735aa3666d46e4b1a926ffdf9.

# Conflicts:
#	src/main/java/com/zy/asrs/task/handler/StandingHandler.java

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

@@ -517,11 +517,12 @@
        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)){
            throw new CoolException("未找到库位");
        }else if (loc.getPackStatus()==2){
        }else if (sourceLoc.getPackStatus()==2){
            throw new CoolException("产品在测试中，禁止库位移栽");
//        }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
//            throw new CoolException("移转库位属于不同堆垛机");
        }else {
        }else if(sourceLoc.getLocType1()!=loc.getLocType1()){
            throw new CoolException("源库为与目标库位的库位类型不同");
        }
        Date now = new Date();
        // 获取工作号