#

lty

2 天以前 a0131e8ae6dedaac1f48e6dd40aee5955e205a9c

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

@@ -451,13 +451,29 @@
                    movLoc(wrkMast);
                    break;
                case 2:
                    WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode",wrkMast.getBarcode()).eq("io_type",101));
                    if(Objects.isNull(wrkMast1.getIsSuplus())){
                    WrkMast wrkMast1 = wrkMastService.selectOne(
                            new EntityWrapper<WrkMast>()
                                    .eq("barcode", wrkMast.getBarcode())
                                    .eq("io_type", 101)
                    );

                    if (Cools.isEmpty(wrkMast1)) {
                        break;
                    }
                    if(!Cools.isEmpty(wrkMast1)) {

                    if ("Y".equals(wrkMast1.getLogMk().trim())) {
                        wrkMast1.setOveMk("Y");
                        if(!wrkMastService.updateById(wrkMast1)) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("更新退库跨区域完成状态失败; [workNo=" + wrkMast1.getWrkNo());
                        }
                        break;
                    }
                    if (Objects.isNull(wrkMast1.getIsSuplus())) {
                        break;
                    }

                    wrkMast1.setOveMk("Y");
                    if(!wrkMastService.updateById(wrkMast1)) {
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("更新退库跨区域完成状态失败; [workNo=" + wrkMast1.getWrkNo());
@@ -509,6 +525,7 @@

    public void movLoc(WrkMast wrkMast) {
        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());

        if (Objects.isNull(locMast)) {
            throw new CoolException("目标库位不存在！！");
        }
@@ -620,19 +637,22 @@
                                    wrkMastService.updateById(wrkMast1);
                                }
                            }
                            movLoc(wrkMast);
                            LocMast locMastTarget = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                            // 修改库位状态 S ====>> F
                            if (locMastTarget.getLocSts().equals("S")) {
                                locMastTarget.setLocSts("F");
                                locMastTarget.setBarcode(wrkMast.getBarcode());
                                locMastTarget.setIoTime(now);
                                locMastTarget.setModiTime(now);
                                if (!locMastService.updateById(locMastTarget)) {
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("退库跨区域入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            if(!Objects.isNull(wrkMast.getLocNo())){
                                movLoc(wrkMast);
                                LocMast locMastTarget = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                                // 修改库位状态 S ====>> F
                                if (locMastTarget.getLocSts().equals("S")) {
                                    locMastTarget.setLocSts("F");
                                    locMastTarget.setBarcode(wrkMast.getBarcode());
                                    locMastTarget.setIoTime(now);
                                    locMastTarget.setModiTime(now);
                                    if (!locMastService.updateById(locMastTarget)) {
                                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                        return FAIL.setMsg("退库跨区域入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                    }
                                }
                            }

                            if(!Objects.isNull(wrkMast.getPacked())){
                                LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", wrkMast.getSourceLocNo()));
                                if (Objects.isNull(bLocNo)) {