#

lsh

2024-06-06 62ba3824387832e3ef1d43e91d0d079b6f8b11d9

#

 src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java

@@ -159,6 +159,16 @@

    public WrkMastSplitTwin() {}

    public WrkMastSplitTwin(WrkMast wrkMast,Integer crnStation,Date now) {
        this.wrkNo = wrkMast.getWrkNo().longValue();
        this.createTime = now;
        this.updateTime = now;
        this.type = crnStation; //工位
        this.lineNumber = wrkMast.getIoPri().intValue();
        this.bignTime = wrkMast.getIoTime();
        this.crnNo = wrkMast.getCrnNo();
    }

    public WrkMastSplitTwin(Long wrkNo,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer crnNo,String wrkStart,String wrkEnd,Integer startRow,Integer startBay,Integer startLev,Integer endRow,Integer endBay,Integer endLev,Integer ioType) {
        this.wrkNo = wrkNo;
        this.createTime = createTime;

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -104,6 +104,8 @@
    private RgvOneSignMapper rgvOneSignMapper;
    @Autowired
    private WrkMastCrnMapper wrkMastCrnMapper;
    @Autowired
    private WrkMastSplitTwinMapper wrkMastSplitTwinMapper;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -1971,6 +1973,12 @@
                continue;
            }

            // 已经存在吊车执行任务时，则过滤
            if (wrkMastSplitTwinMapper.selectCount(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkMast.getWrkNo().longValue())) != 0) {
                break;
//                        return;
            }

            // 双深库位且浅库位有货，则需先对浅库位进行库位移转
            if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
                String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
@@ -2029,9 +2037,27 @@
                wrkMast.setWrkSts(3L);
                wrkMast.setCrnStrTime(now);
                wrkMast.setModiTime(now);
                WrkMastSplitTwin wrkMastSplitTwin = new WrkMastSplitTwin(wrkMast,crnStation,now);
                wrkMastSplitTwin.setWrkSts(1);
                wrkMastSplitTwin.setWrkStart(wrkMast.getStaNo().toString());
                wrkMastSplitTwin.setWrkEnd(wrkMast.getLocNo());
                wrkMastSplitTwin.setStartRow(crnStn.getRow());
                wrkMastSplitTwin.setStartBay(crnStn.getBay());
                wrkMastSplitTwin.setStartLev(crnStn.getLev());
                wrkMastSplitTwin.setEndRow(locMast.getRow1());
                wrkMastSplitTwin.setEndBay(locMast.getBay1());
                wrkMastSplitTwin.setEndLev(locMast.getLev1());
                wrkMastSplitTwin.setWrkType(1);
                wrkMastSplitTwin.setIoType(1);

                if (wrkMastMapper.updateById(wrkMast) == 0) {
                    log.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                }

                if (wrkMastSplitTwinMapper.insert(wrkMastSplitTwin)==0){
                    log.error("创建 堆垛机执行任务 失败！！，工作号={}，堆垛机号={}", wrkMast.getWrkNo(),wrkMast.getCrnNo());
                }
                break;
            }
        }
    }
@@ -2897,6 +2923,12 @@
//                        return;
                }

                // 已经存在吊车执行任务时，则过滤
                if (wrkMastSplitTwinMapper.selectCount(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkMast.getWrkNo().longValue())) != 0) {
                    break;
//                        return;
                }

                // 1.堆垛机开始移动
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
@@ -2917,9 +2949,25 @@
                    wrkMast.setWrkSts(12L);
                    wrkMast.setCrnStrTime(now);
                    wrkMast.setModiTime(now);
                    WrkMastSplitTwin wrkMastSplitTwin = new WrkMastSplitTwin(wrkMast,crnStation,now);
                    wrkMastSplitTwin.setWrkSts(1);
                    wrkMastSplitTwin.setWrkStart(wrkMast.getSourceLocNo());
                    wrkMastSplitTwin.setWrkEnd(wrkMast.getSourceStaNo().toString());
                    wrkMastSplitTwin.setStartRow(sourceSta.getRow1());
                    wrkMastSplitTwin.setStartBay(sourceSta.getBay1());
                    wrkMastSplitTwin.setStartLev(sourceSta.getLev1());
                    wrkMastSplitTwin.setEndRow(crnStn.getRow());
                    wrkMastSplitTwin.setEndBay(crnStn.getBay());
                    wrkMastSplitTwin.setEndLev(crnStn.getLev());
                    wrkMastSplitTwin.setWrkType(1);
                    wrkMastSplitTwin.setIoType(2);
                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                        log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                    }

                    if (wrkMastSplitTwinMapper.insert(wrkMastSplitTwin)==0){
                        log.error("创建 堆垛机执行任务 失败！！，工作号={}，堆垛机号={}", wrkMast.getWrkNo(),wrkMast.getCrnNo());
                    }
                    break;
                }
            }