Merge branch 'master' into djp

test

11 小时以前 c5dc821692c0529e3a688af84c647bf80cc49360

 Pda/View/SoSetting/ExNoticeOut.html

@@ -253,7 +253,7 @@

                            } else {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd+ i + '>' + res.data[i]
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {