Merge branch 'master' into wxw

Administrator

2024-03-26 952c07fee747bcdeff25323a456827fe2706c2c9

Merge branch 'master' into wxw

 Pda/View/SoSetting/productOut.html

@@ -677,7 +677,7 @@

            //检查托盘状态
            function checkPalletState() {

				
                var param = {
                    "PalletNo": $("#palletNo").val()
                }
@@ -845,6 +845,10 @@
                        $('#pickQty').val(res.data.PickQty);
                        $('#pickedQty').val(res.data.PickedQty);
                    } else { //不成功
                        if($("#planQty").val() == $("#finishQty").val() || $('#pickQty').val() == $('#pickedQty').val())
                        {
                            return;
                        }
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
@@ -901,6 +905,10 @@

            //获取托盘物料名细
            function GetBoxInfo() { 
                if ($('#pickQty').val() == $('#pickedQty').val())
                {
                    return;
                }
                let param2 = {
                    "SoDetailId": $("#skuLotNo").val(),
                    "PalletNo": $("#palletNo").val(),
@@ -913,6 +921,10 @@

                        refreshTable(tableData)
                    } else {
                        // $("#planQty").val();  //计划数量
                        // $("#finishQty").val();//完成数量
                        // console.info($("#planQty").val(),$("#finishQty").val())
						
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
@@ -1347,6 +1359,10 @@
                        $('#pickQty2').val(res.data.PickQty - res.data.PickedQty);
                        $('#pickedQty2').val(res.data.PickedQty);
                    } else { //不成功
                        if($("#planQty").val() == $("#finishQty").val() || $('#pickQty').val() == $('#pickedQty').val())
                        {
                            return;
                        }
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
@@ -1358,6 +1374,10 @@

            //获取托盘物料名细
            function GetDataInfo() { 
                if ($("#planQty").val() == $("#finishQty").val())
                {
                    return;
                }
                let param2 = {
                    "SoDetailId": $("#skuLotNo2").val(),
                    "PalletNo": $("#palletNo2").val(),

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -68,7 +68,7 @@
                    throw new Exception("托盘码为空，请输入托盘码");
                }
                var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
                if (!string.IsNullOrEmpty(palletInfo.WareHouseNo))
                if (!string.IsNullOrEmpty(palletInfo.WareHouseNo) && type != "1")
                {
                    throw new Exception("该托盘还未出库");
                }