#

野心家

2023-09-13 9b4de84e744b2f76a24103e791086c647c1c3027

#

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

@@ -722,7 +722,7 @@
            }else if (testMast.getChannel()<=48){
                renUrl=renUrl6;
            }
            return new PostMesDataUtils().postMesData("测试系统",renUrl,startUpTestPACK,review);
            return null;
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
@@ -802,7 +802,7 @@
                default:
                    log.error("通道有误，请查看！");
            }
            return new PostMesDataUtils().postMesData("测试系统",renUrl,suspendTestPACK,review);
            return null;
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();

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

@@ -783,48 +783,6 @@
        return null;
    }


//    @Override
//    @Transactional
//    public Boolean testFinish(Review review) {
//        Boolean success=true;
//        Wrapper wrapper = new EntityWrapper<TestMast>()
//                .eq("loc_no", review.getLocNo())
//                .eq("barcode", review.getBarcode())
//                .eq("user_Id", review.getUserId());
//        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
//        if (null == locMast ||locMast.getPackStatus()!=2){
//            throw new CoolException("产品状态不是 2:测试中");
//        }else if (!review.getBarcode().equals(locMast.getBarcode())){
//            throw new CoolException("pack码不同");
//        }
//        TestMast testMast = testMastService.selectOne(wrapper);
//        if(null != testMast){
//            if (testMast.getStatus()==3){
//                Date date = new Date();
//                locMast.setPackStatus(3);
//                locMast.setModiTime(date);
////                CombParam combParam = new CombParam();
////                combParam.setPackNo(locMast.getBarcode());
////                combParam.setLocNo(locMast.getLocNo());
////                combParam.setPackSts(3);
////                combParam.setRequestTime(DateUtils.convert(new Date()));
////                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
//
//                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
//                    throw new CoolException("更改产品状态失败");
//                }
//            }else if (Cools.isEmpty(testMast.getStatus())){
//                throw new CoolException("状态异常");
//            }else {
//                throw new CoolException("测试状态不是 3:测试中");
//            }
//        } else {
//            throw new CoolException("状态异常");
//        }
//        return success;
//    }

    @Override
    @Transactional
    public Boolean testNG(Review review) {

 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/handler/FireOutHandler.java

@@ -54,9 +54,15 @@
                if (Cools.isEmpty(locMast)){
                    continue;
                }
                WrkMast wrkMast2=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",1000)
                        .eq("source_loc_no",locMast.getLocNo()));
                 if(!Cools.isEmpty(wrkMast2)){
                    continue;
                 }
                WrkMast wrkMast1=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
                if(!Cools.isEmpty(wrkMast1)){
                    wrkMastService.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
                    wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
                }
                // 获取路径
                StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), 1000);

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

@@ -261,14 +261,6 @@
                    locMast.setLocSts("R");
                    locMast.setModiTime(now);
//                    locMast.setPackStatus(5); //5:开始静置

                    CombParam combParam = new CombParam();
                    combParam.setPackNo(wrkDetl.getMatnr());
                    combParam.setLocNo(locMast.getLocNo());
                    combParam.setPackSts(locMast.getPackStatus());
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                    if (!locMastService.updateById(locMast)) {
                        log.error("预约库位状态失败，库位号："+locMast.getLocNo());
                        return false;