#

18516761980

2022-10-07 a1baefc4c357760a0faa727e68bc5b5f4feec264

#

 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: 完成  5.已移库")
    private Integer status;

    /**
@@ -99,15 +99,17 @@
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "待申请";
                return "暂停";
            case 1:
                return "申请中";
            case 2:
                return "已复核";
                return "复核中";
            case 3:
                return "测试中";
            case 4:
                return "完成";
            case 5:
                return "已移库";
            default:
                return String.valueOf(this.status);
        }

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

@@ -791,13 +791,8 @@
        if(null != testMast){
            if (testMast.getStatus()==3){
                Date date = new Date();
                testMast.setStatus(4);
                testMast.setModiTime(date);
                if (!testMastService.update(testMast,wrapper)){
                    throw new CoolException("更改测试状态失败");
                }
                locMast.setPackStatus(3);
                testMast.setModiTime(date);
                locMast.setModiTime(date);
                CombParam combParam = new CombParam();
                combParam.setPackNo(locMast.getBarcode());
                combParam.setLocNo(locMast.getLocNo());

 src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java

@@ -50,6 +50,7 @@
                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                            .eq("loc_no",locMast.getLocNo())
                            .eq("barcode",locMast.getBarcode())
                            .eq("status",4)
                    );
                    if (!Cools.isEmpty(testMast)){
                        if (testMast.getStatus()==4){

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -32,7 +33,7 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    private TestMastService testMastService;
    @Autowired
    private OrderDetlService orderDetlService;

@@ -301,6 +302,18 @@
                        locMast.setPackStatus(sourceLoc.getPackStatus());
                    }else {
                        locMast.setPackStatus(4); //4:静置中
                        if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
                            TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no",sourceLoc.getLocNo())
                                    .eq("barcode",locMast.getBarcode())
                                    .eq("status",4)
                            );
                            testMast.setStatus(5);
                            testMast.setModiTime(new Date());
                            if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("loc_no",sourceLoc.getLocNo()).eq("barcode",locMast.getBarcode()).eq("status",4))){
                                throw new CoolException("更改测试状态失败");
                            }
                        }
                    }
                    if (!locMastService.updateById(locMast)) {
//                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());

 src/main/webapp/views/home/navigation.html

@@ -118,9 +118,9 @@
</div>

<div class="center">
    <a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">
        <p>单据管理</p>
    </a>
<!--    <a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">-->
<!--        <p>单据管理</p>-->
<!--    </a>-->
    <a class="list fn_2 moveUpDownFla2" ew-href="wrkMast/wrkMast.html?resourceId=214">
        <p>运行任务</p>
    </a>