#

Junjie

8 天以前 ebdd49ff02db7109aa125757b1234059fef30a2a

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

@@ -87,6 +87,15 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        if (param.getBarcode().startsWith("11")) {
            locTypeDto.setLocType2((short) 1);
        } else if (param.getBarcode().startsWith("13")) {
            locTypeDto.setLocType2((short) 2);
        } else if (param.getBarcode().startsWith("16")) {
            locTypeDto.setLocType2((short) 3);
        } else {
            return R.error("未知托盘码规则");
        }

        StartupDto dto = null;
        switch (param.getIoType()) {
@@ -170,15 +179,18 @@
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));

        //TODO 测试
        StartupDto dto = new StartupDto();
        dto.setCrnNo(1);
        dto.setSourceStaNo(devpNo);
        dto.setStaNo(103);
        LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
        dto.setLocNo(locMastxx.getLocNo());
        dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
//        StartupDto dto = new StartupDto();
//        dto.setCrnNo(1);
//        dto.setSourceStaNo(devpNo);
//        dto.setStaNo(103);
//        LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
//        dto.setLocNo(locMastxx.getLocNo());
//        dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));

        //StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -221,10 +233,16 @@
        // 更新入库通知档 ioStatus ===>> Y
        Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
                .eq("zpallet", barcode);
        List<WaitPakin> waitPakinList = waitPakinService.selectList(wrapper);
        String tkFlag = null;
        for (WaitPakin waitPakin : waitPakinList) {
            tkFlag = waitPakin.getTkFlag();
        }
        WaitPakin setParam = new WaitPakin();
        setParam.setLocNo(dto.getLocNo());
        setParam.setIoStatus("Y");
        setParam.setModiTime(now);
        setParam.setTkFlag(tkFlag);
        if (!waitPakinService.update(setParam, wrapper)) {
            throw new CoolException("更新通知档失败");
        }