#

野心家

2023-09-08 540a4f2b0b03b60fd94bdb9067ef8b26d23967c0

#

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

@@ -678,14 +678,14 @@
        if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
            log.error("申请测试失败");
        }
        //3.开始测试上报
        CombParam combParam = new CombParam();
        combParam.setPackNo(testMast.getBarcode());
        combParam.setLocNo(locMast.getLocNo());
        combParam.setPackSts(0);
        combParam.setStepSts(3);
        combParam.setRequestTime(DateUtils.convert(now));
        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
//        //3.开始测试上报
//        CombParam combParam = new CombParam();
//        combParam.setPackNo(testMast.getBarcode());
//        combParam.setLocNo(locMast.getLocNo());
//        combParam.setPackSts(0);
//        combParam.setStepSts(3);
//        combParam.setRequestTime(DateUtils.convert(now));
//        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

    }
    @Override

 src/main/java/com/zy/asrs/task/StandingScheduler.java

@@ -20,7 +20,7 @@
    /**
     *
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    //@Scheduled(cron = "0/5 * * * * ? ")
    private void execute() {
        //if (confirmDeep) return;


 src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java

File was deleted

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

@@ -160,6 +160,10 @@
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        locMast.setFireStatus(0);
                        //入测试库位时给库位测试状态为1待测
                        if(!Cools.isEmpty(locMast.getChannel())){
                            locMast.setPackStatus(1);//待测
                        }
                        if (locMast.getCrnNo()==1){
                            if (locMast.getLocType1()==1){
                                locMast.setPackStatus(1);
@@ -383,7 +387,6 @@
                        }else {
                            throw new CoolException("待测库位无物");
                        }

                    }else {
                        //测试库位转静置库位和NG库位
                        if (locMast.getLocType1().equals((short)4)){
@@ -423,18 +426,30 @@
                    }

                    if (locMast.getCrnNo()==1 && sign){
                        //5.静置库位入库完成上报
                        //7.测试库位转静置库位出库完成上报
                        CombParam combParam = new CombParam();
                        combParam.setPackNo(locDetl.getMatnr());
                        combParam.setLocNo(wrkMast.getLocNo());
                        combParam.setLocNo(wrkMast.getSourceLocNo());
                        combParam.setStepSts(7);
                        if (locMast.getPackStatus()==4){
                            combParam.setPackSts(2);
                        }else if (locMast.getPackStatus()==5){
                            combParam.setPackSts(1);
                        }
                        combParam.setRequestTime(DateUtils.convert(now));
                        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                        //5.测试库位转静置库位入库完成上报
                        combParam.setPackNo(locDetl.getMatnr());
                        combParam.setLocNo(wrkMast.getLocNo());
                        if (locMast.getPackStatus()==4){
                            combParam.setPackSts(2);
                            combParam.setStepSts(5);
                        }else if (locMast.getPackStatus()==5){
                            combParam.setPackSts(1);
                            combParam.setStepSts(8);
                        }else {
                            combParam.setPackSts(0);
                        }
                        combParam.setStepSts(5);
                        combParam.setRequestTime(DateUtils.convert(now));
                        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                    }

 src/main/java/com/zy/asrs/utils/PostMesDataUtils.java

@@ -44,7 +44,7 @@
                    throw new CoolException("上报"+name);
                }
            } catch (Exception e) {
                log.error("上报失败");
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
//                      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg(e.getMessage());
            } finally {

 src/main/java/com/zy/common/web/WcsController.java

@@ -52,10 +52,10 @@
    @Autowired
    private  MatService matService;

    @Value("mes.url")
    @Value("${mes.url}")
    private String mesUrl;

    @Value("mes.inPath")
    @Value("${mes.inPath}")
    private String inpath;

    @PostMapping("/pakin/loc/v1")