~yxj/MES-WEB-API.git

			@@ -85,27 +85,53 @@

			for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
			{
			// 外购退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
			//WMS条码系统参数
			//生产汇报单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
			{
			omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_ERPMode")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ERPMode")
			{
			omodel.Kf_POStockInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Sc_ICMOReportBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MustQtyCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MustQtyCtl")
			{
			omodel.Kf_POStockInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Sc_ICMOReportBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MulSourceBill")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MulSourceBill")
			{
			omodel.Kf_POStockInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Sc_ICMOReportBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BillTypeOneScan")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BillTypeOneScan")
			{
			omodel.Kf_POStockInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Sc_ICMOReportBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_SourceBillCtl")
			{
			omodel.Sc_ICMOReportBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BatchNoCtl")
			{
			omodel.Sc_ICMOReportBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MultilineCtl")
			{
			omodel.Sc_ICMOReportBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MaterWHSPCtl")
			{
			omodel.Sc_ICMOReportBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_SourceWHSPCtl")
			{
			omodel.Sc_ICMOReportBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_UpdateSourceInterID")
			{
			omodel.Sc_ICMOReportBill_UpdateSourceInterID = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//采购入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
			{
			@@ -127,84 +153,27 @@
			{
			omodel.Kf_POStockInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BarCodeMustSameSourceBill")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_SourceBillCtl")
			{
			omodel.Kf_POStockInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_POStockInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//领料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BatchNoCtl")
			{
			omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_POStockInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_ERPMode")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_MultilineCtl")
			{
			omodel.Kf_MateOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_POStockInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MustQtyCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_MaterWHSPCtl")
			{
			omodel.Kf_MateOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_POStockInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MulSourceBill")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_SourceWHSPCtl")
			{
			omodel.Kf_MateOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_POStockInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BillTypeOneScan")
			{
			omodel.Kf_MateOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOList") //先进先出下架清单
			{
			omodel.Kf_MateOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOCtl") //先进先出控制
			{
			omodel.Kf_MateOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoBarCode") //非唯一条码，免扫码
			{
			omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SimpleMode") //简洁模式，只显示已扫码源单记录
			{
			omodel.Kf_MateOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl") //校验-是否校对仓库仓位
			{
			omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
			{
			omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
			{
			omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_ERPMode")
			{
			omodel.Kf_MateOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MustQtyCtl")
			{
			omodel.Kf_MateOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MulSourceBill")
			{
			omodel.Kf_MateOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_MateOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_SimpleMode") //简洁模式，只显示已扫码源单记录
			{
			omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//产品入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
			{
			@@ -226,189 +195,27 @@
			{
			omodel.Kf_ProductInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BarCodeMustSameSourceBill")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_SourceBillCtl")
			{
			omodel.Kf_ProductInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_ProductInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BatchNoCtl")
			{
			omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_ProductInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_ERPMode")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_MultilineCtl")
			{
			omodel.Kf_ProductInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_ProductInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MustQtyCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_MaterWHSPCtl")
			{
			omodel.Kf_ProductInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_ProductInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MulSourceBill")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_SourceWHSPCtl")
			{
			omodel.Kf_ProductInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_ProductInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BillTypeOneScan")
			{
			omodel.Kf_ProductInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
			{
			omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_ERPMode")
			{
			omodel.Kf_EntrustInBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MustQtyCtl")
			{
			omodel.Kf_EntrustInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MulSourceBill")
			{
			omodel.Kf_EntrustInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
			{
			omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_ERPMode")
			{
			omodel.Kf_EntrustInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MustQtyCtl")
			{
			omodel.Kf_EntrustInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MulSourceBill")
			{
			omodel.Kf_EntrustInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外领料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_ERPMode")
			{
			omodel.Kf_EntrustOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MustQtyCtl")
			{
			omodel.Kf_EntrustOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MulSourceBill")
			{
			omodel.Kf_EntrustOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOList") //先进先出下架清单
			{
			omodel.Kf_EntrustOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOCtl")
			{
			omodel.Kf_EntrustOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_SimpleMode") //简洁模式，只显示已扫码源单记录
			{
			omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_ERPMode")
			{
			omodel.Kf_EntrustOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MustQtyCtl")
			{
			omodel.Kf_EntrustOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MulSourceBill")
			{
			omodel.Kf_EntrustOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode")
			{
			omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); //简洁模式，只显示已扫码源单记录
			}
			//销售出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
			{
			omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_ERPMode")
			{
			omodel.Kf_SellOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MustQtyCtl")
			{
			omodel.Kf_SellOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MulSourceBill")
			{
			omodel.Kf_SellOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillTypeOneScan")
			{
			omodel.Kf_SellOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOList") //先进先出下架清单
			{
			omodel.Kf_SellOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOCtl")
			{
			omodel.Kf_SellOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoSavePOStockInBill") //同步生成采购入库单
			{
			omodel.Kf_SellOutBill_AutoSavePOStockInBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//销售退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
			{
			omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_ERPMode")
			{
			omodel.Kf_SellOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MustQtyCtl")
			{
			omodel.Kf_SellOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MulSourceBill")
			{
			omodel.Kf_SellOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_SellOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoSavePOStockInBackBill") //同步生成采购退料单
			{
			omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
			{
			@@ -430,10 +237,203 @@
			{
			omodel.Kf_OtherInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_SourceBillCtl")
			{
			omodel.Kf_OtherInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_BatchNoCtl")
			{
			omodel.Kf_OtherInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_MultilineCtl")
			{
			omodel.Kf_OtherInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_MaterWHSPCtl")
			{
			omodel.Kf_OtherInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_SourceWHSPCtl")
			{
			omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他入库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
			{
			omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_WHSPCtl")
			{
			omodel.Kf_OtherInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MultilineCtl")
			{
			omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
			{
			omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_ERPMode")
			{
			omodel.Kf_EntrustInBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MustQtyCtl")
			{
			omodel.Kf_EntrustInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MulSourceBill")
			{
			omodel.Kf_EntrustInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_SourceBillCtl")
			{
			omodel.Kf_EntrustInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BatchNoCtl")
			{
			omodel.Kf_EntrustInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MultilineCtl")
			{
			omodel.Kf_EntrustInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MaterWHSPCtl")
			{
			omodel.Kf_EntrustInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产领料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
			{
			omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_ERPMode")
			{
			omodel.Kf_MateOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MustQtyCtl")
			{
			omodel.Kf_MateOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MulSourceBill")
			{
			omodel.Kf_MateOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BillTypeOneScan")
			{
			omodel.Kf_MateOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BatchNoCtl")
			{
			omodel.Kf_MateOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MultilineCtl")
			{
			omodel.Kf_MateOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MaterWHSPCtl")
			{
			omodel.Kf_MateOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SourceWHSPCtl")
			{
			omodel.Kf_MateOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOList")
			{
			omodel.Kf_MateOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOCtl")
			{
			omodel.Kf_MateOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SimpleMode")
			{
			omodel.Kf_MateOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoBarCode")
			{
			omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产领料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl")
			{
			omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl")
			{
			omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
			{
			omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_ERPMode")
			{
			omodel.Kf_SellOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MustQtyCtl")
			{
			omodel.Kf_SellOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MulSourceBill")
			{
			omodel.Kf_SellOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillTypeOneScan")
			{
			omodel.Kf_SellOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BatchNoCtl")
			{
			omodel.Kf_SellOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MultilineCtl")
			{
			omodel.Kf_SellOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MaterWHSPCtl")
			{
			omodel.Kf_SellOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_SourceWHSPCtl")
			{
			omodel.Kf_SellOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOList")
			{
			omodel.Kf_SellOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOCtl")
			{
			omodel.Kf_SellOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoSavePOStockInBill")
			{
			omodel.Kf_SellOutBill_AutoSavePOStockInBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_NoRefresh")
			{
			omodel.Kf_SellOutBill_NoRefresh = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
			{
			@@ -447,56 +447,95 @@
			{
			omodel.Kf_OtherOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_MulSourceBill")
			{
			omodel.Kf_OtherOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BillTypeOneScan")
			{
			omodel.Kf_OtherOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BatchNoCtl")
			{
			omodel.Kf_OtherOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_MultilineCtl")
			{
			omodel.Kf_OtherOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_MaterWHSPCtl")
			{
			omodel.Kf_OtherOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_SourceWHSPCtl")
			{
			omodel.Kf_OtherOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//调拨单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_WHSPCtl")
			{
			omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_OtherOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_ERPMode")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MultilineCtl")
			{
			omodel.Kf_MoveStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MustQtyCtl")

			//委外出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
			{
			omodel.Kf_MoveStockBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MulSourceBill")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_ERPMode")
			{
			omodel.Kf_MoveStockBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillTypeOneScan")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MustQtyCtl")
			{
			omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOList") //先进先出下架清单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MulSourceBill")
			{
			omodel.Kf_MoveStockBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BillTypeOneScan")
			{
			omodel.Kf_MoveStockBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BatchNoCtl")
			{
			omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl") //校验-是否校对仓库仓位
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MultilineCtl")
			{
			omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MaterWHSPCtl")
			{
			omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_EntrustOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//补料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOList")
			{
			omodel.Kf_EntrustOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOCtl")
			{
			omodel.Kf_EntrustOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_SimpleMode")
			{
			omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产补料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
			{
			omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -517,40 +556,82 @@
			{
			omodel.Kf_MateReplenishOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他入库反向
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_BatchNoCtl")
			{
			omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MateReplenishOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_ERPMode")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_MultilineCtl")
			{
			omodel.Kf_OtherInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MateReplenishOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MustQtyCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_MaterWHSPCtl")
			{
			omodel.Kf_OtherInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MateReplenishOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BillTypeOneScan")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_SourceWHSPCtl")
			{
			omodel.Kf_OtherInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他出库反向
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")

			//直接调拨单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
			{
			omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_ERPMode")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_ERPMode")
			{
			omodel.Kf_OtherOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MoveStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MustQtyCtl")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MustQtyCtl")
			{
			omodel.Kf_OtherOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MoveStockBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BillTypeOneScan")
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MulSourceBill")
			{
			omodel.Kf_OtherOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.Kf_MoveStockBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillTypeOneScan")
			{
			omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BatchNoCtl")
			{
			omodel.Kf_MoveStockBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MultilineCtl")
			{
			omodel.Kf_MoveStockBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MaterWHSPCtl")
			{
			omodel.Kf_MoveStockBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_SourceWHSPCtl")
			{
			omodel.Kf_MoveStockBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOList")
			{
			omodel.Kf_MoveStockBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOCtl")
			{
			omodel.Kf_MoveStockBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//直接调拨单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
			{
			omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl")
			{
			omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl")
			{
			omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//分步式调出单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
			{
			@@ -572,7 +653,23 @@
			{
			omodel.Kf_MoveStockStepOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOList") //先进先出下架清单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_BatchNoCtl")
			{
			omodel.Kf_MoveStockStepOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_MultilineCtl")
			{
			omodel.Kf_MoveStockStepOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_MaterWHSPCtl")
			{
			omodel.Kf_MoveStockStepOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_SourceWHSPCtl")
			{
			omodel.Kf_MoveStockStepOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOList")
			{
			omodel.Kf_MoveStockStepOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			@@ -580,6 +677,7 @@
			{
			omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//分步式调入单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
			{
			@@ -601,9 +699,348 @@
			{
			omodel.Kf_MoveStockStepInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//=================================================
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_BatchNoCtl")
			{
			omodel.Kf_MoveStockStepInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_MultilineCtl")
			{
			omodel.Kf_MoveStockStepInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_MaterWHSPCtl")
			{
			omodel.Kf_MoveStockStepInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_SourceWHSPCtl")
			{
			omodel.Kf_MoveStockStepInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_FIFOList")
			{
			omodel.Kf_MoveStockStepInBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_FIFOCtl")
			{
			omodel.Kf_MoveStockStepInBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//===============================WMS
			//采购退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
			{
			omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_ERPMode")
			{
			omodel.Kf_POStockInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MustQtyCtl")
			{
			omodel.Kf_POStockInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MulSourceBill")
			{
			omodel.Kf_POStockInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BillTypeOneScan")
			{
			omodel.Kf_POStockInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BatchNoCtl")
			{
			omodel.Kf_POStockInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MultilineCtl")
			{
			omodel.Kf_POStockInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MaterWHSPCtl")
			{
			omodel.Kf_POStockInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_SourceWHSPCtl")
			{
			omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
			{
			omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_ERPMode")
			{
			omodel.Kf_ProductInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MustQtyCtl")
			{
			omodel.Kf_ProductInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MulSourceBill")
			{
			omodel.Kf_ProductInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BillTypeOneScan")
			{
			omodel.Kf_ProductInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BatchNoCtl")
			{
			omodel.Kf_ProductInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MultilineCtl")
			{
			omodel.Kf_ProductInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MaterWHSPCtl")
			{
			omodel.Kf_ProductInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_SourceWHSPCtl")
			{
			omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他入库红字
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
			{
			omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_ERPMode")
			{
			omodel.Kf_OtherInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MustQtyCtl")
			{
			omodel.Kf_OtherInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MulSourceBill")
			{
			omodel.Kf_OtherInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BillTypeOneScan")
			{
			omodel.Kf_OtherInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BatchNoCtl")
			{
			omodel.Kf_OtherInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MultilineCtl")
			{
			omodel.Kf_OtherInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MaterWHSPCtl")
			{
			omodel.Kf_OtherInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_SourceWHSPCtl")
			{
			omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
			{
			omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_ERPMode")
			{
			omodel.Kf_EntrustInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MustQtyCtl")
			{
			omodel.Kf_EntrustInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MulSourceBill")
			{
			omodel.Kf_EntrustInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BatchNoCtl")
			{
			omodel.Kf_EntrustInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MultilineCtl")
			{
			omodel.Kf_EntrustInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MaterWHSPCtl")
			{
			omodel.Kf_EntrustInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
			{
			omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_ERPMode")
			{
			omodel.Kf_MateOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MustQtyCtl")
			{
			omodel.Kf_MateOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MulSourceBill")
			{
			omodel.Kf_MateOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_MateOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BatchNoCtl")
			{
			omodel.Kf_MateOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MultilineCtl")
			{
			omodel.Kf_MateOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MaterWHSPCtl")
			{
			omodel.Kf_MateOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_SourceWHSPCtl")
			{
			omodel.Kf_MateOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_SimpleMode")
			{
			omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
			{
			omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_ERPMode")
			{
			omodel.Kf_SellOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MustQtyCtl")
			{
			omodel.Kf_SellOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MulSourceBill")
			{
			omodel.Kf_SellOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_SellOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BatchNoCtl")
			{
			omodel.Kf_SellOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MultilineCtl")
			{
			omodel.Kf_SellOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MaterWHSPCtl")
			{
			omodel.Kf_SellOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_SourceWHSPCtl")
			{
			omodel.Kf_SellOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoSavePOStockInBackBill")
			{
			omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他出库红字
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
			{
			omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_ERPMode")
			{
			omodel.Kf_OtherOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MustQtyCtl")
			{
			omodel.Kf_OtherOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MulSourceBill")
			{
			omodel.Kf_OtherOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_OtherOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BatchNoCtl")
			{
			omodel.Kf_OtherOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MultilineCtl")
			{
			omodel.Kf_OtherOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MaterWHSPCtl")
			{
			omodel.Kf_OtherOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_SourceWHSPCtl")
			{
			omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_ERPMode")
			{
			omodel.Kf_EntrustOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MustQtyCtl")
			{
			omodel.Kf_EntrustOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MulSourceBill")
			{
			omodel.Kf_EntrustOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BatchNoCtl")
			{
			omodel.Kf_EntrustOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MultilineCtl")
			{
			omodel.Kf_EntrustOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MaterWHSPCtl")
			{
			omodel.Kf_EntrustOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode")
			{
			omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//WMS 通用
			//库存控制-ERP负库存控制
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
			{
			@@ -665,8 +1102,7 @@
			omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//===================================MES
			//-======桌面条码模块
			//桌面条码模块
			//有源单生成条码，生成条码数量可否超源单数量控制
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_SourceQtyCtl")
			{
			@@ -687,6 +1123,8 @@
			{
			omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==============================================================================================

			//-======进站单
			//先进先出
			@@ -798,36 +1236,6 @@
			omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==========生产汇报单
			//自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
			{
			omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BillTypeOneScan")
			{
			omodel.Sc_ICMOReportBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//ERPģʽ
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ERPMode")
			{
			omodel.Sc_ICMOReportBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MustQtyCtl")
			{
			omodel.Sc_ICMOReportBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			// 多源单模式
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MulSourceBill")
			{
			omodel.Sc_ICMOReportBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			// 覆盖源单内码
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_UpdateSourceInterID")
			{
			omodel.Sc_ICMOReportBill_UpdateSourceInterID = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=======JIT