#

18516761980

2022-10-06 61be76023c66950644c02ac3d69f21aab58447c3

#

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

@@ -1,6 +1,7 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -266,9 +267,13 @@
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.infoReview(param);

        return R.ok();
        TestMast testMast = openService.infoReview(param);
        if (testMast.getStatus()==3){
            return R.ok();
        }else if (testMast.getStatus()==2){
            return R.error("等待员工操作");
        }
        return R.error();
    }
    @PostMapping("/rpv/testFinish/auth/v1")
//    @AppAuth(memo = "测试完成")

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -54,7 +54,7 @@
    /**
     * pda测试复核调用接口
     */
    void infoReview(Review review);
    TestMast infoReview(Review review);
    /**
     * pda测试完成
     */

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

@@ -623,12 +623,12 @@
    @Transactional
    public void startUpTestPACK(TestMast testMast) {

        //启动测试请求
//        ReturnT<String> result=startUpTestPACK1(testMast);
//        if (!result.isSuccess()) {
//            log.error("测试申请失败", testMast.getBarcode());
//            throw new CoolException("测试申请失败");
//        }
//        启动测试请求
        ReturnT<String> result=startUpTestPACK1(testMast);
        if (!result.isSuccess()) {
            log.error("测试申请失败", testMast.getBarcode());
            throw new CoolException("测试申请失败");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
        if (Cools.isEmpty(locMast)) {
            throw new CoolException(BaseRes.PARAM);

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

@@ -722,7 +722,7 @@

    @Override
    @Transactional
    public void infoReview(Review review) {
    public TestMast 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码不同");
@@ -731,13 +731,22 @@
                .eq("loc_no", review.getLocNo())
                .eq("barcode", review.getBarcode())
                .eq("user_Id", review.getUserId());
        if (null == locMast ||locMast.getPackStatus()!=1) {
            throw new CoolException("产品状态不是 1:待测试");
        }
        TestMast testMast = testMastService.selectOne(wrapper);
        if (null == locMast) {
            throw new CoolException("产品状态为空");
        }else if (locMast.getPackStatus()==2){
            if (!Cools.isEmpty(testMast)){
                if (testMast.getStatus()==2 || testMast.getStatus()==3){
                    return testMast;
                }
            }
        }else if (locMast.getPackStatus()!=1){
            throw new CoolException("产品状态不是1待测试");
        }

        if(null != testMast){
            if (testMast.getStatus()==1){
                testMast.setStatus(3);
                testMast.setStatus(2);
                testMast.setModiTime(new Date());
                if (!testMastService.update(testMast,wrapper)){
                    throw new CoolException("更新测试状态失败");
@@ -752,7 +761,7 @@
                if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更新产品状态失败");
                }
            }else if (Cools.isEmpty(testMast.getStatus())){
            } else if (Cools.isEmpty(testMast.getStatus())){
                throw new CoolException("状态异常");
            }else {
                throw new CoolException("状态不是 1:申请中");
@@ -760,6 +769,7 @@
        } else {
            throw new CoolException("测试申请复核失败");
        }
        return testMast;
    }



 src/main/resources/application.yml

@@ -62,6 +62,6 @@
ren:
  url: 172.28.15.251:7899
  # 启动测试请求
  startUpTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
  startUpTestPACK: ynwms/open/asrs/rpv/test/open/auth
  #暂停测试
  suspendTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
  suspendTestPACK: ynwms/open/asrs/rpv/test/open/auth