#

zjj

2024-11-03 1a24bc85c7dbd80a4460ace64dd88846ff1af654

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

@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -16,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
@@ -49,6 +51,221 @@
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;
    @Autowired
    private StaDescService staDescService;

    @PostMapping
    @Transactional
    public synchronized R getLocNo3(@RequestBody SearchLocParam param){
        log.info("收到WCS拣料入库接口请求====>>入参:{}", param);
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            return R.error("未找到任务");
        }
        StartupDto dto = null;
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", wrkMast.getIoType() - 50)
                .eq("stn_no", 31002) // 作业站点 = 拣料出库的目标站
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)){
            return R.error("未找到站点路径");
        }
        if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){
            try {
                // 保存工作明细档历史档
                if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作明细档历史档失败");
                }
                // 保存工作主档历史档
                if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作主档历史档失败");
                }

                Date now = new Date();
                // 堆垛机站点(目标站)
                Integer staNo = staDesc.getCrnStn();
                // 更新工作档数据状态
                wrkMast.setIoTime(now);
                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                wrkMast.setStaNo(staNo); // 目标站
                wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                wrkMast.setSourceLocNo(""); // 源库位清空
                wrkMast.setModiTime(now);
                if (wrkMastService.updateById(wrkMast)) {
                    throw new CoolException("更新工作档数据状态失败");
                }
                // 更新明细档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("修改库位状态失败");
                }
                dto.setWorkNo(wrkMast.getWrkNo());
                dto.setLocNo(wrkMast.getLocNo());
                return R.ok(dto);
            } catch (Exception e) {
               return R.error(e.getMessage());
            }
        }else {

        }
        return R.error();
    }

    @PostMapping("/pakin2/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
        if (Cools.isEmpty(param.getIoType())) {
            return R.error("入出库类型不能为空");
        }
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        if (Cools.isEmpty(param.getBarcode())) {
            return R.error("条码不能为空");
        }
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", 107)
                .eq("wrk_sts",14));
        StartupDto dto = new StartupDto();

        if (Cools.isEmpty(wrkMast)){
            try{
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档未查询到盘点出库任务，开始查询盘点在入库任务==》");
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", 57)
                        .eq("wrk_sts",2));
                if (Cools.isEmpty(wrkMast1)){
                    return R.error("未查询到工作档===》托盘码:"+param.getBarcode());
                }
                // 获取目标站
                Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                        .eq("type_no", 57)
                        .eq("stn_no", sourceStaNo.getDevNo())
                        .eq("crn_no", wrkMast1.getCrnNo());
                StaDesc staDesc = staDescService.selectOne(wrapper);
                if (Cools.isEmpty(staDesc)) {
                    log.error("type_no={},stn_no={},crn_no={}", 57, sourceStaNo, wrkMast1.getCrnNo());
                    throw new CoolException("入库路径不存在");
                }
                if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())){
                    throw new CoolException("堆垛机作业站点与工作号目标站点不一致！！！请联系工程师修改"+
                            "\\n堆垛机号："+wrkMast1.getCrnNo()+
                            "\\n堆垛机站点："+staDesc.getCrnStn()+
                            "\\n工作号："+wrkMast1.getWrkNo()+
                            "\\n工作档目标站点："+wrkMast1.getStaNo());
                }
                dto.setWorkNo(wrkMast1.getWrkNo());
                dto.setCrnNo(wrkMast1.getCrnNo());
                dto.setLocNo(wrkMast1.getLocNo());
                dto.setStaNo(wrkMast1.getStaNo());
                dto.setSourceStaNo(wrkMast1.getSourceStaNo());
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档已经是盘点再入库状态，返回wcs下发信息");
                return R.ok().add(dto);
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库查询工作档出错======>"+e);
                return R.error("查看wms==>info==>error");
            }
        }
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (Cools.isEmpty(locDetls) || locDetls.size()<1){
            return R.error("托盘码:"+param.getBarcode()+",未查到库存明细");
        }else {
            if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())){
                return R.error("明细已经被修改,故障");
            }
        }

        Date now = new Date();
        if (param.getIoType() == 107) {//盘点再入库
            try{
                // 检索库位
                List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
                try{
//                    dto = commonService.getLocNo(1, 57, param.getSourceStaNo(), list, locTypeDto, 0);
                    dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto);
                }catch (Exception e){
                    log.error("堆垛机站盘点再入库查询库位出错:"+e.getMessage()+e);
                    return R.error("e.getMessage()");
//                    throw new Exception("查询库位出错，参数：param.getSourceStaNo():"+param.getSourceStaNo()+"==>list:"+list+"==>locTypeDto:"+locTypeDto);
                }
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
                if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())){
                    throw new Exception("目标库位locMast查询为空||locMast.getLocSts为空");
                }else {
                    if (!locMast.getLocSts().equals("O")){
                        throw new Exception("目标库位！locMast.getLocSts.equals(“O”)"+locMast.getLocSts());
                    }else {
                        locMast.setLocSts("Q");
                        locMast.setBarcode(param.getBarcode());
                        if (!locMastService.updateById(locMast)) {
                            log.error(" /pakin2/loc/v1 --- 修改库位状态失败！" + locMast.getLocNo());
                            throw new Exception("修改库位状态失败");
                        }
                    }
                }
                if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
                    log.error(" /pakin2/loc/v1 --- 库存明细转移失败！" + wrkMast.getWrkNo());
                    throw new Exception("库存明细转移失败");
                }
                // 修改源库位状态 O 空库位
                LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
                locMast2.setLocSts("O");
                locMast2.setBarcode("");
                locMast2.setModiTime(now);
                if (!locMastService.updateById(locMast2)) {
                    log.error(" /pakin2/loc/v1 --- 修改源库位状态失败！" + wrkMast.getSourceLocNo());
                    throw new Exception("修改源库位状态失败");
                }

                try{
                    // 保存工作主档历史档
                    if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
                        log.error(" stnToCrnStnPick2 --- 保存工作主档历史档失败！" + wrkMast.getWrkNo());
                    }
                    // 更新工作档数据状态
                    wrkMast.setIoTime(now);
                    wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57
                    wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                    wrkMast.setSourceStaNo(param.getSourceStaNo()); // 源站
                    wrkMast.setStaNo(dto.getStaNo()); // 目标站
                    wrkMast.setModiTime(now);
                    wrkMast.setLocNo(dto.getLocNo());
                    wrkMast.setCrnNo(dto.getCrnNo());
                    if (!wrkMastService.updateById(wrkMast)) {
                        log.error(" stnToCrnStnPick --- 更新工作档数据状态失败！" + wrkMast.getWrkNo());
                        throw new CoolException("更新工作档数据状态失败");
                    }
                    // 更新明细档io_time (历史档关联使用）
                    wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
                }catch (Exception e){
                    throw new CoolException("更新工作档数据状态出错");
                }
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库出错======>"+e);
                return R.error("查看wmsError");
            }
        } else {
            return R.error();
        }
        log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        return R.ok().add(dto);
    }

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

        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -162,7 +379,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(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
        StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -237,7 +454,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -250,7 +467,7 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setFullPlt(dto.getSourceStaNo() == 1025?"Y":"N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板