*

L

6 天以前 e4a7d5239f176c5cf5ba95b52c88366908d2ecfa

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

@@ -58,7 +58,6 @@

    public ReturnT<String> start(int staNo,int staNoEnd) {
        try {
            Integer staOther = getStaOther(staNoEnd);
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (Cools.isEmpty(basDevp) || basDevp.getWrkNo()==0
                    || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getLoadingSuper().equals("Y") || !basDevp.getInEnable().equals("Y")){
@@ -66,12 +65,12 @@
            }
            BasDevp basDevp131 = basDevpService.selectById(131);
            if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y")
                    || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000) || basDevp131.getReportSign()!=0){
                    || basDevp131.getWrkNo()!=0 || basDevp131.getReportSign()!=0){
                return FAIL;
            }
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                    .eq("wrk_no", basDevp.getWrkNo()).eq("source_sta_no",145));
            if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2){
            if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2 || wrkMast.getSheetNo().equals("3")){
                return FAIL;
            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -84,11 +83,7 @@
                return FAIL;
            }
            BasDevp basDevpEnd = basDevpService.selectById(staNoEnd);
            if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 ){
                return FAIL;
            }
            BasDevp basDevpOther = basDevpService.selectById(staOther);
            if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()!=0){
            if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") ){
                return FAIL;
            }

@@ -107,7 +102,8 @@
                        basDevpService.updateById(basDevp);
                        basDevpEnd.setReportSign(3);
                        basDevpService.updateById(basDevpEnd);
                        wrkDetl.setOrigin(trussCombParam.getPalletizingNo2()==118? "2":"1");
//                        wrkDetl.setOrigin(trussCombParam.getPalletizingNo2()==118? "2":"1");
                        wrkDetl.setOrigin("1");
                        wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetl.getWrkNo()));
                    }
                    return SUCCESS;