修改问题

DESKTOP-9BNTV8O

2024-12-30 2bcd2e34b928daf86ecb1c478a7b8a54fd698c7e

修改问题

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -121,7 +121,7 @@
                            {{# function GetBtn1(d){
                                    var html = ''; 
                                    var TypeValue = $("#Type").val();
                                    if(TypeValue=='5' || TypeValue=='6' || TypeValue=='7'){	
                                    if(TypeValue=='6' || TypeValue=='7'){	
                                        if(d.LotNo==null || d.LotNo==undefined || d.LotNo==''){
                                            html+= '<input type="text" class="input-dis" value="" disabled>';
                                        }else{
@@ -519,9 +519,7 @@
                                break;
                            case "1": //采购入库
                            case "5": //其它入库
                                TypeNum = 1;
                                console.log(TypeNum)
                                break;
								
                            case "0": //成品入库
                            case "2": //中间品入库
                            case "4": //车间余料入库

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -277,7 +277,7 @@
            string sqlString = string.Empty;
            string sqlDetailStr = string.Empty;
            //0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
            var TypeLot = "1, 5, 6, 7"; //批次可为空单据类型
            var TypeLot = "1, 6, 7"; //批次可为空单据类型

            try
            {
@@ -325,7 +325,7 @@
                        }
                        //判断是否为采购入库单据或车间余料退回入库
                        // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库
                        if (model.Type == "5" || model.Type == "6" || model.Type == "7")//model.Type == "1" || 
                        if (model.Type == "6" || model.Type == "7")//model.Type == "1" || 
                        {
                            if (!string.IsNullOrWhiteSpace(detailModel.LotNo))
                            {
@@ -357,7 +357,7 @@
                                detailModel.LotNo = maxLotNo;
                            }
                        }
                        if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4")
                        if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4" || model.Type == "5")
                        {
                            if (string.IsNullOrWhiteSpace(detailModel.LotNo))
                            {