Merge branch 'master' into Liudl

bklLiudl

2024-08-26 94deafdd5a4fdd4a1717aead3ce542bfed5d62ea

 Pda/View/AsnSetting/pingKuEnter.html

@@ -424,16 +424,17 @@
            //       //回调
            //    });
            // }
            let bval = $('select[id="bar"]').next().find('.layui-select-title input').val()
            if (!bval && IsHuiKu == 0) {
               layer.msg('请选择入库单', {
				
            if (!$("#PalletNo").val()) {
               layer.msg('请扫描托盘条码', {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               });
               return;
            }
            if (!$("#PalletNo").val()) {
               layer.msg('请扫描托盘条码', {
            let bval = $('select[id="bar"]').next().find('.layui-select-title input').val()
            if (!bval && IsHuiKu == 0) {
               layer.msg('请选择入库单', {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               });