#

18516761980

2022-10-07 dd2aa5252295dd138a225c101732bef9695567d1

#

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -24,6 +24,7 @@
import com.zy.common.model.WrkDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import com.zy.common.web.param.SearchLocParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -340,7 +341,8 @@
    }
    @PostMapping("/test/suspend/auth")
//    @ManagerAuth(memo = "暂停测试")
    public synchronized R suspendTestPACK() {
    @ResponseBody
    public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
        mobileService.suspendTestPACK();  //请求暂停测试
        return R.ok();
    }

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

@@ -343,6 +343,10 @@
                return "静置中";
            case 5:
                return "静置完成";
            case 6:
                return "暂停测试";
            case 7:
                return "紧急出库";
            default:
                return String.valueOf(this.packStatus);
        }

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

@@ -46,10 +46,10 @@
            Date now = new Date();
            //优先级99，出库站109：消防箱，101
            for(LocMast locMast : locMasts){
                if (locMast.getPackStatus()==2){
                    //向显示屏发信息
                }else {
                    //向显示屏发信息
                if (locMast.getPackStatus()==2){//2.测试中
                    continue;
                }else if (locMast.getPackStatus()==3){//3.测试完成
                    continue;
                }
                // 生成工作号
                int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));