Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0

luxiaotao1123

2022-01-24 1918c5fe8c390ca90acff60b71e27257d65fb463

Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0

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

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

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

@@ -54,7 +54,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: '轻重类型'}


 version/db/sxjzasrs20211227.bak

Binary files differ

 version/wcs/SXJZWCS_20220115.rar

Binary files differ