初始化

dubin

2025-09-24 9c08f3ae419992dda4f4f3ff4650fafd6585ebae

初始化

 pom.xml

@@ -119,7 +119,8 @@


    <build>
        <finalName>rqdzasrs</finalName>
<!--        <finalName>rqdzasrs</finalName>-->
        <finalName>czkhasrs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -370,7 +370,7 @@
                    // 修改源库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
//                        locMast.setBarcode("");//托盘与库位绑定
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -385,7 +385,7 @@
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
//                        locMast.setBarcode("");//托盘与库位绑定
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {

 src/main/java/com/zy/common/service/CommonService.java

@@ -126,6 +126,12 @@
        return getLocNo(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
    }

    @Transactional
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto,String barcode) {
        whsType = Utils.GetWhsType(sourceStaNo);
        return getLocNo1(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0,barcode);
    }

    /**
     * 检索库位号
     *
@@ -247,7 +253,7 @@
        }

//        // 靠近摆放规则 --- 空托  //分离版
//        if (staDescId == 10) {
//       if (staDescId == 10) {
//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
//            for (LocMast locMast1:locMasts){
//                if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -365,4 +371,52 @@
        startupDto.setLocNo(locNo);
        return startupDto;
    }

    /*
    * 检索库位号
    * */
    @Transactional
    public StartupDto getLocNo1(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,String barcode){
        StartupDto startupDto = new StartupDto();
        Wrapper<StaDesc> wrapper = null;
        StaDesc staDesc = null;
        BasDevp staNo = null;
        int crnNo = 1;      //堆垛机号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
            // 获取目标站
            wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", staDescId)
                    .eq("stn_no", sourceStaNo)
                    .eq("crn_no", crnNo);
            staDesc = staDescService.selectOne(wrapper);
            if (Cools.isEmpty(staDesc)) {
                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
                throw new CoolException("入库路径不存在");
//                crnNo = 0;
            }
            staNo = basDevpService.selectById(staDesc.getCrnStn());
            if (!staNo.getAutoing().equals("Y")) {
                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
//                crnNo = 0;
            }
            startupDto.setStaNo(staNo.getDevNo());
        }
        int workNo = getWorkNo(0);
        startupDto.setWorkNo(workNo);
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setCrnNo(1);
        //第一次入库
        //后续入库（托盘和库位已经绑定）
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", barcode));
        if (locMast != null){
            if (!locMast.getLocSts().equals("O")){
                log.error("与该托盘绑定的库位已被占用，托盘码：{}，库位号：{}",barcode,locMast.getLocNo());
            } else {
                startupDto.setLocNo(locMast.getLocNo());
            }
        } else {
            //托盘与库位未绑定 走第一次入库逻辑
        }
        return startupDto;
    }
}

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

@@ -333,7 +333,8 @@
        // 检索库位
        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, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto,barcode);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -345,8 +346,8 @@
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setStaNo(dto.getStaNo());// 目标站
        wrkMast.setLocNo(dto.getLocNo());// 目标库位
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
@@ -417,6 +418,9 @@
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(now);
            if (locMast.getBarcode()==null){
                locMast.setBarcode(barcode);//托盘与库位绑定
            }
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
@@ -431,7 +435,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto,barcode);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -469,6 +473,9 @@
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(new Date());
            if (locMast.getBarcode()==null){
                locMast.setBarcode(barcode);//托盘与库位绑定
            }
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }

 src/main/resources/application.yml

@@ -40,7 +40,7 @@

#License相关配置
license:
  subject: rqdzasrs
  subject: czkhasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

 src/main/webapp/static/js/common.js

@@ -1,4 +1,5 @@
var baseUrl = "/rqdzasrs";
// var baseUrl = "/rqdzasrs";
var baseUrl = "/czkhasrs";

// 详情窗口-高度
var detailHeight = '80%';