自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
pang.jiabao
2024-08-13 4559444158b9ab3c29fb578e5dac6788ddccd53e 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java


@@ -107,6 +107,7 @@


                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码


                            locDetl.setModiTime(now);


                            locDetl.setAppeTime(now);


                            locDetl.setBatch("");


                            if (!locDetlService.insert(locDetl)) {


//                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -116,10 +117,13 @@




                        // 更新订单完成数量


                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


                        if (orderDetl==null){


                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


                        }


                        try {


                            if(!Cools.isEmpty(orderDetl)){


                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),


                                        wrkDetl.getBatch(),wrkDetl.getAnfme())){


                                        orderDetl.getBatch(),wrkDetl.getAnfme())){


//                                    exceptionHandle("全板入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",


//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());


                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -133,6 +137,7 @@


                    if (locMast.getLocSts().equals("S")) {


                        locMast.setLocSts("F");


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setSheetNo("0");


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        if (!locMastService.updateById(locMast)) {


@@ -153,9 +158,14 @@


                    }


                    for (WrkDetl wrkDetl : wrkDetls53) {




                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


//                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


                        // 箱号+卷号


                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch",wrkDetl.getBatch())


                                .eq("model",wrkDetl.getModel()));


                        if (null != locDetl) {


                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {




//                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {


                            if (!locDetlService.updateAnfme2(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getModel(), wrkDetl.getBatch())) {


//                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                return FAIL.setMsg("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


@@ -164,10 +174,13 @@




                        // 更新订单完成数量


                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


                        if (orderDetl==null){


                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


                        }


                        try {


                            if(!Cools.isEmpty(orderDetl)){


                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),


                                        wrkDetl.getBatch(),wrkDetl.getAnfme())){


                                        orderDetl.getBatch(),wrkDetl.getAnfme())){


//                                    exceptionHandle("拣料入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",


//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());


                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -181,6 +194,7 @@


                    if (locMast.getLocSts().equals("Q")) {


                        locMast.setLocSts("F");


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setSheetNo("0");


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        if (!locMastService.updateById(locMast)) {


@@ -228,6 +242,7 @@


                    if (locMast.getLocSts().equals("Q")) {


                        locMast.setLocSts("F");


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setSheetNo("0");


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        if (!locMastService.updateById(locMast)) {


@@ -250,6 +265,7 @@


                    if (locMast.getLocSts().equals("Q")) {


                        locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setSheetNo("0");


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        if (!locMastService.updateById(locMast)) {


@@ -278,6 +294,7 @@


                    if (null != sourceLoc) {


                        sourceLoc.setBarcode("");


                        sourceLoc.setLocSts("O");


                        sourceLoc.setSheetNo("0");


                        sourceLoc.setModiTime(now);


                        sourceLoc.setIoTime(now);


                        if (!locMastService.updateById(sourceLoc)) {


@@ -289,6 +306,7 @@


                    // 修改目标库位状态 ==> .locSts


                    locMast.setLocSts(locSts);


                    locMast.setBarcode(wrkMast.getBarcode());


                    locMast.setSheetNo("0");


                    locMast.setIoTime(now);


                    locMast.setModiTime(now);


                    if (!locMastService.updateById(locMast)) {


@@ -343,11 +361,21 @@


                    }


                    for (WrkDetl wrkDetl : wrkDetls101) {


                        // 更新订单完成数量


                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


//                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());


//                        if (orderDetl==null){


//                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);


//                        }


                        // 箱号+卷号


                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch",wrkDetl.getBatch())


                                .eq("model",wrkDetl.getModel()));




                        try {


                            if(!Cools.isEmpty(orderDetl)){


                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),


                                        wrkDetl.getBatch(),wrkDetl.getAnfme())){


                                // 更新订单完成数量


//                                orderDetlService.update(null,new EntityWrapper<OrderDetl>().eq("order_no",orderDetl.getOrderNo())


//                                        .eq("batch",orderDetl.getBatch()).eq("model", orderDetl.getModel()));


                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), orderDetl.getModel(),


                                        orderDetl.getBatch(),wrkDetl.getAnfme())){


//                                    exceptionHandle("全板出库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",


//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());


                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -366,6 +394,7 @@


                    if (locMast.getLocSts().equals("R")) {


                        locMast.setLocSts("O");


                        locMast.setBarcode("");


                        locMast.setSheetNo("0");


                        locMast.setModiTime(now);


                        locMast.setIoTime(now);


                        if (!locMastService.updateById(locMast)) {