自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zwl
7 天以前 d16d730f80f856150bf7a186037cadd99dce3274 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java


@@ -19,6 +19,7 @@


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.math.BigDecimal;


import java.util.*;


import java.util.stream.Collectors;




@@ -80,7 +81,7 @@


            return false;


        }


        Integer ioType = wrkMast.getIoType();


        return ioType != null && (ioType == 1 || ioType == 8 || ioType == 53 || ioType == 54 || ioType == 57);


        return ioType != null && (ioType == 1 || ioType == 5 || ioType == 11 || ioType == 53 || ioType == 54 || ioType == 57);


    }




    private boolean needOutboundErpReport(WrkMast wrkMast) {


@@ -138,6 +139,7 @@


                        locMast.setLocSts("D");


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        locMast.setScWeight(wrkMast.getScWeight());


                        if (!locMastService.updateById(locMast)) {


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


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -178,6 +180,7 @@


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


                            locDetl.setModiTime(now);


                            locDetl.setAppeTime(now);


                            locDetl.setWeight(wrkDetl.getWeight());


                            if (!locDetlService.insert(locDetl)) {


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


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -191,6 +194,7 @@


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        locMast.setScWeight(wrkMast.getScWeight());


                        if (!locMastService.updateById(locMast)) {


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


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -224,6 +228,7 @@


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


                            locDetl.setModiTime(now);


                            locDetl.setAppeTime(now);


                            locDetl.setWeight(wrkDetl.getWeight());


                            if (!locDetlService.insert(locDetl)) {


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                return FAIL.setMsg("拣料途中并板 ===>> 添加库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


@@ -294,6 +299,7 @@


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        locMast.setScWeight(wrkMast.getScWeight());


                        if (!locMastService.updateById(locMast)) {


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


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -330,6 +336,7 @@


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


                            locDetl.setModiTime(now);


                            locDetl.setAppeTime(now);


                            locDetl.setWeight(wrkDetl.getWeight());


                            if (!locDetlService.insert(locDetl)) {


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                return FAIL.setMsg("并板入库 ===>> 新增库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


@@ -358,6 +365,7 @@


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        locMast.setScWeight(wrkMast.getScWeight());


                        if (!locMastService.updateById(locMast)) {


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


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -395,6 +403,7 @@


                        locMast.setBarcode(wrkMast.getBarcode());


                        locMast.setIoTime(now);


                        locMast.setModiTime(now);


                        locMast.setScWeight(wrkMast.getScWeight());


                        if (!locMastService.updateById(locMast)) {


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


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -438,6 +447,36 @@


//                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());


                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                        return FAIL.setMsg("库位移转 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


                    }


                    break;


                // 浅库位移库


                case 5:


                    String changeLocSts = "D";


                    if ("N".equals(wrkMast.getEmptyMk())) {


                        changeLocSts = "F";


                        if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                            return FAIL.setMsg("浅库位移库 ===>> 转移库存明细数据失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


                        }


                    }


                    LocMast changeLocSource = locMastService.selectById(wrkMast.getSourceLocNo());


                    if (null != changeLocSource) {


                        changeLocSource.setBarcode("");


                        changeLocSource.setLocSts("O");


                        changeLocSource.setModiTime(now);


                        changeLocSource.setIoTime(now);


                        if (!locMastService.updateById(changeLocSource)) {


                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                            return FAIL.setMsg("浅库位移库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


                        }


                    }


                    locMast.setLocSts(changeLocSts);


                    locMast.setBarcode(wrkMast.getBarcode());


                    locMast.setIoTime(now);


                    locMast.setModiTime(now);


                    if (!locMastService.updateById(locMast)) {


                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                        return FAIL.setMsg("浅库位移库 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");


                    }


                    break;


                default:


@@ -507,13 +546,9 @@


                                    wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());


                        }


                        try {


                            if (!Cools.isEmpty(orderDetlPakout)) {


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


                                        orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),


                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {


                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                    return FAIL.setMsg("全板出库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");


                                }


                            if (!increasePakoutOrderQty(wrkMast, wrkDetl, orderDetlPakout)) {


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                return FAIL.setMsg("全板出库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");


                            }


                        } catch (Exception ignore) {




@@ -528,6 +563,7 @@


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


                        locMast.setLocSts("O");


                        locMast.setBarcode("");


                        locMast.setScWeight(BigDecimal.ZERO);


                        locMast.setModiTime(now);


                        locMast.setIoTime(now);


                        if (!locMastService.updateById(locMast)) {


@@ -559,13 +595,9 @@


                        OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),


                                wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());


                        try {


                            if (!Cools.isEmpty(orderDetlPakout)) {


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


                                        orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),


                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {


                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                    return FAIL.setMsg("并板途中捡料 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");


                                }


                            if (!increasePakoutOrderQty(wrkMast, wrkDetl, orderDetlPakout)) {


                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                                return FAIL.setMsg("并板途中捡料 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");


                            }


                        } catch (Exception ignore) {


                        }


@@ -577,6 +609,7 @@


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


                        locMast.setLocSts("O");


                        locMast.setBarcode("");


                        locMast.setScWeight(BigDecimal.ZERO);


                        locMast.setModiTime(now);


                        locMast.setIoTime(now);


                        if (!locMastService.updateById(locMast)) {


@@ -618,5 +651,29 @@


        }


        return SUCCESS;


    }


}




    /**


     * 回写出库订单完成数量。


     *


     * 新增的延迟出库订单明细按 pallet_id 保存接口托盘号，因此优先使用 orderNo + palletId 精确回写；


     * 如果是历史订单或旧数据没有 pallet_id，则退回原来的物料/批次/备用字段匹配方式。


     */


    private boolean increasePakoutOrderQty(WrkMast wrkMast, WrkDetl wrkDetl, OrderDetlPakout matchedOrderDetl) {


        String palletId = null;


        if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getZpallet())) {


            palletId = wrkDetl.getZpallet();


        } else if (wrkMast != null) {


            palletId = wrkMast.getBarcode();


        }


        if (!Cools.isEmpty(palletId)


                && orderDetlPakoutService.increaseQtyByOrderNoAndPallet(wrkDetl.getOrderNo(), palletId, wrkDetl.getAnfme())) {


            return true;


        }


        if (Cools.isEmpty(matchedOrderDetl)) {


            return true;


        }


        return orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),


                matchedOrderDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),


                wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme());


    }


}