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

yusijie

2023-02-08 bdc9a678092e8571da7754f1afd48a5055a2a0e5

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -11,6 +11,8 @@
        public List<ClsXt_SystemParameterMain> DetailColl = new List<ClsXt_SystemParameterMain>();
        ClsSqlHelper oCn = new ClsSqlHelper();
         
        public object Kf_POStockInBill_MulSourceBill { get; set; }

        //新增 
        public bool AddBill(ref string sReturn)
        {
@@ -1383,6 +1385,12 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_DeleteCtl")
                    {
                        omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //工序末道入库仓库取值类型
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
                    {
                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


@@ -2802,6 +2810,12 @@
                        omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //工序末道入库仓库取值类型
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
                    {
                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //=======JIT