Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

zjj

2024-09-03 e1c7f150792a5085dd64e86e6af82820ab34dc05

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

@@ -9,18 +9,19 @@
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.AgvBasDevpDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -65,6 +66,10 @@
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private AgvWrkDetlService agvWrkDetlService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;
//    @Autowired
//    private ErpService erpService;

@@ -172,10 +177,23 @@
                return R.parse(CodeRes.NO_COMB_700);
            }

            boolean checkTimeout = false;
            for (WaitPakin waitPakin : waitPakins) {
                Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
                mat.setWeight(waitPakin.getAnfme());
                mats.add(mat);

                Date appeTime = waitPakin.getAppeTime();
                Date now = new Date();
                long diffTime = now.getTime() - appeTime.getTime();
                if (diffTime >= 1000 * 60 * 60 * 4) {
                    checkTimeout = true;
                    break;
                }
            }

            if (checkTimeout) {
                return R.error("托盘组托超时，删除后重新组托");
            }

            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -490,21 +508,21 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        Date now = new Date();
        for (LocDetl locDetl : locDetls) {
            locDetl.setLocNo(dto.getLocNo());//修改目标库位
            locDetl.setAppeTime(now);
            locDetl.setModiTime(now);
            if (!locDetlService.insert(locDetl)) {
                throw new CoolException("库存明细更新失败");
            }
        }
//        Date now = new Date();
//        for (LocDetl locDetl : locDetls) {
//            locDetl.setLocNo(dto.getLocNo());//修改目标库位
//            locDetl.setAppeTime(now);
//            locDetl.setModiTime(now);
//            if (!locDetlService.insert(locDetl)) {
//                throw new CoolException("库存明细更新失败");
//            }
//        }

        //检查目标库位，库存明细是否添加成功
        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
        if (checkLocDetls.isEmpty()) {
            throw new CoolException("库存明细迁移失败");
        }
//        //检查目标库位，库存明细是否添加成功
//        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
//        if (checkLocDetls.isEmpty()) {
//            throw new CoolException("库存明细迁移失败");
//        }

//        //清空源库位数据
        LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
@@ -524,7 +542,7 @@
        }

        //获取回库提升机目标站
        Integer staNo = liftNo * 100 + locMast1.getLev1();
        Integer staNo = liftNo * 100 + locMast.getLev1();

        // 更新工作档数据状态
        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54
@@ -570,8 +588,9 @@
     */
    @PostMapping("/start")
    @ResponseBody
    public R start(@RequestBody ReplenishmentParam param){

    @Transactional
    public synchronized R start(@RequestBody ReplenishmentParam param){
        log.info("agv start param: " + param.toString());
        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
@@ -592,25 +611,27 @@

        //拣料、盘点完成任务
        if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);

            //生成拣料、盘点再入库任务
            List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
            agvWrkMast.setMk("Y");
            agvWrkMast.setLocNo(agvBasDevp.getDevNo());
            agvWrkMastList.add(agvWrkMast);
            agvWorkService.pickIn(agvWrkMastList);
            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);

            return R.ok();
        }

        //入库任务
        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode)) && Cools.isEmpty(agvWrkMast)){
            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
            //生成工作档
            List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
            agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);

            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
            return R.ok();
        }

@@ -622,32 +643,47 @@
    @ResponseBody
    public R move(@RequestBody ReplenishmentParam param){

        log.info("current containerCode: " + param.toString());

        if(Cools.isEmpty(currentContainerMap)){
            currentContainerMap = new HashMap<>();
        }

        String containerCode = param.getContainerCode().split(";")[0];

        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
        }

        if(!Character.isDigit(containerCode.charAt(0))){
            containerCode = containerCode.substring(3,containerCode.length());
        }


        String devNo = param.getDevNo();
        String containerCode = param.getContainerCode();
        String currentContainerCode = currentContainerMap.get(devNo);

        //判断容器是否发生变化
        if(!Cools.eq(containerCode,currentContainerCode)){
        if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
            //查询旧容器的工作档
            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
            if(agvWrkMast.getIoType() == 101){
                //发送容器立场请求，完成工作档
                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
                agvWrkMastList.add(agvWrkMast);
                try {
                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
                    if(code == 0){
                        //将工作党状态改为容器离场
                        agvWrkMast.setWrkSts(206L);
                        agvWrkMastService.updateById(agvWrkMast);
                    }
                } catch (IOException e) {
                    log.error(e.getMessage());
                }
            if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
                //将工作党状态改为容器离场
                agvWrkMast.setWrkSts(206L);
                agvWrkMastService.updateById(agvWrkMast);
//                //发送容器立场请求，完成工作档
//                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
//                agvWrkMastList.add(agvWrkMast);
//                try {
//                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
//                    if(code == 0){
//                        //将工作党状态改为容器离场
//                        agvWrkMast.setWrkSts(206L);
//                        agvWrkMastService.updateById(agvWrkMast);
//                    }
//                } catch (IOException e) {
//                    log.error(e.getMessage());
//                }
            }
        }

