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

wtt

昨天 2fd658134344c18e9f2a2eb2c2099d0b0edf205a

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2803,6 +2803,13 @@
                    {
                        omodel.QC_PatrolProcCheckOtherBill_FirstCheckCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
      
                    //=========返修条码
                    //生成物料条码时，机型码不允许为空
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_BarCodeBill_Rework_Ctrl")
                    {
                        omodel.Gy_BarCodeBill_Rework_Ctrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功！";
                return true;