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

yusijie

2024-06-29 2a2354ac6caab7e0dc03be138ccaefe9c4b69099

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1606,6 +1606,11 @@
                    {
                        omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
                    {
                        omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }



@@ -3551,6 +3556,11 @@
                    {
                        omodel.MES_StationInBill_PreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
                    {
                        omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }