~yxj/MES-WEB-API.git

			@@ -10,6 +10,7 @@
			using System.IO;
			using System.Web;
			using System.Web.Http;
			using System.Windows.Forms;
			using WebAPI.Controllers.SCGL.日计划管理;
			using WebAPI.Models;

			@@ -27,12 +28,17 @@
			DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
			public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
			DAL.ClsGy_WorkCenter_View oCenHlp = new DAL.ClsGy_WorkCenter_View();
			DAL.ClsGy_Warehouse_View oCenWare = new DAL.ClsGy_Warehouse_View();
			Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
			public string BillType = "3301";
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			#region 工艺路线列表
			string user_LongShan = "";
			string HName_LongShan = "";

			#region 未知
			/// <summary>
			/// 返回工艺路线列表
			/// 未知
			///参数：string sql。
			///返回值：object。
			/// </summary>
			@@ -44,11 +50,11 @@
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
			ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
			}
			else
			{
			string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
			string sql1 = "select * from h_v_MES_StationEntrustOutBillList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustOutBillList");
			}
			@@ -115,13 +121,17 @@

			public json AddBillMain(string msg1)
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			int hentryid = int.Parse(sArray[2].ToString());//子表的顺序id
			int OperationType = int.Parse(sArray[3].ToString());//数据类型 1添加 3修改
			string user = sArray[4].ToString();//用户名
			//int hentryid = int.Parse(sArray[2].ToString());//子表的顺序id
			int OperationType = int.Parse(sArray[2].ToString());//数据类型 1添加 3修改 2 复制
			string user = sArray[3].ToString();//用户名
			string HComputerName = SystemInformation.ComputerName; //设备名称
			user_LongShan = sArray[3].ToString();//用户名
			try
			{
			//判断是否有编辑权限
			@@ -136,12 +146,12 @@

			msg2 = "[" + msg2.ToString() + "]";
			List<Gy_RoutingBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBill>>(msg2);


			long HInterID = mainList[0].HInterID;//递入type得到的单据ID
			string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
			DateTime HDate = mainList[0].HDate;//日期
			int HYear = DateTime.Now.Year;
			double HPeriod = 1;
			double HPeriod = DateTime.Now.Month;
			string HRemark = mainList[0].HRemark;//备注
			string HMaker = mainList[0].HMaker;//制单人
			long HMaterID = mainList[0].HMaterID;//产品ID
			@@ -169,8 +179,69 @@
			string HMaterTexture = mainList[0].HMaterTexture;//材质
			string HProductNum = mainList[0].HProductNum;//成品编号
			string HVerNum = mainList[0].HVerNum;//版本
			int IsProNo = mainList[0].IsProNo;//是否转工序
			HName_LongShan = mainList[0].HName;//工艺路线名称

			if (OperationType == 1)//新增

			if (oSystemParameter.omodel.WMS_CampanyName == "")
			{
			if (HPicNumVer == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "图号版本不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HPicNumAssemble == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "总装图号不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HMaterTexture == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "材质不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HProductNum == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "成品编号不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HVerNum == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "版本不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (OperationType == 2)
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 单据号='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号重复,请重新输入!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_Gy_RoutingBillList");

			if ((OperationType == 1 \|\| OperationType == 2) && ds.Tables[0].Rows.Count == 0)//新增
			{
			//主表
			oCN.RunProc("Insert Into Gy_RoutingBillMain " +
			@@ -184,14 +255,17 @@
			"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
			"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
			"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
			",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "',"+ HOrgID + ") ");
			",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ") ");

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工艺路线单据:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "新增工艺路线单据：" + HBillNo + "','LMES-工艺路线模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else if (OperationType == 3)
			else if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{ //修改
			oCN.RunProc("update Gy_RoutingBillMain set " +
			"HDate='" + HDate +
			"',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',HMaker='" + HMaker +
			"',Hmakedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
			"',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',hupdater='" + HMaker +
			"',hupdatedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
			"',HRoutingGroupID='" + HRoutingGroupID + "',HUnitID='" + HUnitID + "',HMaterNumber='" + HMaterNumber + "',HUnitNumber='" + HUnitNumber +
			"',HStandard='" + Convert.ToString(HStandard ? 1 : 0) + "',HMainGroupID='" + HMainGroupID + "',HMainProcID='" + HMainProcID + "',HMainCenterID='" + HMainCenterID +
			"',HMainTimeUnit='" + HMainTimeUnit + "',HMainUnitTime='" + HMainUnitTime + "',HMainWorkQty='" + HMainWorkQty + "',HMainPrice='" + HMainPrice +
			@@ -200,10 +274,13 @@
			",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");

			//删除子表
			oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
			oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "'");

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工艺路线单据:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改工艺路线单据：" + HBillNo + "','LMES-工艺路线模块','" + DBUtility.ClsPub.IPAddress + "','修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			//保存子表
			objJsonResult = AddBillSub(msg3, HInterID, hentryid);
			objJsonResult = AddBillSub(msg3, HInterID, OperationType);
			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -212,13 +289,58 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //设置默认工艺路线

			if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			{
			if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未设置转工序!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}
			}
			else if (IsProNo == 1 && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未设置转工序!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}



			//是否勾选默认工艺路线
			if (HStandard)
			{
			//设置默认工艺路线
			oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //设置默认工艺路线
			}

			//判断是否重复工序号
			ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");

			if (OperationType == 1)
			{


			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -255,47 +377,110 @@
			}
			}

			public json AddBillSub(string msg3, long HInterID, int hentryid)
			public json AddBillSub(string msg3, long HInterID,int OperationType)
			{
			List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
			int i = 0;
			string Ret = "";
			oSystemParameter.ShowBill(ref Ret);
			foreach (Gy_RoutingBillSub oSub in DetailColl)
			{
			i++;
			if (oSub.HWorkQty <= 0)
			if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + i + "行，加工数量不能为0或者小于0";
			objJsonResult.data = null;
			return objJsonResult;
			if (oSub.HWorkQty <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + i + "行，加工数量不能为0或者小于0";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			//如果工价为0，则工价字段不做为必填字段
			if (oSub.HProcPrice == 0 && oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
			{
			oCN.RunProc("Insert into Gy_RoutingBillSub " +
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HIsTime,HEstimate " +
			") values("
			+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
			"," + oSub.HFixPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
			"," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
			"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
			",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HEstimate.ToString() +
			") ");
			//计价方式不为计时，则把计时暂估字段更新为空
			if (oSub.HIsTime == false)
			{
			oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);
			}

			oCN.RunProc("Insert into Gy_RoutingBillSub " +
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum" +
			") values("
			+ HInterID + "," + (hentryid==-1?i: hentryid) + "," + oSub.HProcID.ToString() + ",'" + (hentryid == -1 ? i : hentryid) + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
			"," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
			"," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
			"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
			",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
			") ");
			if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{
			string HComputerName = SystemInformation.ComputerName; //设备名称

			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user_LongShan + "','" + HComputerName + "','" + "Gy_RoutingBill_Edit,工艺路线_编辑" + "','LMES系统-工艺路线编辑模块','" + DBUtility.ClsPub.IPAddress + "','" + "修改了工艺路线：" + HName_LongShan + " 工序号：" + oSub.HProcNo + " 工价为：" + oSub.HProcPrice.ToString() + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			}
			else
			{
			oCN.RunProc("Insert into Gy_RoutingBillSub " +
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
			",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
			") values("
			+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
			"," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
			"," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
			"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
			",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HQCSchemeID_Fst + "," +
			oSub.HQCSchemeID_Proc + "," + oSub.HQCSchemeID_Patrol +
			") ");
			//计价方式不为计时，则把计时暂估字段更新为空
			if (oSub.HIsTime == false)
			{
			oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);
			}

			if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{
			string HComputerName = SystemInformation.ComputerName; //设备名称

			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user_LongShan + "','" + HComputerName + "','" + "Gy_RoutingBill_Edit,工艺路线_编辑" + "','LMES系统-工艺路线编辑模块','" + DBUtility.ClsPub.IPAddress + "','" + "修改了工艺路线：" + HName_LongShan + " 工序号：" + oSub.HProcNo + " 工价为：" + oSub.HProcPrice.ToString() + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			}
			}

			objJsonResult.code = "1";
			@@ -303,6 +488,39 @@
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}

			#endregion

			#region 工艺路线列表查询系统参数
			/// <summary>
			/// 返回工艺路线列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("LEMS/MES_XT_List")]
			[HttpGet]
			public object MES_XT_List(string sWhere)
			{
			try
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = oSystemParameter.omodel;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion
			@@ -324,13 +542,14 @@
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,2, WorkBookName);
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 2, WorkBookName);

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");
			DataTable tb3 = new DataTable("dt3");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			@@ -358,7 +577,7 @@

			if (!tb2.Columns.Contains("工序"))
			error += "没有找到【工序】的标题,";


			if (!tb2.Columns.Contains("工作中心"))
			error += "没有找到【工作中心】的标题,";

			@@ -413,11 +632,20 @@
			if (!tb2.Columns.Contains("良率"))
			error += "没有找到【良率】的标题";

			if (!tb2.Columns.Contains("不良品仓"))
			error += "没有找到【不良品仓】的标题";

			if (!tb2.Columns.Contains("报废品仓"))
			error += "没有找到【报废品仓】的标题";

			if (!tb2.Columns.Contains("良品仓"))
			error += "没有找到【良品仓】的标题";

			if (error.Length > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n" ;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -428,18 +656,11 @@
			return objJsonResult;
			}

			string hnumber = "";
			if (tb2.Rows.Count > 0)
			{
			hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["产品代码"].ToString());
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string sHNumber = "";
			if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString()) != "")
			{
			//
			sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString());
			//审核代码是否合理
			if (!DBUtility.ClsPub.AllowNumber(sHNumber))
			@@ -451,41 +672,14 @@
			return objJsonResult;
			}

			if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString()))
			//得到物料内码
			if (!oMaterHlp.GetInfoByNumber(sHNumber))
			{
			//得到物料内码
			if (!oMaterHlp.GetInfoByNumber(sHNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i+1).ToString() + "行," + sHNumber + "没有找到对应的物料！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString());
			sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString());

			//审核代码是否合理
			if (!DBUtility.ClsPub.AllowNumber(sHNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "物料代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//得到物料内码
			if (!oMaterHlp.GetInfoByNumber(sHNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1).ToString() + "行," + sHNumber + "没有找到对应的物料！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1).ToString() + "行," + sHNumber + "没有找到对应的物料！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			@@ -496,6 +690,24 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			//删除临时表数据
			oCN.RunProc("delete from diyipi");

			//临时表添加数据
			for (int i = 0; i < tb2.Rows.Count; i++)
			{
			oCN.RunProc(@"insert into diyipi(产品代码,产品名称,工序序号,工序代码,工序,工作中心,加工数量
			, 良率, 工序工价, 不合格单价, 报废单价, 本道固定开工天数, 本道开工余量, 上道等待天数
			, 上道循环周期, 自动转移, 外协标记, 供应商代码, 供应商, 工艺参数, 图纸编号
			, 本工序确认记录, 备注, 图号版本, 总装图号, 材质, 成品编号, 版本
			, 模具编号, 程序号, 班产定额, 工艺路线名称, 时间单位,工艺路线代码,不良品仓,报废品仓,良品仓)values
			('" + tb2.Rows[i]["产品代码"].ToString() + "','" + tb2.Rows[i]["产品名称"].ToString() + "','" + tb2.Rows[i]["工序序号"].ToString() + "','" + tb2.Rows[i]["工序代码"].ToString() + "','" + tb2.Rows[i]["工序"].ToString() + "','" + tb2.Rows[i]["工作中心"].ToString() + "','" + tb2.Rows[i]["加工数量"].ToString() + "'" +
			",'" + tb2.Rows[i]["良率"].ToString() + "','" + (tb2.Rows[i]["工序工价"].ToString() == "" ? "0" : tb2.Rows[i]["工序工价"].ToString()) + "','" + tb2.Rows[i]["不合格单价"].ToString() + "','" + tb2.Rows[i]["报废单价"].ToString() + "','" + tb2.Rows[i]["本道固定开工天数"].ToString() + "','" + tb2.Rows[i]["本道开工余量"].ToString() + "','" + tb2.Rows[i]["上道等待天数"].ToString() + "'" +
			",'" + tb2.Rows[i]["上道循环周期"].ToString() + "','" + tb2.Rows[i]["自动转移"].ToString() + "','" + tb2.Rows[i]["外协标记"].ToString() + "','" + tb2.Rows[i]["供应商代码"].ToString() + "','" + tb2.Rows[i]["供应商"].ToString() + "','" + tb2.Rows[i]["工艺参数"].ToString() + "','" + tb2.Rows[i]["图纸编号"].ToString() + "'" +
			",'" + tb2.Rows[i]["本工序确认记录"].ToString() + "','" + tb2.Rows[i]["备注"].ToString() + "','" + tb2.Rows[i]["图号版本"].ToString() + "','" + tb2.Rows[i]["总装图号"].ToString() + "','" + tb2.Rows[i]["材质"].ToString() + "','" + tb2.Rows[i]["成品编号"].ToString() + "','" + tb2.Rows[i]["版本"].ToString() + "'" +
			",'" + tb2.Rows[i]["模具编号"].ToString() + "','" + tb2.Rows[i]["程序号"].ToString() + "','" + tb2.Rows[i]["班产定额"].ToString() + "','" + tb2.Rows[i]["工艺路线名称"].ToString() + "','" + tb2.Rows[i]["时间单位"].ToString() + "','" + tb2.Rows[i]["工艺路线代码"].ToString() + "','" + tb2.Rows[i]["不良品仓"].ToString() + "','" + tb2.Rows[i]["报废品仓"].ToString() + "','" + tb2.Rows[i]["良品仓"].ToString() + "')");
			}

			objJsonResult.code = "1";
			@@ -528,12 +740,12 @@
			Single sWorkQty = 0;
			Single sHPassRate = 0;

			//
			sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["产品代码"].ToString());
			sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["工作中心"].ToString());
			sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["工序"].ToString());
			sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["加工数量"].ToString());
			sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["良率"].ToString());

			if (sHNumber != "")
			{
			//
			@@ -596,9 +808,92 @@
			sErrMsg = sErrMsg + "[" + sHNumberCen + "]工作中心不存在\r\n";
			}
			b = true;

			}


			string sErr = "";
			if (oSystemParameter.ShowBill(ref sErr))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			{
			string HBadWHName = ""; //不良品仓
			string HWasterWHName = ""; //报废品仓
			string HWHName = ""; //良品仓

			HBadWHName = DBUtility.ClsPub.isStrNull(dt.Rows[i]["不良品仓"].ToString());
			HWasterWHName = DBUtility.ClsPub.isStrNull(dt.Rows[i]["报废品仓"].ToString());
			HWHName = DBUtility.ClsPub.isStrNull(dt.Rows[i]["良品仓"].ToString());

			//判断是否为空
			if (HBadWHName == "")
			{
			sErrMsg = sErrMsg + "第" + index + "行 :不良品仓不能为空 !\r\n";
			b = true;
			}

			if (HWasterWHName == "")
			{
			sErrMsg = sErrMsg + "第" + index + "行 :报废品仓不能为空 !\r\n";
			b = true;
			}

			if (HWHName == "")
			{
			sErrMsg = sErrMsg + "第" + index + "行 :良品仓不能为空 !\r\n";
			b = true;
			}

			//判断仓库是否重复
			if (HBadWHName == HWasterWHName)
			{
			sErrMsg = sErrMsg + "不良品仓和报废品仓重复\r\n";
			b = true;
			}

			if (HWasterWHName == HWHName)
			{
			sErrMsg = sErrMsg + "报废品仓和良品仓重复\r\n";
			b = true;
			}

			if (HBadWHName == HWHName)
			{
			sErrMsg = sErrMsg + "不良品仓和良品仓重复\r\n";
			b = true;
			}

			//得到仓库内码
			if (!oCenWare.GetInfoByName(HBadWHName))
			{
			sMsg = "[" + HBadWHName + "]仓库不存在";
			if (sErrMsg.Contains(sMsg) == false)
			{
			sErrMsg = sErrMsg + "[" + HBadWHName + "]仓库不存在\r\n";
			}
			b = true;
			}

			if (!oCenWare.GetInfoByName(HWasterWHName))
			{
			sMsg = "[" + HWasterWHName + "]仓库不存在";
			if (sErrMsg.Contains(sMsg) == false)
			{
			sErrMsg = sErrMsg + "[" + HWasterWHName + "]仓库不存在\r\n";
			}
			b = true;
			}

			if (!oCenWare.GetInfoByName(HWHName))
			{
			sMsg = "[" + HWHName + "]仓库不存在";
			if (sErrMsg.Contains(sMsg) == false)
			{
			sErrMsg = sErrMsg + "[" + HWHName + "]仓库不存在\r\n";
			}
			b = true;
			}
			}
			}
			}
			}
			if (b == true)
			@@ -629,6 +924,7 @@
			public string HPeriod;
			public string DataAppend;
			public string HOrgID;
			public Int64 HTProcessFlag;
			}

			[Route("Gy_RoutingBill/Gy_RoutingBill_btnSave")]
			@@ -652,7 +948,7 @@
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "单据保存成功！";
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -678,138 +974,36 @@
			//表头字段
			omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);

			//JSON序列化转换字典集合
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
			List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
			foreach (JObject item in jb)

			ds = oCN.RunProcReturn("select distinct 产品代码,isnull(工艺路线代码,'') 工艺路线代码 from diyipi ", "diyipi");

			for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			var HBillNo = ds.Tables[0].Rows[i]["工艺路线代码"].ToString();//获得一个新的单据号
			if (HBillNo == "")
			{
			dic.Add(itm.Name, itm.Value.ToString());
			DataSet dataSet = oCN.RunProcReturn($"select HBillNo from Gy_RoutingBillMain where HBillNo='1' ", "Gy_RoutingBillMain");
			while (1 == 1)
			{
			if (HBillNo != "")
			{
			if (dataSet.Tables[0].Rows.Count == 0)
			{
			break;
			}
			}
			HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			dataSet = oCN.RunProcReturn($"select HBillNo from Gy_RoutingBillMain where HBillNo='{HBillNo}' ", "Gy_RoutingBillMain");
			}

			}
			list.Add(dic);
			var HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
			oCN.RunProc($"exec Gy_RoutingBill_Excel '{ds.Tables[0].Rows[i]["产品代码"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
			}

			var hnumber = "";
			var HBillNo = "";
			long HInterID = 0;
			for (int i = 0; i < list.Count; i++)
			{
			//获取物料数据
			ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber=" + list[i]["产品代码"].ToString() + " and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
			var HMaterNumber = list[i]["产品代码"].ToString();
			var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
			var Hunitid = ds.Tables[0].Rows[0]["物料代码"].ToString();
			var HUnitNumber = ds.Tables[0].Rows[0]["物料代码"].ToString();

			//获取工序
			ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber=" + list[i]["工序代码"].ToString(), "Gy_Process");
			var HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();

			//获取工作中心
			ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HNumber=" + list[i]["工作中心代码"].ToString(), "Gy_WorkCenter");
			var HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();

			if (hnumber != list[i]["产品代码"].ToString())
			{
			hnumber = list[i]["产品代码"].ToString();
			HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
			}


			var HName = list[i]["工艺路线名称"].ToString();
			var HPicNumVer = list[i]["图号版本"].ToString();
			var HPicNumAssemble = list[i]["总装图号"].ToString();
			var HMaterTexture = list[i]["材质"].ToString();
			var HProductNum = list[i]["成品编号"].ToString();
			var HVerNum = list[i]["版本"].ToString();


			//获取供应商
			ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where HNumber=" + list[i]["供应商代码"].ToString(), "h_v_Gy_SupplierList");
			var HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();

			var HProcNo = list[i]["工序序号"].ToString();
			var HTimeUnit = list[i]["时间单位"].ToString();
			var hworkqty = list[i]["加工数量"].ToString();
			var HFixPrice = list[i]["班产定额"].ToString();
			var HMainPrice = list[i]["工序工价"].ToString();
			var HBadPrice = list[i]["不合格单价"].ToString();
			var HWasterPrice = list[i]["报废单价"].ToString();
			var HBeginFixQty = list[i]["本道固定开工天数"].ToString();
			var HBeginDayQty = list[i]["本道开工余量"].ToString();
			var HFixWorkDays = list[i]["上道等待天数"].ToString();
			var HTrunWorkDays = list[i]["上道循环周期"].ToString();
			var HAutoTrunFlag = list[i]["自动转移"].ToString();
			var HSupFlag = list[i]["外协标记"].ToString();
			var HTechnologyParameter = list[i]["工艺参数"].ToString();
			var HPicNum = list[i]["图纸编号"].ToString();
			var HProcCheckNote = list[i]["本工序确认记录"].ToString();
			var hpassrate = list[i]["良率"].ToString();
			var hremark = list[i]["备注"].ToString();
			var HMouldNo = list[i]["模具编号"].ToString();
			var HProcWorkNum = list[i]["程序号"].ToString();
			//物料分类


			}


			// //主表
			// oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
			// "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
			// "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
			// " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
			// " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
			// "HMainSourceInterID,HMainSourceEntryID)values" +
			// $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
			// $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
			// $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
			// $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
			// $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
			// $" {HMainSourceInterID},{HMainSourceEntryID})");
			//}


			// for (int j = 0; j < SumDay; j++)
			// {
			// //主表子表都有数据
			// if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
			// {
			// SumCount += 1;
			// ////保存子表
			// objJsonResult = RoutAddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
			// , HBillNo == "" ? list[i]["单据号"].ToString() : HBillNo
			// , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
			// , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));

			// if (objJsonResult.count == 1)
			// {
			// TrueCount += 1;
			// }
			// }
			// //主表有数据子表无数据
			// if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
			// {
			// objJsonResult = RoutAddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
			// }
			// }
			//}

			//if (TrueCount != SumCount)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = objJsonResult.Message;
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.Message = "导入完成,共" + ds.Tables[0].Rows.Count + "个工艺路线";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -823,5 +1017,332 @@
			}
			}
			#endregion

			#region 工艺路线审核、反审核
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Gy_RoutingBill/AuditGy_RoutingBill")]
			[HttpGet]
			public object AuditGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
			{
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (IsAudit == 0) //审核判断
			{
			if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能再次审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //反审核判断
			{
			if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未审核!不需要反审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			if (IsAudit == 0) //审核判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核成功";
			objJsonResult.data = null;
			}
			if (IsAudit == 1) //反审核判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功";
			objJsonResult.data = null;
			}
			oCN.Commit();

			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工艺路线关闭、反关闭
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Gy_RoutingBill/CloseGy_RoutingBill")]
			[HttpGet]
			public object CloseGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
			{
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Close", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (IsAudit == 0) //关闭判断
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已关闭!不能再次关闭！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //反关闭判断
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未关闭!不需要反关闭!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			if (IsAudit == 0) //关闭判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HCloseMan='" + CurUserName + "',HCloseDate=getdate() where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "关闭成功";
			objJsonResult.data = null;
			}
			if (IsAudit == 1) //反关闭判断
			{
			oCN.RunProc("update Gy_RoutingBillMain set HCloseMan='',HCloseDate=null where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反关闭成功";
			objJsonResult.data = null;
			}
			oCN.Commit();

			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "关闭失败或者反关闭失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工艺路线列表主表
			/// <summary>
			/// 返回工艺路线列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_RoutingBill/Gy_RoutingBillQuery")]
			[HttpGet]
			public object Gy_RoutingBillQuery(string sWhere, string user)
			{
			DataSet ds;
			try
			{
			//判断是否有查询权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无权限查询!";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuery where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillQuery");
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			return GetObjectJson(ds);
			}

			#endregion

			#region 工艺路线列表子表
			/// <summary>
			/// 返回工艺路线列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_RoutingBill/Gy_RoutingBillQuerySub")]
			[HttpGet]
			public object Gy_RoutingBillQuerySub(string sWhere)
			{
			DataSet ds;
			try
			{

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuerySub where 1 = 1 and hmainid=" + sWhere;
			string sql = sql1 + " order by hmainid desc,cast(工序号 as int)";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillQuerySub");
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			return GetObjectJson(ds);
			}

			#endregion

			///<summary>
			///封装状态码及返回信息的公用方法。
			///参数：DataSet。
			///返回值：json。
			///</summary>
			public object GetObjectJson(DataSet ds)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#region 工艺路线--物料名称获取
			[Route("Gy_Routing/GetHMaterList")]
			[HttpGet]
			public object GetHMaterList(string HMaterName)
			{
			try
			{
			DataSet oDs = new DataSet();
			//==========
			oDs = oCN.RunProcReturn("select distinct top 15 HName from Gy_Material where HName like '%" + HMaterName + "%'", "Gy_Material");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取成功！";
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult; ;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}