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

yusijie

2024-06-25 62939c858cd060996fda608e194ba20053be3c00

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1927,6 +1927,10 @@
                    {
                        omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_SaveDeptIsNull")
                    {
                        omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    ////=========工序进站单
@@ -3491,7 +3495,10 @@
                    {
                        omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_SaveDeptIsNull")
                    {
                        omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //-======工序进站接收单
                    //自动新增