Revert "#"

LSH

2022-08-18 2b0fb92e407df0c3abd0ed2f06ae7103c1569281

Revert "#"

This reverts commit 1e4fc6b112f7350735aa3666d46e4b1a926ffdf9.

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

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -242,19 +242,19 @@
        if (null == this.locType2){ return null; }
        switch (this.locType2){
            case 0:
                return "无设备";
                return "";
            case 1:
                return "1号设备";
                return "1号";
            case 2:
                return "2号设备";
                return "2号";
            case 3:
                return "3号设备";
                return "3号";
            case 4:
                return "4号设备";
                return "4号";
            case 5:
                return "5号设备";
                return "5号";
            case 6:
                return "6号设备";
                return "6号";
            default:
                return String.valueOf(this.locType2);
        }

 src/main/java/com/zy/asrs/entity/TestMast.java

@@ -53,7 +53,7 @@
    /**
     * 状态 0: 待申请  1: 申请中  2: 已复核;3  4: 完成  
     */
    @ApiModelProperty(value= "状态 0: 待申请  1: 申请中  2: 已复核 3：测试中  4: 完成  ")
    @ApiModelProperty(value= "状态 0: 待申请  1: 申请中  2: 已复核 3: 测试中  4: 完成  ")
    private Integer status;

    /**

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

@@ -602,10 +602,11 @@
        waitPakin.setIoStatus("N");     // 入出状态
        waitPakin.setAnfme(1.0);  // 数量
        waitPakin.setStatus("Y");    // 状态
        waitPakin.setManuDate(requestTime.toString());
        waitPakin.setAppeUser(null);
        waitPakin.setAppeTime(requestTime);
        waitPakin.setAppeTime(new Date());
        waitPakin.setModiUser(null);
        waitPakin.setModiTime(requestTime);
        waitPakin.setModiTime(new Date());
        waitPakin.setDeadWarn(param.getSettingTimes());
        if (!waitPakinService.insert(waitPakin)) {
            throw new CoolException("保存入库通知档失败");
@@ -615,11 +616,14 @@
    @Override
    @Transactional
    public void infoReview(Review review) {
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
        if (!review.getBarcode().equals(locMast.getBarcode())){
            throw new CoolException("pack码不同");
        }
        Wrapper wrapper = new EntityWrapper<TestMast>()
                .eq("loc_no", review.getLocNo())
                .eq("barcode", review.getBarcode())
                .eq("user_Id", review.getUserId());
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
        if (null == locMast ||locMast.getPackStatus()!=1) {
            throw new CoolException("产品状态不是 1:待测试");
        }
@@ -641,7 +645,7 @@
                throw new CoolException("状态不是 1:申请中");
            }
        } else {
            throw new CoolException("测试申请失败");
            throw new CoolException("测试申请复核失败");
        }
    }

@@ -655,8 +659,10 @@
                .eq("barcode", review.getBarcode())
                .eq("user_Id", review.getUserId());
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
        if (locMast.getPackStatus()!=2){
        if (null == locMast ||locMast.getPackStatus()!=2){
            throw new CoolException("产品状态不是 2:测试中");
        }else if (!review.getBarcode().equals(locMast.getBarcode())){
            throw new CoolException("pack码不同");
        }
        TestMast testMast = testMastService.selectOne(wrapper);
        if(null != testMast){

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

@@ -65,12 +65,12 @@
                <!--                    <option style="display: none"></option>-->
                <option value="">设备号</option>
                <option value="0">静置库位</option>
                <option value="1">1号设备</option>
                <option value="2">2号设备</option>
                <option value="3">3号设备</option>
                <option value="4">4号设备</option>
                <option value="5">5号设备</option>
                <option value="6">6号设备</option>
                <option value="1">1号</option>
                <option value="2">2号</option>
                <option value="3">3号</option>
                <option value="4">4号</option>
                <option value="5">5号</option>
                <option value="6">6号</option>
            </select>
        </div>
    </div>
@@ -173,13 +173,13 @@
            <div class="layui-input-inline">
                <select name="locType2">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">1号设备</option>
                    <option value="2">2号设备</option>
                    <option value="3">3号设备</option>
                    <option value="4">4号设备</option>
                    <option value="5">5号设备</option>
                    <option value="6">6号设备</option>
                    <option value="0"></option>
                    <option value="1">1号</option>
                    <option value="2">2号</option>
                    <option value="3">3号</option>
                    <option value="4">4号</option>
                    <option value="5">5号</option>
                    <option value="6">6号</option>
                </select>
            </div>
        </div>

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

@@ -89,8 +89,9 @@
                    <option value="0">无</option>
                    <option value="1">待测</option>
                    <option value="2">测试中</option>
                    <option value="3">静置中</option>
                    <option value="4">静置完成</option>
                    <option value="3">测试完成</option>
                    <option value="4">静置中</option>
                    <option value="5">静置完成</option>
                </select>
            </div>
        </div>