MES-WEB-API.git

			@@ -488,6 +488,91 @@
			omodel.Kf_EntrustInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========受托加工入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_AutoSubmit")
			{
			omodel.Kf_InceptEntInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_AutoCheck")
			{
			omodel.Kf_InceptEntInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_ERPMode")
			{
			omodel.Kf_InceptEntInBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MustQtyCtl")
			{
			omodel.Kf_InceptEntInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MulSourceBill")
			{
			omodel.Kf_InceptEntInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_BillTypeOneScan")
			{
			omodel.Kf_InceptEntInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_SourceBillCtl")
			{
			omodel.Kf_InceptEntInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_BatchNoCtl")
			{
			omodel.Kf_InceptEntInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MultilineCtl")
			{
			omodel.Kf_InceptEntInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MaterWHSPCtl")
			{
			omodel.Kf_InceptEntInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_SourceWHSPCtl")
			{
			omodel.Kf_InceptEntInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//受托加工入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_InceptEntInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_BillDateMode")
			{
			omodel.Kf_InceptEntInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//============受托加工入库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_MustQtyCtl")
			{
			omodel.Kf_InceptEntInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_WHSPCtl")
			{
			omodel.Kf_InceptEntInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_WHCtl")
			{
			omodel.Kf_InceptEntInBillCheck_WHCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_MultilineCtl")
			{
			omodel.Kf_InceptEntInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_InceptEntInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_AutoBarCode")
			{
			omodel.Kf_InceptEntInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_ERPMode")
			{
			omodel.Kf_InceptEntInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========================================生产领料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoSubmit")
			{
			@@ -1063,6 +1148,95 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_FIFOCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//========================================受托加工出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_AutoSubmit")
			{
			omodel.Kf_InceptEntOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_AutoCheck")
			{
			omodel.Kf_InceptEntOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_ERPMode")
			{
			omodel.Kf_InceptEntOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MustQtyCtl")
			{
			omodel.Kf_InceptEntOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MulSourceBill")
			{
			omodel.Kf_InceptEntOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_BillTypeOneScan")
			{
			omodel.Kf_InceptEntOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_BatchNoCtl")
			{
			omodel.Kf_InceptEntOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MultilineCtl")
			{
			omodel.Kf_InceptEntOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MaterWHSPCtl")
			{
			omodel.Kf_InceptEntOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_SourceWHSPCtl")
			{
			omodel.Kf_InceptEntOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_FIFOCtl")
			{
			omodel.Kf_InceptEntOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//受托加工出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_InceptEntOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_BillDateMode")
			{
			omodel.Kf_InceptEntOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//========================================受托加工出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_WHSPCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_WHCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_WHCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_MultilineCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_AutoBarCode")
			{
			omodel.Kf_InceptEntOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_ERPMode")
			{
			omodel.Kf_InceptEntOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_FIFOCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==================直接调拨单
			@@ -2266,6 +2440,11 @@
			}

			//=======委外发出
			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_AutoCheck")
			{
			omodel.MES_StationEntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//工站或工序先进先出（同上）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
			{
			@@ -2293,6 +2472,11 @@
			}

			//===========委外接收单
			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_AutoCheck")
			{
			omodel.MES_StationEntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站数量不能大于本道进站汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
			{
			@@ -2440,8 +2624,18 @@
			{
			omodel.SB_EquipICMOTechParamBill_Check = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//审核后是否安灯
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_OAErrMsg")
			{
			omodel.SB_EquipICMOTechParamBill_OAErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//审核后是否发送NG工艺参数消息
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_ErrMsg")
			{
			omodel.SB_EquipICMOTechParamBill_ErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}



			//=========工序委外发出单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
			@@ -2777,6 +2971,59 @@
			omodel.Sc_ShiftsBeginInfoBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具点检记录单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldDotCheckBill_AutoCheck")
			{
			omodel.Sc_MouldDotCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具保养记录单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMaintainBill_AutoCheck")
			{
			omodel.Sc_MouldMaintainBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具故障登记单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldConkBookBill_AutoCheck")
			{
			omodel.Sc_MouldConkBookBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具维修派工单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairSendWorkBill_AutoCheck")
			{
			omodel.Sc_MouldRepairSendWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具维修记录单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairWorkBill_AutoCheck")
			{
			omodel.Sc_MouldRepairWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具维修验收单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairCheckBill_AutoCheck")
			{
			omodel.Sc_MouldRepairCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========上模单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldUpperBill_AutoCheck")
			{
			omodel.Sc_MouldUpperBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========下模单 - 必须做上模单才能生成下模单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_MouldUpper")
			{
			omodel.Sc_MouldLowerBill_MouldUpper = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========下模单 - 自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_AutoCheck")
			{
			omodel.Sc_MouldLowerBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			// 投料防错表是否启用投料校验(反写物料档案单据状态)
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_FeedingErrorProofingBill_BarCodeCTL")
			@@ -2792,6 +3039,19 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckOtherBill_FirstCheckCtl")
			{
			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"]);
			}

			// 取样单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
			{
			omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			}
			sReturn = "显示单据成功！";
			@@ -3215,6 +3475,91 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillDateMode")
			{
			omodel.Kf_EntrustInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========受托加工入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_AutoSubmit")
			{
			omodel.Kf_InceptEntInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_AutoCheck")
			{
			omodel.Kf_InceptEntInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_ERPMode")
			{
			omodel.Kf_InceptEntInBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MustQtyCtl")
			{
			omodel.Kf_InceptEntInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MulSourceBill")
			{
			omodel.Kf_InceptEntInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_BillTypeOneScan")
			{
			omodel.Kf_InceptEntInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_SourceBillCtl")
			{
			omodel.Kf_InceptEntInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_BatchNoCtl")
			{
			omodel.Kf_InceptEntInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MultilineCtl")
			{
			omodel.Kf_InceptEntInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_MaterWHSPCtl")
			{
			omodel.Kf_InceptEntInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_SourceWHSPCtl")
			{
			omodel.Kf_InceptEntInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//受托加工入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_InceptEntInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBill_BillDateMode")
			{
			omodel.Kf_InceptEntInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//============受托加工入库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_MustQtyCtl")
			{
			omodel.Kf_InceptEntInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_WHSPCtl")
			{
			omodel.Kf_InceptEntInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_WHCtl")
			{
			omodel.Kf_InceptEntInBillCheck_WHCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_MultilineCtl")
			{
			omodel.Kf_InceptEntInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_InceptEntInBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_AutoBarCode")
			{
			omodel.Kf_InceptEntInBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntInBillCheck_ERPMode")
			{
			omodel.Kf_InceptEntInBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==========生产领料单
			@@ -3792,6 +4137,95 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_FIFOCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========受托加工出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_AutoSubmit")
			{
			omodel.Kf_InceptEntOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_AutoCheck")
			{
			omodel.Kf_InceptEntOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_ERPMode")
			{
			omodel.Kf_InceptEntOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MustQtyCtl")
			{
			omodel.Kf_InceptEntOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MulSourceBill")
			{
			omodel.Kf_InceptEntOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_BillTypeOneScan")
			{
			omodel.Kf_InceptEntOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_BatchNoCtl")
			{
			omodel.Kf_InceptEntOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MultilineCtl")
			{
			omodel.Kf_InceptEntOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_MaterWHSPCtl")
			{
			omodel.Kf_InceptEntOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_SourceWHSPCtl")
			{
			omodel.Kf_InceptEntOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_FIFOCtl")
			{
			omodel.Kf_InceptEntOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//受托加工出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_InceptEntOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBill_BillDateMode")
			{
			omodel.Kf_InceptEntOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========受托加工出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_WHSPCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_WHCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_WHCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_MultilineCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_AutoBarCode")
			{
			omodel.Kf_InceptEntOutBillCheck_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_ERPMode")
			{
			omodel.Kf_InceptEntOutBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_InceptEntOutBillCheck_FIFOCtl")
			{
			omodel.Kf_InceptEntOutBillCheck_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========直接调拨单
			@@ -5082,6 +5516,11 @@
			{
			omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_AutoCheck")
			{
			omodel.MES_StationEntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//工站或工序先进先出（同上）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
			{
			@@ -5115,6 +5554,11 @@
			omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_AutoCheck")
			{
			omodel.MES_StationEntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站数量不能大于本道进站汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
			{
			@@ -5532,6 +5976,65 @@
			{
			omodel.HR_PostSkillBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具点检记录单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldDotCheckBill_AutoCheck")
			{
			omodel.Sc_MouldDotCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具保养记录单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMaintainBill_AutoCheck")
			{
			omodel.Sc_MouldMaintainBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具故障登记单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldConkBookBill_AutoCheck")
			{
			omodel.Sc_MouldConkBookBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具维修派工单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairSendWorkBill_AutoCheck")
			{
			omodel.Sc_MouldRepairSendWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具维修记录单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairWorkBill_AutoCheck")
			{
			omodel.Sc_MouldRepairWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========模具维修验收单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairCheckBill_AutoCheck")
			{
			omodel.Sc_MouldRepairCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========上模单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldUpperBill_AutoCheck")
			{
			omodel.Sc_MouldUpperBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========下模单 - 必须做上模单才能生成下模单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_MouldUpper")
			{
			omodel.Sc_MouldLowerBill_MouldUpper = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========下模单 - 自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldLowerBill_AutoCheck")
			{
			omodel.Sc_MouldLowerBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//=========取样单 - 自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_TakeSampleCheckBill_AutoCheck")
			{
			omodel.QC_TakeSampleCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			}
			sReturn = "显示单据成功！";
			return true;