#

LSH

2023-02-13 8946914db08273d083996bba7189bc70411b0937

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

@@ -24,8 +24,6 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -85,8 +83,6 @@
    private TestMastService testMastService;
    @Autowired
    private WorkService workService;
    @Autowired
    private UserService userService;//只查询  无修改操作

    @Value("${mes.url}")
    private String mesUrl;
@@ -106,7 +102,7 @@
    @Value("${ren.startUpTestPACK}")
    private String startUpTestPACK;

    @Value("${ren.startUpTestPACK}")
    @Value("${ren.suspendTestPACK}")
    private String suspendTestPACK;

    @Value("${mes.inPath}")
@@ -638,16 +634,10 @@
    public void startUpTestPACK(TestMast testMast) {
        if(Cools.isEmpty(testMast.getLocNo())){
            throw new CoolException("库位号为空");
        }else if(Cools.isEmpty(testMast.getChannel())){
        }else if(Cools.isEmpty(testMast.getUserId())){
            throw new CoolException("用户编码为空");
        }else if(Cools.isEmpty(testMast.getBarcode())){
            throw new CoolException("PACK码为空");
        }
        User user = userService.selectOne(new EntityWrapper<User>().eq("username", testMast.getChannel().toString()));
        if (!Cools.isEmpty(user)){
            testMast.setUserId(user.getMobile());
        }else {
            throw new CoolException("未查到用户编号："+testMast.getChannel()+"所属用户码");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("loc_no", testMast.getLocNo())
@@ -725,17 +715,19 @@
            review.setBarcode(testMast.getBarcode());
            review.setChannel(testMast.getChannel().toString());
            review.setRequestTime(DateUtils.convert(new Date()));
            if (testMast.getChannel()>=1 && testMast.getChannel()<=8){
            if (testMast.getChannel()<1 || testMast.getChannel()>48){
                log.error("通道有误，请查看！");
            } else if (testMast.getChannel()<=8){
                renUrl=renUrl1;
            }else if (testMast.getChannel()>=9 && testMast.getChannel()<=16){
            }else if (testMast.getChannel()<=16){
                renUrl=renUrl2;
            }else if (testMast.getChannel()>=17 && testMast.getChannel()<=24){
            }else if (testMast.getChannel()<=24){
                renUrl=renUrl3;
            }else if (testMast.getChannel()>=25 && testMast.getChannel()<=36){
            }else if (testMast.getChannel()<=32){
                renUrl=renUrl4;
            }else if (testMast.getChannel()>=37 && testMast.getChannel()<=40){
            }else if (testMast.getChannel()<=40){
                renUrl=renUrl5;
            }else if (testMast.getChannel()>=41 && testMast.getChannel()<=48){
            }else if (testMast.getChannel()<=48){
                renUrl=renUrl6;
            }
            return postMesData(renUrl,startUpTestPACK,review);
@@ -815,6 +807,8 @@
                case "48":
                    renUrl=renUrl6;
                    break;
                default:
                    log.error("通道有误，请查看！");
            }
            return postMesData(renUrl,suspendTestPACK,review);
        }catch (Exception e) {
@@ -841,6 +835,8 @@
            name="测试系统";
        }else if (URL.equals(renUrl6)){
            name="测试系统";
        }else {
            log.error("查询连接失败，请查看！");
        }
        if(combParam != null){
            String response = "";