#1

dubin

8 天以前 9268cd77b4e864b901a8b0bf965f441f2e8c4fbd

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

@@ -139,7 +139,7 @@
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
//                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -160,16 +160,18 @@
                    }
                    for (WrkDetl wrkDetl : wrkDetls53) {

                        LocDetl locDetl = new LocDetl();
                        locDetl.sync(wrkDetl);
                        locDetl.setAnfme(wrkDetl.getPrice()-wrkDetl.getAnfme());//数量
                        locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                        locDetl.setModiTime(now);
                        locDetl.setAppeTime(now);
                        locDetl.setPrice(0.0);
                        if (null != locDetl) {
                            if (!locDetlService.insert(locDetl)) {
                        LocDetl locDetl1 = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
//                        LocDetl locDetl = new LocDetl();
//                        locDetl.sync(wrkDetl);
//                        locDetl.setAnfme(wrkDetl.getPrice()-wrkDetl.getAnfme());//数量
//                        locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
//                        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
//                        locDetl.setModiTime(now);
//                        locDetl.setAppeTime(now);
//                        locDetl.setPrice(0.0);
                        if (null != locDetl1) {
//                            if (!locDetlService.insert(locDetl)) {
                              if (!locDetlService.updateAnfme(locDetl1.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
//                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -195,9 +197,9 @@

                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("S")) {
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
//                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -231,7 +233,7 @@
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
//                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
@@ -244,7 +246,7 @@
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
//                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -263,10 +265,29 @@
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("盘点入库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
//                    for (WrkDetl wrkDetl:wrkDetls57){
//                        LocDetl locDetl1 = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
//                        LocDetl locDetl = new LocDetl();
//                        locDetl.sync(wrkDetl);
//                        locDetl.setAnfme(wrkDetl.getAnfme());//数量
//                        locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
//                        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
//                        locDetl.setModiTime(now);
//                        locDetl.setAppeTime(now);
//                        locDetl.setPrice(0.0);
//                        if (null != locDetl1) {
//                            if (!locDetlService.insert(locDetl)) {
//                            if (!locDetlService.updateAnfme(locDetl1.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
//                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
//                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                                return FAIL.setMsg("盘点入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
//                            }
//                        }
//                    }
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
                        locMast.setBarcode(wrkMast.getBarcode());
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
//                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -293,7 +314,7 @@
                    // 修改源库位状态 ==> O
                    LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                    if (null != sourceLoc) {
                        sourceLoc.setBarcode("");
//                        sourceLoc.setBarcode("");
                        sourceLoc.setLocSts("O");
                        sourceLoc.setModiTime(now);
                        sourceLoc.setIoTime(now);
@@ -305,7 +326,7 @@
                    }
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
//                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setIoTime(now);
                    locMast.setModiTime(now);
                    if (!locMastService.updateById(locMast)) {
@@ -385,7 +406,7 @@
                    // 修改源库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
//                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -402,7 +423,7 @@
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
//                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -417,28 +438,34 @@
                    //拣料和盘点出库
                case 103:
                case 107:
                    if (locMast.getLocSts().equals("P")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
//                            exceptionHandle("空板出库 ===>> 修改源库位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("拣料和盘点出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }
                        wrkMast.setWrkSts(16L);//等待入库
                        // 保存工作主档历史档
                        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                            exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        if(!wrkMast.getEmptyMk().equals("Y")) {
                            // 保存工作明细档历史档
                            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
                                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                        }
                    }
//                    if (locMast.getLocSts().equals("P")) {
//                        locMast.setLocSts("O");
//                        locMast.setBarcode("");
//                        locMast.setModiTime(now);
//                        locMast.setIoTime(now);
//                        if (!locMastService.updateById(locMast)) {
////                            exceptionHandle("空板出库 ===>> 修改源库位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
//                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                            return FAIL.setMsg("拣料和盘点出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
//                        }
//                        wrkMast.setWrkSts(14L);//等待入库
//                        // 保存工作主档历史档
//                        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
//                            exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                        if(!wrkMast.getEmptyMk().equals("Y")) {
//                            // 保存工作明细档历史档
//                            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//                                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                            }
//                        }
//                        // 删除工作档源库位的库存明细
//                        if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
////                        exceptionHandle("全板出库 ===>> 删除库存明细失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
//                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                            return FAIL.setMsg("拣料盘点出库 ===>> 删除库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
//                        }
//                    }
                    break;
                default:
                    break;