#erp对接修改

lty

2 天以前 cdfb6025516e43275982780291b4c5bd866bd9d7

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

@@ -75,6 +75,10 @@
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
            if (countWrk > 0) {
                return R.error("工作档已存在");
            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -86,10 +90,6 @@
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
            if (countLoc > 0) {
                return R.error("库存条码数据已存在");
            }
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
            if (countWrk > 0) {
                return R.error("工作档已存在");
            }
        }
        if (Cools.isEmpty(param.getLocType1())) {
@@ -322,6 +322,7 @@
     */
    @Transactional
    public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
        long start = System.currentTimeMillis();
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
@@ -360,6 +361,9 @@
        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);
@@ -372,12 +376,14 @@
                    wrkDetl.setProType(orderDetl.getProType());
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
//                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setWeight(wrkMast.getScWeight());
                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    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)) {
@@ -412,6 +418,7 @@
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        log.info("库位检索耗时: {} ms", System.currentTimeMillis() - start);
        return dto;
    }