Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2026-01-21 8a6a87b93e0a25401b659c7940ca94646ff6dadf

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1879,6 +1879,11 @@
                    }

                    //==============================================WMS   通用
                    //校验模块，库存控制-ERP负库存控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl_BillCheck")
                    {
                        omodel.WMS_ERPStockCtl_BillCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //库存控制-ERP负库存控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
                    {
@@ -4580,6 +4585,11 @@
                    }

                    //==============================================WMS   通用
                    //校验模块，库存控制-ERP负库存控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl_BillCheck")
                    {
                        omodel.WMS_ERPStockCtl_BillCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //库存控制-ERP负库存控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
                    {