#

yxFwq

3 天以前 94f4944f45d15de23041c1bc937196aef566c2c5

#

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -38,7 +38,7 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
//    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        String erpReport = Parameter.get().getErpReport();

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

@@ -83,14 +83,14 @@
                            log.error("删除入库通知档[workNo={"+wrkMast.getWrkNo()+"}]失败");
                        }
                    }
                    if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
                        // 手动入库生成单据 【 上报三方平台 】
                        if (!Cools.isEmpty(wrkDetls)) {
                            if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
                                exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                        }
                    }
//                    if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
//                        // 手动入库生成单据 【 上报三方平台 】
//                        if (!Cools.isEmpty(wrkDetls)) {
//                            if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
//                                exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                            }
//                        }
//                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
//                    if (!Cools.isEmpty(wrkDetls)) {

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

@@ -277,9 +277,23 @@
                case 11:
                    // 默认目标库位是空板
                    String locSts = "D";

                    // 库位移转判断是否为空板移转
                    if (wrkMast.getEmptyMk().equals("N")) {
                        locSts = "F";
                    }
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setSheetNo("0");
                    locMast.setIoTime(now);
                    locMast.setModiTime(now);
                    if (!locMastService.updateById(locMast)) {
//                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("库位移转 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    if (locSts.equals("F")){
                        // 转移库存明细数据: 库存号 由工作档源库位变为目标库位
                        if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
//                            exceptionHandle("库位移转 ===>> 转移库存明细数据失败；[源库位={0}],[目标库位={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
@@ -300,17 +314,6 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("库位移转 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                    }
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setSheetNo("0");
                    locMast.setIoTime(now);
                    locMast.setModiTime(now);
                    if (!locMastService.updateById(locMast)) {
//                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("库位移转 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    break;
                default:

 src/main/java/com/zy/common/service/CommonService.java

@@ -341,10 +341,15 @@

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            boolean levSign = true;
            if (staDescId == 1  && crnNo<3) {
                levSign = false;
            }

            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O")
                    .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
                .eq("row1", nearRow)
                .eq("loc_sts", "O")
                .orderBy("inv_wh",false).orderBy("lev1",levSign).orderBy("bay1",true));

            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {