#1

dubin

昨天 eae70b86a475aaba67731db87321feebdda0abda

 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("工作档已存在");
            }
        }
@@ -96,6 +97,12 @@
            return R.error("高低检测信号不能为空");
        }

        try {
            // 延迟 3 秒再检测
            Thread.sleep(3000);
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
@@ -309,7 +316,7 @@
            return R.error("库存没有空板");
        }
        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
        emptyPlateOutParam.setOutSite(12);
        emptyPlateOutParam.setOutSite(101);
        emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
            add(locMast.getLocNo() + "");
        }});
@@ -327,7 +334,7 @@
        // 检索库位
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(2, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -339,8 +346,8 @@
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setStaNo(dto.getStaNo());// 目标站
        wrkMast.setLocNo(dto.getLocNo());// 目标库位
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
@@ -360,10 +367,14 @@
        waitPakins.forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setProType(waitPakin.getProType());
            wrkDetl.setTemp2(waitPakin.getTemp2());
            wrkDetl.setWeight(wrkMast.getScWeight());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            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) {
@@ -373,11 +384,13 @@
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
//                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setWeight(weight);
                    wrkDetl.setSupp(orderDetl.getSupp());
                    wrkDetl.setSuppCode(orderDetl.getSuppCode());
                    wrkDetl.setPacking(orderDetl.getPacking());
                    wrkDetl.setColor(orderDetl.getColor());
                    wrkDetl.setWareId(orderDetl.getWareId());
                    wrkDetl.setWareName(orderDetl.getWareName());
                    wrkDetl.setTemp1(orderDetl.getTemp1());
                }
            }
            if (!wrkDetlService.insert(wrkDetl)) {