Merge branch 'master' into djp

test

2025-07-24 04624e7dae0291aba33967f754573236324d2a62

 Pda/View/SoSetting/SampleOut2.html

@@ -818,7 +818,7 @@
               return;
            }
            if ($('#bar2').val() == "") {
               layer.msg("请选择出库单", {
               layer.msg("请选择请验单", {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               }); return;