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

yusijie

2024-10-23 a791fe4183fd04c67ed2277303a56fd646583d88

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1732,6 +1732,11 @@
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
                    {
                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=======JIT

@@ -3857,8 +3862,12 @@
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
                    {
                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }