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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 src/main/webapp/static/js/pla/plaDetl.js

@@ -789,7 +789,8 @@
                    layer.msg("选中的明细中含有多种牌号，请重新选择");
                    return;
                }
                if (data[i].zpalletType == null && data[i].packageType == null && data[i].massState == null) {
                //if (data[i].zpalletType == null && data[i].packageType == null && data[i].massState == null) {
                if (typeof data[i].massState === 'undefined' || data[i].massState === null || data[i].massState.trim().length === 0){
                    layer.msg("质量指标未上传");
                    return;
                }