Merge branch 'csc'

Demo

2024-03-14 59fc06745954a973ba008df5aea24a0b99a81a26

 Pda/View/AsnSetting/productEnterQuantity.html

@@ -909,33 +909,33 @@
                            for (var i = 0; i < res.data.length; i++) {
                                if (skuNo != '' && skuNo == res.data[i].SkuNo) {
                                    if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                        $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                        $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
                                            .SkuName +
                                            '</option>');
                                    } else {
                                        $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                        $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
                                            .SkuName + "-" + res.data[i].LotNo +
                                            '</option>');
                                    }
                                } else {
                                    if (i == 0) {
                                        if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                            $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                            $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
                                                .SkuName +
                                                '</option>');
                                        } else {
                                            $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                            $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
                                                .SkuName + "-" + res.data[i].LotNo +
                                                '</option>');
                                        }

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