自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
yxFwq
2024-07-12 b46dc3bc339ed04f72b091c3880d20b9512b18c2 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java


@@ -68,6 +68,7 @@


                        locMast.setLocSts("D");


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        locMast.setInvWh("1");


                        if (!locMastService.updateById(locMast)) {


//                            exceptionHandle("空板入库 ===>> 修改库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -107,6 +108,9 @@


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


                            locDetl.setModiTime(now);


                            locDetl.setAppeTime(now);


                            if (Cools.isEmpty(wrkDetl.getBatch())){


                                locDetl.setBatch("");


                            }


                            if (!locDetlService.insert(locDetl)) {


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


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -117,7 +121,7 @@


                        // 更新订单完成数量


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


                        if (orderDetl==null){


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


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


                        }


                        try {


                            if(!Cools.isEmpty(orderDetl)){


@@ -169,7 +173,7 @@


                        // 更新订单完成数量


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


                        if (orderDetl==null){


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


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


                        }


                        try {


                            if(!Cools.isEmpty(orderDetl)){