#

lsh

2025-04-25 642428dd870c2f288bb0f3a5fc94373a69a425cf

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

@@ -64,7 +64,7 @@
            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  || basDevpEnd.getReportSign()!=0){
            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).eq("wrk_sts",51L));
@@ -72,7 +72,7 @@
            if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //上传前工作号跟电控约定为9992中控(桁架)：码垛完成下发入库信息（你可以自定义）

                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (Cools.isEmpty(wrkMast) || !wrkMast.getSheetNo().equals("0")){
                if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("0")){
                    return FAIL;
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -97,11 +97,13 @@
                SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetlList);
                singleMountUnstackingCompleteParam.setStaStart(staNo);
                singleMountUnstackingCompleteParam.setStaEnd(staEnd);
                ReturnT<String> result = null;
                if (true){
                    return FAIL;
                }
                result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
//                result = null;
//                if (true){
//                    return FAIL;
//                }
                log.error("上传机械臂时，站点状态："+JSON.toJSONString(basDevpEnd));
                log.error("上传机械臂时，工作号："+JSON.toJSONString(wrkMast));
                ReturnT<String> result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
//                System.out.println(result);
//                if (true){
//                    for (WrkDetl wrkDetl:wrkDetls){