Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBS

yusijie

2025-10-30 ef9a1e16ef73c4e06a469de65198bf5b6aae85cd

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBS

 CLOUDWEB/WebService1.asmx.cs

@@ -60063,10 +60063,22 @@
                {
                    sRelQty = omodel_View.HQty;
                }

            }
            else
            //批次条码、品种条码
            {
                if (oSystemParameterMain.WMS_CampanyName == "小卫")
                {
                    if (HQty > 0 && omodel_View.HQty > HQty)
                    {
                        sRelQty = HQty;
                    }
                    else
                    {
                        sRelQty = omodel_View.HQty;
                    }
                }
                else
            {
                if (HQty > 0)
                {
@@ -60079,6 +60091,7 @@
                else
                {
                    sRelQty = omodel_View.HQty;
                    }
                }
            }

@@ -61506,6 +61519,19 @@
            else
            //批次条码、品种条码
            {
                if (oSystemParameterMain.WMS_CampanyName == "小卫")
                {
                    if (HQty > 0 && omodel_View.HQty > HQty)
                    {
                        sRelQty = HQty;
                    }
                    else
                    {
                        sRelQty = omodel_View.HQty;
                    }
                }
                else
                {
                if (HQty > 0)
                {
                    sRelQty = HQty;
@@ -61519,6 +61545,7 @@
                    sRelQty = omodel_View.HQty;
                }
            }
            }

            //有源单扫码，根据系统参数 控制扫码数量能否可超单据数量（小于等于应收、完全等于应收、不控制）
            if (omodel_View.HSourceInterID != 0 && (sMustQtyCtl == "小于等于应收" || sMustQtyCtl == "完全等于应收"))