Revert "#"

LSH

2022-08-18 a7a5c6df3617f879ed502be8a1895f4bf4be7559

Revert "#"

This reverts commit 1e4fc6b112f7350735aa3666d46e4b1a926ffdf9.

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

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

@@ -667,7 +667,7 @@
                    throw new CoolException("更改测试状态失败");
                }
                locMast.setPackStatus(3);
                if (!locMastService.update(locMast, wrapper)){
                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更改产品状态失败");
                }
            }else if (Cools.isEmpty(testMast.getStatus())){

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

@@ -521,8 +521,10 @@
            throw new CoolException("产品在测试中，禁止库位移栽");
//        }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
//            throw new CoolException("移转库位属于不同堆垛机");
        }else if(sourceLoc.getLocType1()!=loc.getLocType1()){
            throw new CoolException("源库为与目标库位的库位类型不同");
        }else if(sourceLoc.getPackStatus()!=3){
            if(sourceLoc.getLocType1()!=loc.getLocType1()){
                throw new CoolException("源库为与目标库位的库位类型不同");
            }
        }
        Date now = new Date();
        // 获取工作号

 src/main/webapp/static/js/stoMan/stoQue.js

@@ -30,8 +30,10 @@
            ,{field: 'locSts$', align: 'center',title: '库位状态', width: 180, style: 'color: #8E2323'}
            ,{field: 'fireStatus$', align: 'center',title: '消防状态', width: 90, style: 'color: #8E2323'}
            ,{field: 'packStatus$', align: 'center',title: '产品状态', width: 90, style: 'color: #8E2323'}
            ,{field: 'locType1$', align: 'center',title: '库位类型'}
            ,{field: 'locType2$', align: 'center',title: '测试设备号'}
            // ,{field: 'whsType$', align: 'center',title: '库位类型'}
            ,{field: 'crnNo', align: 'center',title: '堆垛机号'}
            // ,{field: 'crnNo', align: 'center',title: '堆垛机号'}
            ,{field: 'row1', align: 'center',title: '排'}
            ,{field: 'bay1', align: 'center',title: '列'}
            ,{field: 'lev1', align: 'center',title: '层'}

 src/main/webapp/views/locMast/locMast_detail.html

@@ -82,7 +82,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>测试状态：</label>
            <label class="layui-form-label"><span class="not-null">*</span>产品状态：</label>
            <div class="layui-input-inline">
                <select id="packStatus" class="layui-input" type="text">
<!--                    <option style="display: none"></option>-->