~yxj/MES-WEB-API.git

			@@ -40,6 +40,20 @@
			List<Model.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillMain>>(jsonString);
			return list;
			}



			/// <summary>
			/// 收料通知单反序列化
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsCg_POInStockBillMain> getPOInStockBillMainByJson(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsCg_POInStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_POInStockBillMain>>(jsonString);
			return list;
			}
			/// <summary>
			/// 外购入库(红字)反序列化
			/// </summary>
			@@ -117,6 +131,17 @@
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsKf_MateReplenishOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MateReplenishOutBillMain>>(jsonString);
			return list;
			}
			/// <summary>
			/// 委外补料反序列化
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsKf_EntrustReplenishOutBillMain> getEntrustReplenishOutBillMainByJson(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsKf_EntrustReplenishOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_EntrustReplenishOutBillMain>>(jsonString);
			return list;
			}
			/// <summary>
			@@ -467,6 +492,17 @@
			return list;
			}

			/// <summary>
			/// 处理新增巡检单子表的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>>(jsonString);
			return list;
			}

			/// <summary>
			/// 处理新增模具维修主表的json
			@@ -846,7 +882,7 @@
			}

			/// <summary>
			/// 处理新增模具点检记录表子表的json
			/// 处理新增模具点检记录表子表点检项目的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			@@ -854,6 +890,18 @@
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_MouldDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub>>(jsonString);
			return list;
			}

			/// <summary>
			/// 处理新增模具点检记录表子表配件信息的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsSc_MouldDotCheckBillSub_Item> getObjectByJson_Sc_MouldDotCheckBillSub_Item(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_MouldDotCheckBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub_Item>>(jsonString);
			return list;
			}

			@@ -918,6 +966,18 @@
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
			return list;
			}

			/// <summary>
			/// 处理新增条码拆码的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsGy_BarCodeEdit_Model> getObjectByJson_Gy_SplitBarCode(string jsonString)
			{
			//jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsGy_BarCodeEdit_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_BarCodeEdit_Model>>(jsonString);
			return list;
			}

			@@ -1066,6 +1126,30 @@
			}

			/// <summary>
			/// 处理器具状态表的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsGy_MouldStatus_Model> getObjectByJson_Gy_MouldStatus(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsGy_MouldStatus_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldStatus_Model>>(jsonString);
			return list;
			}

			/// <summary>
			/// 处理设备状态表的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsGy_EquipStatus_Model> getObjectByJson_Gy_EquipStatus(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsGy_EquipStatus_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EquipStatus_Model>>(jsonString);
			return list;
			}

			/// <summary>
			/// 处理单据类型表的json
			/// </summary>
			/// <param name="jsonString"></param>
			@@ -1076,7 +1160,19 @@
			List<Model.ClsXt_BillType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillType_Model>>(jsonString);
			return list;
			}


			/// <summary>
			/// 处理单据子类型表的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsXt_BillSubType_Model> getObjectByJson_Xt_BillSubType(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsXt_BillSubType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillSubType_Model>>(jsonString);
			return list;
			}

			/// <summary>
			/// 处理收款条件表的json
			/// </summary>
			@@ -1423,6 +1519,171 @@
			List<Model.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckBillSub>>(jsonString);
			return list;
			}

			///设备入库检验验收单子表
			///ClsSb_EquipStockInCheckBillSub
			public List<Model.ClsSb_EquipStockInCheckBillSub> getObjectByJson_ClsSb_EquipStockInCheckBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSb_EquipStockInCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStockInCheckBillSub>>(jsonString);
			return list;
			}


			///设备入库检验验收单主表
			///ClsSb_EquipStockInCheckBillMain
			public List<Model.ClsSb_EquipStockInCheckBillMain> getObjectByJson_ClsSb_EquipStockInCheckBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSb_EquipStockInCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStockInCheckBillMain>>(jsonString);
			return list;
			}

			///工序返工申请单主表
			///ClsSc_ProcExchWorkBackBillMain
			public List<Model.ClsSc_ProcExchWorkBackBillMain> getObjectByJson_ClsSc_ProcExchWorkBackBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcExchWorkBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillMain>>(jsonString);
			return list;
			}

			///工序返工申请单子表
			///ClsSb_EquipStockInCheckBillSub
			public List<Model.ClsSc_ProcExchWorkBackBillSub> getObjectByJson_ClsSc_ProcExchWorkBackBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcExchWorkBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillSub>>(jsonString);
			return list;
			}

			///工序返工记录单主表
			///ClsSc_ProcExchRecordBackBillMain
			public List<Model.ClsSc_ProcExchRecordBackBillMain> getObjectByJson_ClsSc_ProcExchRecordBackBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcExchRecordBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchRecordBackBillMain>>(jsonString);
			return list;
			}

			///工序返工记录单子表
			///ClsSc_ProcExchRecordBackBillSub
			public List<Model.ClsSc_ProcExchRecordBackBillSub> getObjectByJson_ClsSc_ProcExchRecordBackBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcExchRecordBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchRecordBackBillSub>>(jsonString);
			return list;
			}

			///工序派工单主表
			///ClsSc_ProcExchWorkBackBillMain
			public List<Model.ClsSc_ProcessSendWorkMain> getObjectByJson_ClsSc_ProcessSendWorkMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcessSendWorkMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkMain>>(jsonString);
			return list;
			}

			///工序派工单子表
			///ClsSc_ProcExchWorkBackBillMain
			public List<Model.ClsSc_ProcessSendWorkSub> getObjectByJson_ClsSc_ProcessSendWorkSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcessSendWorkSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkSub>>(jsonString);
			return list;
			}

			///流转卡工序派工单主表
			///ClsSc_ProcExchWorkBackBillMain
			public List<Model.ClsSc_ProcExchSendWorkBillMain> getObjectByJson_ClsSc_ProcExchSendWorkBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcExchSendWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchSendWorkBillMain>>(jsonString);
			return list;
			}

			///流转卡工序派工单子表
			///ClsSc_ProcExchWorkBackBillMain
			public List<Model.ClsSc_ProcExchSendWorkBillSub> getObjectByJson_ClsSc_ProcExchSendWorkBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSc_ProcExchSendWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchSendWorkBillSub>>(jsonString);
			return list;
			}

			///流转卡工序委外派工单主表
			///ClsWW_EntrustWorkOrderBillMain
			public List<Model.ClsWW_EntrustWorkOrderBillMain> getObjectByJson_ClsWW_EntrustWorkOrderBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsWW_EntrustWorkOrderBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWW_EntrustWorkOrderBillMain>>(jsonString);
			return list;
			}

			///流转卡工序委外派工单子表
			///ClsWW_EntrustWorkOrderBillSub
			public List<Model.ClsWW_EntrustWorkOrderBillSub> getObjectByJson_ClsWW_EntrustWorkOrderBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsWW_EntrustWorkOrderBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWW_EntrustWorkOrderBillSub>>(jsonString);
			return list;
			}

			///供应商询价单主表
			///ClsSup_AskPriceBillMain
			public List<Model.ClsSup_AskPriceBillMain> getObjectByJson_ClsSup_AskPriceBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSup_AskPriceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_AskPriceBillMain>>(jsonString);
			return list;
			}

			///供应商询价单子表
			///ClsSup_AskPriceBillSub
			public List<Model.ClsSup_AskPriceBillSub> getObjectByJson_ClsClsSup_AskPriceBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSup_AskPriceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_AskPriceBillSub>>(jsonString);
			return list;
			}

			///供应商报价单主表
			///ClsSup_QuotePriceBillMain
			public List<Model.ClsSup_QuotePriceBillMain> getObjectByJson_ClsSup_QuotePriceBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSup_QuotePriceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_QuotePriceBillMain>>(jsonString);
			return list;
			}

			///供应商报价单子表
			///ClsSup_QuotePriceBillSub
			public List<Model.ClsSup_QuotePriceBillSub> getObjectByJson_ClsSup_QuotePriceBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSup_QuotePriceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSup_QuotePriceBillSub>>(jsonString);
			return list;
			}

			///设备投产检验验收单子表
			///ClsSb_EquipWorkBeforeCheckBillSub
			public List<Model.ClsSb_EquipWorkBeforeCheckBillSub> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSb_EquipWorkBeforeCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipWorkBeforeCheckBillSub>>(jsonString);
			return list;
			}


			///设备投产检验验收单主表
			///ClsSb_EquipWorkBeforeCheckBillMain
			public List<Model.ClsSb_EquipWorkBeforeCheckBillMain> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsSb_EquipWorkBeforeCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipWorkBeforeCheckBillMain>>(jsonString);
			return list;
			}


			/// <summary>
			/// 设备保养计划主表
			@@ -2082,6 +2343,18 @@
			}

			/// <summary>
			/// 用户工序关系信息表的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Models.Gy_UserProcess> getObjectByJson_Gy_UserProcess(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Models.Gy_UserProcess> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserProcess>>(jsonString);
			return list;
			}

			/// <summary>
			/// 用户-用户关系信息表的json
			/// </summary>
			/// <param name="jsonString"></param>
			@@ -2162,6 +2435,18 @@
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Models.Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Department>>(jsonString);
			return list;
			}

			/// <summary>
			/// 用户工作中心关系信息表的json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Models.WorkCenter> getObjectByJson_WorkCenter(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Models.WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.WorkCenter>>(jsonString);
			return list;
			}

			@@ -2306,6 +2591,33 @@
			return list;
			}

			#region 客诉处理单
			/// <summary>
			/// 客诉处理单主表json
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsCrm_CustomerAppealBillMain> getObjectByJson_Crm_CustomerAppealBillMain(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsCrm_CustomerAppealBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCrm_CustomerAppealBillMain>>(jsonString);
			return list;
			}

			/// <summary>
			/// 客诉处理单子表json2
			/// </summary>
			/// <param name="jsonString"></param>
			/// <returns></returns>
			public List<Model.ClsCrm_CustomerAppealBillSub> getObjectByJson_Crm_CustomerAppealBillSub(string jsonString)
			{
			jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsCrm_CustomerAppealBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCrm_CustomerAppealBillSub>>(jsonString);
			return list;
			}
			#endregion


			#region 工资计算单集体
			public List<Models.ClsPay_GroupBalBillMain> getObjectByJson_Pay_GroupBalBillMain(string jsonString)
			{
			@@ -2404,5 +2716,23 @@
			return list;
			}

			///首件检验单孙表
			///ClsQC_FirstPieceCheckBillSub_ValueGrid
			public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString)
			{
			//jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid>>(jsonString);
			return list;
			}

			///工序检验单孙表
			///ClsQC_ProcessCheckBillSub_ValueGrid
			public List<Model.ClsQC_ProcessCheckBillSub_ValueGrid> getObjectByJson_ClsQC_ProcessCheckBillSub_ValueGrid(string jsonString)
			{
			//jsonString = "[" + jsonString.ToString() + "]";
			List<Model.ClsQC_ProcessCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub_ValueGrid>>(jsonString);
			return list;
			}

			}
			}