#lsh

18516761980

2022-10-12 ed4cb573a3a7648f169445b648cb5450605f8d2a

#lsh

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

@@ -287,7 +287,7 @@
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (param.getTestResult().equals("ok")){
        if (param.getTestResult().equals("OK")){
            map.put("isComplete",openService.testFinish(param));
        }else {
            map.put("isComplete",false);

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

@@ -86,8 +86,18 @@

    @Value("${mes.url}")
    private String mesUrl;
    @Value("${ren.url}")
    private String renUrl;
    @Value("${ren.url1}")
    private String renUrl1;
    @Value("${ren.url2}")
    private String renUrl2;
    @Value("${ren.url3}")
    private String renUrl3;
    @Value("${ren.url4}")
    private String renUrl4;
    @Value("${ren.url5}")
    private String renUrl5;
    @Value("${ren.url6}")
    private String renUrl6;

    @Value("${ren.startUpTestPACK}")
    private String startUpTestPACK;
@@ -643,9 +653,28 @@
            throw new CoolException("测试申请失败");
        }

        if (!testMastService.insert(testMast)){
            throw new CoolException("添加testMast失败");
        TestMast testMast1 = testMastService.selectOne(new EntityWrapper<TestMast>()
                .eq("loc_no", testMast.getLocNo())
                .eq("barcode", testMast.getBarcode())
                .eq("user_id",testMast.getUserId())
                .eq("channel",locMast.getChannel().toString())
                .lt("status",4)
        );
        if (Cools.isEmpty(testMast1)){
            if (!testMastService.insert(testMast)){
                throw new CoolException("添加testMast失败");
            }
        }else {
            if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
                    .eq("loc_no", testMast.getLocNo())
                    .eq("barcode", testMast.getBarcode())
                    .eq("user_id",testMast.getUserId())
                    .eq("channel",locMast.getChannel().toString())
                    .lt("status",4))){
                throw new CoolException("更新testMast失败");
            }
        }

        locMast.setPackStatus(1);
        locMast.setModiTime(now);

@@ -670,6 +699,7 @@
    }
    @Transactional
    public ReturnT<String> startUpTestPACK1(TestMast testMast){
        String renUrl="";
        try {
            Review review=new Review();
            review.setLocNo(testMast.getLocNo());
@@ -677,6 +707,19 @@
            review.setBarcode(testMast.getBarcode());
            review.setChannel(testMast.getChannel().toString());
            review.setRequestTime(DateUtils.convert(new Date()));
            if (testMast.getChannel()>=1 && testMast.getChannel()<=8){
                renUrl=renUrl1;
            }else if (testMast.getChannel()>=9 && testMast.getChannel()<=16){
                renUrl=renUrl2;
            }else if (testMast.getChannel()>=17 && testMast.getChannel()<=24){
                renUrl=renUrl3;
            }else if (testMast.getChannel()>=25 && testMast.getChannel()<=36){
                renUrl=renUrl4;
            }else if (testMast.getChannel()>=37 && testMast.getChannel()<=40){
                renUrl=renUrl5;
            }else if (testMast.getChannel()>=41 && testMast.getChannel()<=48){
                renUrl=renUrl6;
            }
            return postMesData(renUrl,startUpTestPACK,review);
        }catch (Exception e) {
            log.error("fail", e);
@@ -687,11 +730,74 @@
    }
    @Transactional
    public ReturnT<String> suspendTestPACK1(String channel){
        String renUrl="";
        try {
            Review review=new Review();
            review.setPause("true");
            review.setChannel(channel);
            review.setRequestTime(DateUtils.convert(new Date()));
            switch (channel){
                case "1":
                case "2":
                case "3":
                case "4":
                case "5":
                case "6":
                case "7":
                case "8":
                    renUrl=renUrl1;
                    break;
                case "9":
                case "10":
                case "11":
                case "12":
                case "13":
                case "14":
                case "15":
                case "16":
                    renUrl=renUrl2;
                    break;
                case "17":
                case "18":
                case "19":
                case "20":
                case "21":
                case "22":
                case "23":
                case "24":
                    renUrl=renUrl3;
                    break;
                case "25":
                case "26":
                case "27":
                case "28":
                case "29":
                case "30":
                case "31":
                case "32":
                    renUrl=renUrl4;
                    break;
                case "33":
                case "34":
                case "35":
                case "36":
                case "37":
                case "38":
                case "39":
                case "40":
                    renUrl=renUrl5;
                    break;
                case "41":
                case "42":
                case "43":
                case "44":
                case "45":
                case "46":
                case "47":
                case "48":
                    renUrl=renUrl6;
                    break;
            }
            return postMesData(renUrl,suspendTestPACK,review);
        }catch (Exception e) {
            log.error("fail", e);
@@ -705,7 +811,17 @@
        String name="";
        if (URL.equals(mesUrl)){
            name="mes系统";
        }else if (URL.equals(renUrl)){
        }else if (URL.equals(renUrl1)){
            name="测试系统";
        }else if (URL.equals(renUrl2)){
            name="测试系统";
        }else if (URL.equals(renUrl3)){
            name="测试系统";
        }else if (URL.equals(renUrl4)){
            name="测试系统";
        }else if (URL.equals(renUrl5)){
            name="测试系统";
        }else if (URL.equals(renUrl6)){
            name="测试系统";
        }
        if(combParam != null){

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

@@ -816,7 +816,7 @@
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(3);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                postMesData(inpath,combParam);
//                postMesData(inpath,combParam);
                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更改产品状态失败");
                }

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

@@ -71,12 +71,15 @@
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    result = postMesData(inpath,combParam);
                    // 保存入库通知档历史档
                    if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                        exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                    // 删除入库通知档
                    if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                        exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                    WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
                    if (pakin!=null){
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                }
            } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){

 src/main/resources/application.yml

@@ -60,7 +60,18 @@
  outPath: mes-pm/in/stock/condition/exWarehouse

ren:
  url: 172.28.15.196:12784
  # 1~8通道
  url1: 172.28.15.196:12784
  # 9~16通道
  url2: 172.28.15.197:12784
  # 17~24通道
  url3: 172.28.15.198:12784
  # 25~32通道
  url4: 172.28.15.199:12784
  # 33~40通道
  url5: 172.28.15.200:12784
  # 41~48通道
  url6: 172.28.15.201:12784
  # 启动测试请求
  startUpTestPACK: TestStart
  #暂停测试