~yxj/MES-WEB-API.git

			@@ -315,6 +315,7 @@
			try
			{
			var WorkBookName = HttpContext.Current.Request["WorkBookName"];
			DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			@@ -330,6 +331,7 @@

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

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			@@ -352,32 +354,32 @@
			var error = "";

			//查询工艺路线没有的列
			if (!tb2.Columns.Contains("物料代码"))
			error += "没有找到【物料代码】的标题,";
			if (!tb2.Columns.Contains("产品代码"))
			error += "没有找到【产品代码】的标题,";

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

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

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

			if (!tb2.Columns.Contains("开工余量固数"))
			error += "没有找到【开工余量固数】的标题,";
			if (!tb2.Columns.Contains("本道开工余量"))
			error += "没有找到【本道开工余量】的标题,";

			if (!tb2.Columns.Contains("开工余量天数"))
			error += "没有找到【开工余量天数】的标题,";
			if (!tb2.Columns.Contains("本道固定开工天数"))
			error += "没有找到【本道固定开工天数】的标题,";

			if (!tb2.Columns.Contains("班产定额"))
			error += "没有找到【班产定额】的标题,";

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

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

			if (!tb2.Columns.Contains("工艺参数"))
			error += "没有找到【工艺参数】的标题,";
			@@ -421,21 +423,18 @@
			return objJsonResult;
			}

			Checkdata(tb2);

			string hnumber = "";
			if (tb2.Rows.Count > 0)
			objJsonResult = (json)Checkdata(tb2);
			if (objJsonResult.code == "0")
			{
			hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["物料代码"].ToString());
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string sHNumber = "";
			if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString()) != "")
			if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString()) != "")
			{
			//
			sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["物料代码"].ToString());
			sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["产品代码"].ToString());
			//审核代码是否合理
			if (!DBUtility.ClsPub.AllowNumber(sHNumber))
			{
			@@ -446,58 +445,42 @@
			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.ToString() + "行," + sHNumber + "没有找到对应的物料！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			DataSet Ds;
			ClsCN oCn = new ClsCN();
			bool b = false;
			// 判断是否存在工艺路线
			Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + oMaterHlp.omodel.HItemID.ToString(), "Gy_RoutingBillMain");


			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.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
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + i.ToString() + "行,没有找到对应的物料！";
			objJsonResult.Message = "第" + (i + 1).ToString() + "行,没有找到对应的物料！";
			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() + "')");
			}

			objJsonResult.code = "1";
			@@ -531,8 +514,8 @@
			Single sHPassRate = 0;

			//
			sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["物料代码"].ToString());
			sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["工作中心名称"].ToString());
			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());
			@@ -631,6 +614,7 @@
			public string HPeriod;
			public string DataAppend;
			public string HOrgID;
			public Int64 HTProcessFlag;
			}

			[Route("Gy_RoutingBill/Gy_RoutingBill_btnSave")]
			@@ -654,7 +638,7 @@
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "单据保存成功！";
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -680,115 +664,19 @@
			//表头字段
			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 产品代码 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())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}



			int TrueCount = 0, SumCount = 0;

			for (int i = 0; i < list.Count; i++)
			{
			long HInterID = 0;
			var HBillNo = "";
			if (list[i]["单据号"].ToString() == "" && list[i]["hmainid"].ToString() == "")
			{
			HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
			var HICMOBillNo = list[i]["生产订单号*"].ToString();
			var HICMOEntrySEQ = list[i]["生产订单明细行号*"].ToString();
			var HWorkShopID = list[i]["HWorkShopID"].ToString();
			var HSourceID = list[i]["HSourceID"].ToString();
			var HYX = list[i]["优先级"].ToString();
			var HEmpID = list[i]["HEmpID"].ToString();
			var HMaterID = list[i]["HMaterID"].ToString();
			var HMaterName = list[i]["物料名称"].ToString();
			var HMaterModel = list[i]["规格型号"].ToString();
			var HUnitID = list[i]["HUnitID"].ToString();
			var HBatchNo = list[i]["批次号"].ToString();
			var HSeOrderBillQty = list[i]["销售订单数量"].ToString();
			var HPlanQty = list[i]["生产订单数量"].ToString();
			var HCompleteQty = list[i]["总齐套数量"].ToString();
			var HOrderType = "";
			var HDate = "";
			var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
			var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();

			ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
			$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"第{i + 1}行生产资源有重复,请修改!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//主表
			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})");
			}

			int SumDay = 31; //动态两月之差 DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;

			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;
			var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
			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} ");
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.Message = "导入完成,共" + ds.Tables[0].Rows.Count + "个工艺路线";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -800,42 +688,6 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			public json RoutAddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY)
			{
			//获取表格数据
			ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 单据号='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");

			int count = 0;
			if (ds.Tables[0].Rows.Count > 0)
			{
			//判断子表是否有当日的日期以及日期所对应的数量
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			if (DateTime.Parse(ds.Tables[0].Rows[i]["日计划生产日期"].ToString()) == date)
			{
			oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
			$" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
			count += 1;
			}
			}
			}

			if (count != 1)
			{
			//插入子表
			oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID," +
			"HMasterDate,HQty)" +
			$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
			$" '{date}', {HQTY})");
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}
			#endregion
			}