@@ -663,21 +699,86 @@
    @ResponseBody
    public R containerMove(@RequestBody ReplenishmentParam param){

        String devNo = param.getDevNo();
        String containerCode = currentContainerMap.get(devNo);
        String devNo = Cools.eq("CS-310",param.getDevNo()) ? "310-1" : Cools.eq("CS-311",param.getDevNo()) ? "312-2" : Cools.eq("CS-312",param.getDevNo()) ? "314-1" : Cools.eq("CS-313",param.getDevNo()) ? "316-1" : null;

        if(Cools.isEmpty(devNo)){
            return R.error("站点有误");
        }

        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
        String containerCode = agvBasDevp.getBarcode();

//        String devNo = param.getDevNo();
//        if(Cools.isEmpty(currentContainerMap)){
//            currentContainerMap = new HashMap<>();
//        }
//        String containerCode = currentContainerMap.get(devNo);

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();

        //查找该容器的工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWrkMast)){
            return R.ok(agvWrkMast);
            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
                agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
                if(agvWrkMast.getIoType() == 103){
                    //寻找是否有相同物料的工作档明细，并返回数量之和
                    double anfme = getAllAnfmeInAgvWrkDetlList(agvWrkDetlList,agvWrkDetl);
                    AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                    //用于结余数量显示
                    agvWrkDetl.setVolume(agvLocDetl.getAnfme() - anfme);
                }
                if(agvWrkMast.getIoType() == 53){
                    AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                    if(Cools.isEmpty(agvLocDetl)){
                        agvWrkDetl.setVolume(0.0);
                    }else {
                        agvWrkDetl.setVolume(agvLocDetl.getAnfme());
                    }
                }
            };
            if (agvWrkMast.getIoType() == 103){
                List<AgvLocDetl> suppCodes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", agvWrkMast.getBarcode()));
                if (!Cools.isEmpty(suppCodes)){
                    for (AgvLocDetl agvLocDetl : suppCodes){
                        AgvWrkDetl agvWrkDetl = new AgvWrkDetl(agvLocDetl.getSuppCode(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getSpecs(), agvLocDetl.getAnfme());
                        agvWrkDetlList.add(agvWrkDetl);
                    }

                }
            }


            agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
            agvBasDevpDto.setAgvWrkMast(agvWrkMast);
        }
        //查找该容器的入库通知档
        AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWaitPakin)){
            return R.ok(agvWaitPakin);
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
        if(!Cools.isEmpty(agvWaitPakinList)){
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
        }

        return R.error("没有该容器的出库、拣料、入库信息等");
        //System.out.println("currentContainerMap: " + currentContainerMap);


        //System.out.println("agvBasDevpDto: " + agvBasDevpDto);

        return R.ok(agvBasDevpDto);
    }

    private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
        double allAnfme = 0;
        for (AgvWrkDetl wd1 : agvWrkDetlList){
            if(Cools.eq(wd0.getMatnr(),wd1.getMatnr())
                    && Cools.eq(wd0.getBatch(),wd1.getBatch())
                    && Cools.eq(wd0.getThreeCode(),wd1.getThreeCode())
                    && Cools.eq(wd0.getDeadTime(),wd1.getDeadTime())){
                allAnfme += wd1.getAnfme();
            }
        }
        return allAnfme;
    }