Merge branch 'master' into djp

test

11 小时以前 c5dc821692c0529e3a688af84c647bf80cc49360

 Pda/View/SoSetting/palletOut.html

@@ -104,7 +104,7 @@
            // }
            
            function clear(){ 
               $("#STOCKCODE").val(""); 
               $("#STOCKCODE").val("1"); 
               $("#bar option[value='']").attr("selected", "selected");
               form.render('select');
            }