#

lsh

2024-01-21 aa2ef2ef37c7d95cfb1d3833a023328d05ea5060

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

@@ -61,10 +61,10 @@
            if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){
                return FAIL;
            }
            if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0) || basDevpEnd.getWrkNo()>10000){
            if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0  ) || basDevpEnd.getWrkNo()>10000  || basDevpEnd.getReportSign()!=0){
                return FAIL;
            }
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd).eq("wrk_sts",51L));
            if (!Cools.isEmpty(wrkMast1)) return FAIL;
            if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //上传前工作号跟电控约定为9992中控(桁架)：码垛完成下发入库信息（你可以自定义）

@@ -78,8 +78,11 @@
                }
                SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
                singleMountUnstackingCompleteParam.setStaStart(staNo);
                singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131);
                singleMountUnstackingCompleteParam.setStaEnd(staEnd);
                ReturnT<String> result = null;
                if (true){
                    return FAIL;
                }
                result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
//                System.out.println(result);
//                if (true){
@@ -92,6 +95,8 @@
//                    wrkMast.setSheetNo("1");
//                    wrkMastService.updateById(wrkMast);
//                    basDevp.setReportSign(1);
//                    basDevpService.updateById(basDevp);
//                    basDevpEnd.setReportSign(1);
//                    basDevpService.updateById(basDevp);
//                    return SUCCESS;
//                }
@@ -106,6 +111,9 @@
                    wrkMastService.updateById(wrkMast);
                    basDevp.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    basDevpEnd.setReportSign(1);
                    basDevpService.updateById(basDevpEnd);

                    return SUCCESS;
                }else {
                    log.error("拆垛信息上传失败");