新增PDA并板操作

lsh

2025-05-27 07dad0e9ef89346439cfcfb5978b0f1cb8f1b512

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

@@ -182,7 +182,7 @@
                nearRow = locNecessaryParameters[3];
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
                int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
                if (locMasts.size()-crnCountO<=2){
                if (locMasts.size()-crnCountO<=0){
                    times++;
                    continue;
                }
@@ -311,6 +311,7 @@
            }else {
                staNo = basDevpService.selectById(staDesc.getCrnStn());
                if (!staNo.getAutoing().equals("Y")) {
                    log.error("目标站"+staDesc.getCrnStn()+"不可用");
//                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
                    crnNo = 0;
                }