#

whycq

2024-01-27 089775b8956ae5ecc65b49ab1859f36ca76678d8

#

 src/main/java/com/zy/asrs/controller/SiteController.java

@@ -84,8 +84,8 @@
            vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo() == 102 ? "高" : "低");
            vo.setLocType1(staProtocol.isWeight() ? "重" : "轻");     //高低库位
//            vo.setLocType1(devp.getDevNo() == 102 ? "高" : "低");
        }
        return R.ok().add(list);
    }
@@ -160,7 +160,7 @@
                    vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N");       // 需求1
                    vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
                    vo.setLocType1(staProtocol.isWeight() ? "重" : "轻");
                    return R.ok().add(vo);
                }
            }

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

@@ -228,9 +228,9 @@
            case 0:
                return "未知";
            case 1:
                return "低库位";
                return "重库位";
            case 2:
                return "高库位";
                return "轻库位";
            default:
                return String.valueOf(this.locType1);
        }

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

@@ -194,9 +194,9 @@
            case 0:
                return "未知";
            case 1:
                return "低库位";
                return "重库位";
            case 2:
                return "高库位";
                return "轻库位";
            default:
                return String.valueOf(this.locType1);
        }

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

@@ -206,6 +206,12 @@
                    if (!Cools.isEmpty(checkPick)) {
                        continue;
                    }
//                    WrkMast checkPick2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
//                            .eq("barcode", barcode)
//                            .in("io_type", 57,53));
//                    if (!Cools.isEmpty(checkPick2)) {
//                        continue;
//                    }

                    try {


 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -29,10 +29,10 @@
    }

    public LocTypeDto(StaProtocol staProtocol) {
        if (!staProtocol.isWeight()) {
            this.locType1 = 1; // 轻货
        if (staProtocol.isWeight()) {
            this.locType1 = 1; // 重货
        } else {
            this.locType1 = 2; // 重货
            this.locType1 = 2; // 轻货
        }
    }


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

@@ -298,8 +298,8 @@
            }

            // 轻货物找轻库位为空时，可以去找重库位仓
            if (locTypeDto.getLocType1() == 1) {
                locTypeDto.setLocType1((short) 2);
            if (locTypeDto.getLocType1() == 2) {
                locTypeDto.setLocType1((short) 1);
                return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times);
            }
            News.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -94,7 +94,7 @@
        basDevp.setLocType1((short) 0);  // 高低类型{0:未知,1:低库位,2:高库位}
        basDevp.setLocType2((short) 0);  // 宽窄类型{0:未知,1:窄库位,2:宽库位}
        basDevp.setLocType3((short) 0);  // 轻重类型{0:未知,1:轻库位,2:重库位}
        basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
        basDevp.setLocType1(weight ? (short) 1 : (short) 2);
        basDevp.setInQty(inQty !=null ?(int)inQty : 0);
        return basDevp;
    }