#

zjj

2025-04-14 287170042ad762d32ca574a5ed692648ea8e002f

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

@@ -8,9 +8,13 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -51,6 +55,14 @@
    private WorkService workService;
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private MatServiceImpl matService;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -115,7 +127,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);

        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, 12, null,null,null,0, locTypeDto,0);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -143,17 +155,43 @@

    @PostMapping("auto/emptyOut/v1")
    @ResponseBody
    public R autoEmptyOut(){
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("loc_sts", "D"));
        if (Cools.isEmpty(locMast)) {
    public R autoEmptyOut(@RequestParam("crnNo") Integer crnNo,@RequestParam("staNo") Integer staNo) {
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                .eq("loc_sts", "D")
                .eq("crn_no", crnNo)
                .orderBy("lev1,bay1,row1"));
        if (locMasts.isEmpty()) {
            return R.error("库存没有空板");
        }
        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
        emptyPlateOutParam.setOutSite(12);
        emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
        WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
        return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));

        for (LocMast locMast : locMasts) {
            LocMast locMast0 = null;
            List<String> outerLocNo = Utils.getGroupLocNo(locMast.getLocNo(), false);
            for (String loc : outerLocNo) {
                LocMast locMast1 = locMastService.selectByLoc(loc);
                if (locMast1 == null) {
                    continue;
                }

                if (locMast1.getLocSts().equals("D")) {
                    locMast0 = locMast1;
                    break;
                }
            }

            if (locMast0 == null) {
                continue;
            }

            EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
            ArrayList<String> locNos = new ArrayList<>();
            locNos.add(locMast0.getLocNo());
            emptyPlateOutParam.setLocNos(locNos);
            emptyPlateOutParam.setOutSite(staNo);
            WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
            return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
        }
        return R.error("生成自动空托出库失败");
    }

    /**
@@ -164,19 +202,20 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 1;
        Integer integer = 2;
        for (int i = 1; i <= rowCount; i++) {
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", i));
            if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts().equals("3")){
                    .eq("crn_no", integer));
            if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 3){
                break;
            }
        }

        StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -206,12 +245,17 @@
        }
        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            String uuid = String.valueOf(System.currentTimeMillis());
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setUuid(uuid);
            wrkDetl.setWeight(waitPakin.getWeight());
            wrkDetl.setOwner(waitPakin.getOwner());
            wrkDetl.setPayment(waitPakin.getPayment());
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
@@ -251,7 +295,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 1;
        Integer integer = 2;
        for (int i = 1; i <= rowCount; i++) {
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
@@ -262,7 +306,7 @@
            }
        }
        // 检索库位
        StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -309,4 +353,161 @@
        return dto;
    }

    @PostMapping("/process/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R processLoc() {
        log.info("收到WCS罐装出库接口请求");
        Date now = new Date();
        // 查询库存状态位F 且 库存明细包含该物料的库位
        LocMast tarLoc = locMastService.getLocFByMatnr("BZ10100ZZ00000010");
        if (Cools.isEmpty(tarLoc)) {
            throw new CoolException("没有可出库的库位");
        }
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 105).ne("wrk_sts", 14));
        if (!Cools.isEmpty(tarLoc)) {
            if (wrkMasts.size() > 3) {
                throw new CoolException("当前已有4笔出库任务，暂停下发");
            }
        }
        // 获取源站
        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                .eq("type_no", 105)
                .eq("stn_no", 2301)
                .eq("crn_no", tarLoc.getCrnNo()));
        Integer sourceStaNo = staDesc.getCrnStn();
        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(103));
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(105); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(tarLoc.getCrnNo());
        wrkMast.setSourceStaNo(sourceStaNo); // 源站
        wrkMast.setStaNo(2301); // 目标站
        wrkMast.setSourceLocNo(tarLoc.getLocNo()); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("N");
        wrkMast.setBarcode(tarLoc.getBarcode());
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        if (!wrkMastService.insert(wrkMast)) {
            throw new CoolException("保存工作档失败，出库库位号："+tarLoc.getLocNo());
        }
        // 生成工作档明细
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", tarLoc.getLocNo()));
        for (LocDetl locDetl : locDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setZpallet(wrkMast.getBarcode());
            wrkDetl.setIoTime(now);
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setBatch(locDetl.getBatch());
            wrkDetl.setAnfme(locDetl.getAnfme()); // 数量
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        if (tarLoc.getLocSts().equals("F")) {
            tarLoc.setLocSts("P");
            tarLoc.setModiTime(now);
            if (!locMastService.updateById(tarLoc)) {
                throw new CoolException("预约库位状态失败，库位号："+tarLoc.getLocNo());
            }
        } else {
            throw new CoolException(tarLoc.getLocNo() + "库位不是在库状态");
        }
        return R.ok();
    }
    @PostMapping("/process/in/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R processInLoc(@RequestBody SearchLocParam param){
        log.info("灌装线收到WCS入库接口请求====>>入参:{}", param);
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", 105)
                .eq("wrk_sts", 14));
        if (Cools.isEmpty(wrkMast)) {
            log.info("查询不到该托盘码的罐装出库任务，托盘码位{" + param.getBarcode() + "}" );
            throw new CoolException("查询不到该托盘码的罐装出库任务，托盘码位{" + param.getBarcode() + "}" );
        }
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", 55)
                .eq("stn_no", 2106)
                .eq("crn_no", wrkMast.getCrnNo());
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            throw new CoolException("入库路径不存在！");
        }
        try {
            // 保存工作明细档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                throw new CoolException("保存工作明细档历史档失败");
            }
            // 保存工作主档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
                throw new CoolException("保存工作主档历史档失败");
            }
            Date now = new Date();
            // 堆垛机站点(目标站)
            Integer staNo = staDesc.getCrnStn();
            // 更新工作档数据状态
            wrkMast.setIoTime(now);
            wrkMast.setIoType(55);
            wrkMast.setWrkSts(2L);
            wrkMast.setSourceStaNo(2106);
            wrkMast.setStaNo(staNo);
            wrkMast.setLocNo(wrkMast.getSourceLocNo(

            ));
            wrkMast.setSourceLocNo("");
            wrkMast.setModiTime(now);
            if (!wrkMastService.updateById(wrkMast)) {
                throw new CoolException("更新工作档数据状态失败");
            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            for (WrkDetl wrkDetl : wrkDetls) {
                Mat mat = matService.selectByMatnr("CP10103TY22014617");
                WrkDetl wrkDetl1 = new WrkDetl();
                wrkDetl1.sync(wrkDetl);
                wrkDetl1.sync(mat);
                wrkDetl1.setBatch(param.getBatch());
                wrkDetl1.setIoTime(now);
                wrkDetlService.insert(wrkDetl1);
            }
            wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("matnr", "BZ10100ZZ00000010").eq("wrk_no",wrkMast.getWrkNo()));
            // 更新明细档io_time (历史档关联使用）
//            wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);

            // 修改库位状态 Q.拣料/盘点/并板再入库
            LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
            locMast.setLocSts("Q");
            locMast.setModiTime(new Date());
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("修改库位状态失败");
            }

        } catch (Exception e) {
            throw new CoolException("入库失败！");
        }
        StartupDto dto = new StartupDto();
        dto.setWorkNo(wrkMast.getWrkNo());
        dto.setCrnNo(wrkMast.getCrnNo());
        dto.setSourceStaNo(wrkMast.getSourceStaNo());
        dto.setStaNo(wrkMast.getStaNo());
        dto.setLocNo(wrkMast.getLocNo());
        log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarcode());
        return R.ok().add(dto);
    }
}