Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

zyx

2024-03-21 c253255495465d4406fcaddeb7be40d15fce290a

Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

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

@@ -223,9 +223,11 @@
            case 0:
                return "未知";
            case 1:
                return "低库位";
                return "待包装";
            case 2:
                return "高库位";
                return "原材料";
            case 3:
                return "箱壳";
            default:
                return String.valueOf(this.locType1);
        }

 src/main/webapp/static/js/agvLocMast/locMast.js

@@ -55,7 +55,7 @@
            // ,{field: 'barcode', align: 'center',title: ''}
            // ,{field: 'PdcType', align: 'center',title: ''}
            // ,{field: 'ctnNo', align: 'center',title: ''}
            //,{field: 'locType1$', align: 'center',title: '高低类型'}
            ,{field: 'locType1$', align: 'center',title: '库位类型'}
            // ,{field: 'locType2$', align: 'center',title: '宽窄类型'}
            // ,{field: 'locType3$', align: 'center',title: '轻重类型'}