#1

czkh

昨天 8fbd60d7e7fc0e35b3bff5a0c63e2d1bd80be8cf

 src/main/java/com/zy/common/web/WcsController.java

@@ -87,8 +87,9 @@
            if (countLoc > 0) {
                return R.error("库存条码数据已存在");
            }
            WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
            if (countWrk > 0) {
            if (countWrk > 0 && wrkMast.getWrkSts() != 15) {
                return R.error("工作档已存在");
            }
        }
@@ -373,6 +374,7 @@
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setModel(waitPakin.getModel());
            if (!Cools.isEmpty(waitPakin.getOrderNo())) {
                Order order = orderService.selectByNo(waitPakin.getOrderNo());
                if (order != null) {
@@ -431,7 +433,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
        StartupDto dto = commonService.getLocNoEmpty(1, 10, devpNo, null, null, null, locTypeDto);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();